diff --git a/common/Makefile.common b/common/Makefile.common index 4cac38e4..fcb9ebbc 100644 --- a/common/Makefile.common +++ b/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 $@" diff --git a/common/content/buffer.js b/common/content/buffer.js index af08876c..7527f7ad 100644 --- a/common/content/buffer.js +++ b/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) - { - try - { - window.getMarkupDocumentViewer().authorStyleDisabled = value; - } - catch (e) {} - - return value; - }, - getter: function () - { - try - { - return window.getMarkupDocumentViewer().authorStyleDisabled; - } - catch (e) {} - } + setter: function (value) getBrowser().markupDocumentViewer.authorStyleDisabled = value, + getter: function () getBrowser().markupDocumentViewer.authorStyleDisabled }); /////////////////////////////////////////////////////////////////////////////}}} diff --git a/common/content/completion.js b/common/content/completion.js index bc81887f..bf4a9622 100644 --- a/common/content/completion.js +++ b/common/content/completion.js @@ -1222,7 +1222,7 @@ function Completion() //{{{ {item.item.indicator} { process.call(this, item, text) } ]; - + context.completions = util.map(tabs.browsers, function ([i, browser]) { let indicator = " "; @@ -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) { diff --git a/common/content/events.js b/common/content/events.js index dce30d80..3eadb398 100644 --- a/common/content/events.js +++ b/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)); } diff --git a/common/content/hints.js b/common/content/hints.js index c9b8957f..ca55ac9a 100644 --- a/common/content/hints.js +++ b/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. diff --git a/common/content/io.js b/common/content/io.js index 0932f5a4..fd111d52 100644 --- a/common/content/io.js +++ b/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; } diff --git a/common/content/liberator.js b/common/content/liberator.js index bf7a14f2..9ce88e78 100644 --- a/common/content/liberator.js +++ b/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, diff --git a/common/content/options.js b/common/content/options.js index 54cc90a2..460490bb 100644 --- a/common/content/options.js +++ b/common/content/options.js @@ -578,7 +578,7 @@ function Options() //{{{ reset = (postfix == "&"); invertBoolean = (postfix == "!"); } - + if (name == "all" && reset) liberator.echoerr("You can't reset all options, it could make " + config.hostApplication + " unusable."); else if (name == "all") diff --git a/common/content/ui.js b/common/content/ui.js index dc2c314b..56fd1852 100644 --- a/common/content/ui.js +++ b/common/content/ui.js @@ -177,7 +177,7 @@ function CommandLine() //{{{ PAGE_DOWN: {}, RESET: null, - get completion() + get completion() { let str = commandline.command; return str.substring(this.prefix.length, str.length - this.suffix.length); diff --git a/vimperator/TODO b/vimperator/TODO index 7ccff025..0965f954 100644 --- a/vimperator/TODO +++ b/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 diff --git a/vimperator/content/bookmarks.js b/vimperator/content/bookmarks.js index 7d749c57..9dd6e9b1 100644 --- a/vimperator/content/bookmarks.js +++ b/vimperator/content/bookmarks.js @@ -40,9 +40,9 @@ 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"); liberator.options.resetPref("extensions.vimperator.commandline_search_history"); liberator.options.resetPref("extensions.vimperator.quickmarks");