Merge with master.

common/Makefile.common

@@ -107,7 +107,7 @@ $(JAR): doc
 
 check-asciidoc:
 	@asciidoc --version | awk '{ exit $$2 !~ /^8\.2\./ }' || \
-		echo >&2 "Warning: asciidoc versions other 8.2.x are unsupported"
+		echo >&2 "Warning: asciidoc versions other than 8.2.x are unsupported"
 
 ${DOC_FILES}: %.html: %.txt $(BASE)/Makefile.common locale/en-US/asciidoc.conf
 	@echo "DOC $@"

common/content/buffer.js

@@ -173,24 +173,8 @@ function Buffer() //{{{
         "Show current website with a minimal style sheet to make it easily accessible",
         "boolean", false,
         {
-            setter: function (value)
+            setter: function (value) getBrowser().markupDocumentViewer.authorStyleDisabled = value,
-            {
+            getter: function () getBrowser().markupDocumentViewer.authorStyleDisabled
-                try
-                {
-                    window.getMarkupDocumentViewer().authorStyleDisabled = value;
-                }
-                catch (e) {}
-
-                return value;
-            },
-            getter: function ()
-            {
-                try
-                {
-                    return window.getMarkupDocumentViewer().authorStyleDisabled;
-                }
-                catch (e) {}
-            }
         });
 
     /////////////////////////////////////////////////////////////////////////////}}}

common/content/completion.js

@@ -1374,6 +1374,7 @@ function Completion() //{{{
         help: function help(context)
         {
             context.title = ["Help"];
+            context.anchored = false;
             context.generate = function ()
             {
                 let res = config.helpFiles.map(function (file) {

common/content/events.js

@@ -171,7 +171,6 @@ function AutoCommands() //{{{
         completion.setFunctionCompleter(autocommands.get, [function () config.autocommands]);
     });
 
-
     return {
 
         __iterator__: function () util.Array.iterator(store),
@@ -255,7 +254,17 @@ function AutoCommands() //{{{
 
                     liberator.echomsg("autocommand " + autoCmd.command, 9);
                     if (typeof autoCmd.command == "function")
-                        autoCmd.command.call(autoCmd, args);
+                    {
+                        try
+                        {
+                            autoCmd.command.call(autoCmd, args);
+                        }
+                        catch(e)
+                        {
+                            liberator.reportError(e);
+                            liberator.echoerr(e);
+                        }
+                    }
                     else
                         liberator.execute(commands.replaceTokens(autoCmd.command, args));
                 }

common/content/hints.js

@@ -254,7 +254,7 @@ function Hints() //{{{
         // 'usermode' appropriately? We're generally not very well integrated
         // into FF so having menu items toggle Vimperator options may be
         // confusing. --djk
-        if (window.getMarkupDocumentViewer().authorStyleDisabled)
+        if (getBrowser().markupDocumentViewer.authorStyleDisabled)
         {
             let css = [];
             // FIXME: Broken for imgspans.

common/content/io.js

@@ -119,9 +119,9 @@ function IO() //{{{
             if (path.exists() && path.normalize)
                 path.normalize();
         }
-        catch(e)
+        catch (e)
         {
-            return { exists: function () false, __noSuchMethod__: function () { throw e } };
+            return { exists: function () false, __noSuchMethod__: function () { throw e; } };
         }
         return path;
     }

common/content/liberator.js

@@ -98,7 +98,6 @@ const liberator = (function () //{{{
             "Allow reading of an RC file in the current directory",
             "boolean", false);
 
-
         const groups = {
             config: {
                 opts: config.guioptions,

vimperator/TODO

@@ -22,6 +22,7 @@ BUGS:
 
 (recent CVS regressions):
 - visual caret mode is broken
+- BookmarkAdd is fired once for each bookmark periodically i.e. not in response to adding a bookmark
 
 FEATURES:
 9 fix local options

vimperator/content/bookmarks.js

@@ -40,7 +40,7 @@ if (liberator.options.getPref("extensions.vimperator.commandline_cmd_history"))
         store = liberator.storage["quickmarks"];
         pref = liberator.options.getPref("extensions.vimperator.quickmarks")
                         .split("\n");
-        while(pref.length > 0)
+        while (pref.length > 0)
             store.set(pref.shift(), pref.shift());
 
         liberator.options.resetPref("extensions.vimperator.commandline_cmd_history");