NEWS updates and whitespace fixes.

common/Makefile

@@ -6,7 +6,7 @@ BUILD_DATE    = $(shell date "+%Y/%m/%d %H:%M:%S")
 BASE          = $(TOP)/../common
 GOOGLE_PROJ   = dactyl
 GOOGLE	      = https://$(GOOGLE_PROJ).googlecode.com/files
-VERSION	      = $(shell sed -n 's/.*<em:version>\(.*\)<.*/\1/p' $(TOP)/install.rdf)
+VERSION	      = $(shell sed -n 's/.*em:version\(>\|="\)\(.*\)["<].*/\2/p' $(TOP)/install.rdf)
 
 LOCALEDIR     = locale
 DOC_FILES     = $(wildcard $(LOCALEDIR)/*/*.xml)

common/locale/en-US/eval.xml

@@ -20,7 +20,8 @@
     straightforward, but allows for any number of complex actions to be
     executed, with full access to all of the internals of &dactyl.appname; and
     &dactyl.host;. Both expression evaluation methods support sophisticated
-    expression completion, including option lists and descriptions thereof.
+    expression completion, including option lists and descriptions thereof,
+    along with paren matching and syntax error highlighting.
 </p>
 
 <item>

common/locale/en-US/options.xml

@@ -22,7 +22,7 @@
 
 <p>
     &dactyl.appname; has a number of internal variables and switches which can be set to
-    achieve special effects. These options come in 5 forms:
+    achieve special effects. These options come in 8 forms:
 </p>
 
 <dl>

common/modules/base.jsm

@@ -82,7 +82,8 @@ if (!Object.keys)
 let use = {};
 let loaded = {};
 let currentModule;
-function defmodule(name, module, params) {
+function defmodule(name, params) {
+    let module = Cu.getGlobalForObject ? Cu.getGlobalForObject(params) : params.__parent__;
     module.NAME = name;
     module.EXPORTED_SYMBOLS = params.exports || [];
     defmodule.loadLog.push("defmodule " + name);
@@ -134,7 +135,7 @@ function require(obj, name, from) {
     }
 }
 
-defmodule("base", this, {
+defmodule("base", {
     // sed -n 's/^(const|function) ([a-zA-Z0-9_]+).*/	"\2",/p' base.jsm | sort | fmt
     exports: [
         "Cc", "Ci", "Class", "Cr", "Cu", "Module", "Object", "Runnable",

common/modules/bookmarkcache.jsm

@@ -5,7 +5,7 @@
 "use strict";
 
 Components.utils.import("resource://dactyl/base.jsm");
-defmodule("bookmarkcache", this, {
+defmodule("bookmarkcache", {
     exports: ["Bookmark", "BookmarkCache", "Keyword", "bookmarkcache"],
     require: ["services", "storage", "util"]
 });

common/modules/highlight.jsm

@@ -5,7 +5,7 @@
 "use strict";
 
 Components.utils.import("resource://dactyl/base.jsm");
-defmodule("highlight", this, {
+defmodule("highlight", {
     exports: ["Highlight", "Highlights", "highlight"],
     require: ["services", "styles"],
     use: ["template", "util"]

common/modules/sanitizer.jsm

@@ -15,7 +15,7 @@
 //   - finish 1.9.0 support if we're going to support sanitizing in Xulmus
 
 Components.utils.import("resource://dactyl/base.jsm");
-defmodule("sanitizer", this, {
+defmodule("sanitizer", {
     exports: ["Range", "Sanitizer", "sanitizer"],
     require: ["services", "storage", "util"]
 });

common/modules/services.jsm

@@ -5,7 +5,7 @@
 "use strict";
 
 Components.utils.import("resource://dactyl/base.jsm");
-defmodule("services", this, {
+defmodule("services", {
     exports: ["Services", "services"]
 });
 

common/modules/storage.jsm

@@ -6,7 +6,7 @@
 
 const myObject = Object;
 Components.utils.import("resource://dactyl/base.jsm");
-defmodule("storage", this, {
+defmodule("storage", {
     exports: ["File", "storage"],
     require: ["services", "util"]
 });

common/modules/styles.jsm

@@ -5,7 +5,7 @@
 "use strict";
 
 Components.utils.import("resource://dactyl/base.jsm");
-defmodule("styles", this, {
+defmodule("styles", {
     exports: ["Style", "Styles", "styles"],
     require: ["services", "util"],
     use: ["template"]

common/modules/template.jsm

@@ -5,7 +5,7 @@
 "use strict";
 
 Components.utils.import("resource://dactyl/base.jsm");
-defmodule("template", this, {
+defmodule("template", {
     exports: ["Template", "template"],
     require: ["util"]
 });

common/modules/util.jsm

@@ -7,7 +7,7 @@
 "use strict";
 
 Components.utils.import("resource://dactyl/base.jsm");
-defmodule("util", this, {
+defmodule("util", {
     exports: ["Math", "NS", "Util", "XHTML", "XUL", "util"],
     require: ["services"],
     use: ["highlight", "template"]

pentadactyl/NEWS

@@ -20,18 +20,24 @@
       - Supports reverse incremental search.
     * IMPORTANT: Plugins are now loaded from the 'plugins/'
       directory in 'runtimepath' rather than 'plugin/'
+    * IMPORTANT: Single quotes no longer treat \s specially
     * Replaced 'focuscontent' with 'strictfocus'
+      I.e., 'fo\o''bar' ≡ fo\o'bar
     * Added 'altwildmode' and <A-Tab> commandline key binding
     * Added 'banghist' option
+    * Added ‘transliterated’ option to 'hintmatching'
     * gf now toggles between source and content view.
       The | key binding has been removed.
-    * :extadd now supports URLs.
+    * :extadd now supports remote URLs as well as local files on
+      Firefox 4.
     * :open now only opens files beginning with /, ./, ../, or ~/
     * 'complete' now defaults to ‘slf’ but file completion only
       triggers when the URL begins as above.
     * Page zoom information is now shown in the status bar, and
       change in zoom status no longer appears in :messages.
     * Added ZO, ZI, ZM, and ZR as aliases for zO, zI, zM, and zR
+    * Completion list now behaves better when the multi-line output 
+      window is displayed
     * Major help system improvements:
       - Plugins may now provide full-fledged ':help' documentation
       - Add basic plugin authorship documentation

pentadactyl/install.rdf

@@ -1,21 +1,20 @@
 <?xml version="1.0"?>
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-    <Description about="urn:mozilla:install-manifest">
-        <em:id>pentadactyl@dactyl.googlecode.com</em:id>
-        <em:name>Pentadactyl</em:name>
-        <em:version>1.0b1pre</em:version>
-        <em:description>Firefox for Vim and Links addicts</em:description>
-        <em:creator>Kris Maglione</em:creator>
-        <em:homepageURL>http://dactyl.sf.net/Pentadactyl</em:homepageURL>
-        <em:iconURL>chrome://pentadactyl/skin/icon.png</em:iconURL>
-        <em:optionsURL>chrome://dactyl/content/preferences.xul</em:optionsURL>
+    <Description about="urn:mozilla:install-manifest"
+        em:id="pentadactyl@dactyl.googlecode.com"
+        em:name="Pentadactyl"
+        em:version="1.0b1pre"
+        em:description="Firefox for Vim and Links addicts"
+        em:creator="Kris Maglione"
+        em:homepageURL="http://dactyl.sf.net/Pentadactyl"
+        em:iconURL="chrome://pentadactyl/skin/icon.png"
+        em:optionsURL="chrome://dactyl/content/preferences.xul">
         <em:targetApplication>
-            <Description>
-                <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-                <em:minVersion>3.5</em:minVersion>
-                <em:maxVersion>4.0b7pre</em:maxVersion>
-            </Description>
+            <Description
+                em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
+                em:minVersion="3.5"
+                em:maxVersion="4.0b7pre"/>
         </em:targetApplication>
     </Description>
 </RDF>