From a0fcde5b4a3e8f9a988a18dc0fa37b9513a3bbd0 Mon Sep 17 00:00:00 2001 From: Ted Pavlic Date: Thu, 15 Jan 2009 22:49:43 -0500 Subject: [PATCH 01/40] Add THIS_LANG sanity check to Makefile.doc. --- common/Makefile.doc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/Makefile.doc b/common/Makefile.doc index a340d77a..7111a941 100644 --- a/common/Makefile.doc +++ b/common/Makefile.doc @@ -6,6 +6,9 @@ BASE = ../../../common THIS_LOCALE = $(notdir $(shell pwd)) THIS_LANG = $(firstword $(subst -, ,$(THIS_LOCALE))) +ifneq ($(strip $(shell echo -n $(THIS_LANG) | wc -c)),2) +THIS_LANG = en +endif ADC_SRC_FILES = $(wildcard *.txt) ADC_FILES = $(ADC_SRC_FILES:%.txt=%.html) From 1019daa5ca6865b2d24149d72234b6cf5d0c0782 Mon Sep 17 00:00:00 2001 From: Ted Pavlic Date: Fri, 16 Jan 2009 13:34:05 -0500 Subject: [PATCH 02/40] Change (\S+) to (\w+) in abbreviation matching so that "VIMP expands (to match Vim behavior). --- common/content/editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/content/editor.js b/common/content/editor.js index 2b2bbd3f..a7957355 100644 --- a/common/content/editor.js +++ b/common/content/editor.js @@ -1010,7 +1010,7 @@ function Editor() //{{{ let text = textbox.value; let currStart = textbox.selectionStart; let currEnd = textbox.selectionEnd; - let foundWord = text.substring(0, currStart).replace(/^(.|\n)*?(\S+)$/m, "$2"); // get last word \b word boundary + let foundWord = text.substring(0, currStart).replace(/^(.|\n)*?(\w+)$/m, "$2"); // get last word \b word boundary if (!foundWord) return true; From b758e2f729918c7f77c6a41d3cb901ea14e03aff Mon Sep 17 00:00:00 2001 From: Ted Pavlic Date: Fri, 16 Jan 2009 14:02:04 -0500 Subject: [PATCH 03/40] Make sure LHS of :abbr is is all word characters. E474 otherwise (mimic Vim). --- common/content/editor.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/common/content/editor.js b/common/content/editor.js index a7957355..ca8fddc6 100644 --- a/common/content/editor.js +++ b/common/content/editor.js @@ -166,7 +166,15 @@ function Editor() //{{{ { let [lhs, rhs] = args; if (rhs) + { + if (lhs.match(/\W/)) + { + liberator.echoerr("E474: Invalid argument"); + return false; + } + editor.addAbbreviation(mode, lhs, rhs); + } else editor.listAbbreviations(mode, lhs || ""); }, From 704303c108c1db3b318de4e272ac9af558985e51 Mon Sep 17 00:00:00 2001 From: Ted Pavlic Date: Fri, 16 Jan 2009 14:19:17 -0500 Subject: [PATCH 04/40] Moved :abbr LHS non-word match to outside RHS check. Want to check LHS always (like Vim). --- common/content/editor.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/common/content/editor.js b/common/content/editor.js index ca8fddc6..90a146cd 100644 --- a/common/content/editor.js +++ b/common/content/editor.js @@ -165,16 +165,13 @@ function Editor() //{{{ function (args) { let [lhs, rhs] = args; - if (rhs) + if (lhs.match(/\W/)) { - if (lhs.match(/\W/)) - { - liberator.echoerr("E474: Invalid argument"); - return false; - } - - editor.addAbbreviation(mode, lhs, rhs); + liberator.echoerr("E474: Invalid argument"); + return false; } + if (rhs) + editor.addAbbreviation(mode, lhs, rhs); else editor.listAbbreviations(mode, lhs || ""); }, From aca074f82bcd713fe2609c9816d7d7bee38b6983 Mon Sep 17 00:00:00 2001 From: Ted Pavlic Date: Fri, 16 Jan 2009 19:21:04 -0500 Subject: [PATCH 05/40] Fix :abbr with no argument (in future, will be less push happy). --- common/content/editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/content/editor.js b/common/content/editor.js index 90a146cd..307a7ac3 100644 --- a/common/content/editor.js +++ b/common/content/editor.js @@ -165,7 +165,7 @@ function Editor() //{{{ function (args) { let [lhs, rhs] = args; - if (lhs.match(/\W/)) + if (lhs && lhs.match(/\W/)) { liberator.echoerr("E474: Invalid argument"); return false; From a2c0233fc0b96b6a1612d881c2c70ce719c46815 Mon Sep 17 00:00:00 2001 From: Ted Pavlic Date: Fri, 16 Jan 2009 14:59:36 -0500 Subject: [PATCH 06/40] After some investigation, it appears like Vim only outlaws quotes in :abbr. TODO: Make :abbr abcd\ efgh work like Vim (i.e., map abcd\ to efgh). That's a bigger change to how the command line is parsed. --- common/content/editor.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/content/editor.js b/common/content/editor.js index 307a7ac3..25159808 100644 --- a/common/content/editor.js +++ b/common/content/editor.js @@ -165,7 +165,7 @@ function Editor() //{{{ function (args) { let [lhs, rhs] = args; - if (lhs && lhs.match(/\W/)) + if (lhs && lhs.match(/[\s"']/)) { liberator.echoerr("E474: Invalid argument"); return false; @@ -1015,7 +1015,7 @@ function Editor() //{{{ let text = textbox.value; let currStart = textbox.selectionStart; let currEnd = textbox.selectionEnd; - let foundWord = text.substring(0, currStart).replace(/^(.|\n)*?(\w+)$/m, "$2"); // get last word \b word boundary + let foundWord = text.substring(0, currStart).replace(/^(.|\n)*?([^\s"']+)$/m, "$2"); // get last word \b word boundary if (!foundWord) return true; From 22d3bc470b56553c8ec566199e86edd4715aaeec Mon Sep 17 00:00:00 2001 From: Ted Pavlic Date: Fri, 16 Jan 2009 15:22:44 -0500 Subject: [PATCH 07/40] Change :abbr to parse its args.string itself. --- common/content/editor.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/content/editor.js b/common/content/editor.js index 25159808..4dc0f8d1 100644 --- a/common/content/editor.js +++ b/common/content/editor.js @@ -164,12 +164,13 @@ function Editor() //{{{ "Abbreviate a key sequence" + modeDescription, function (args) { - let [lhs, rhs] = args; - if (lhs && lhs.match(/[\s"']/)) + let matches = args.string.match(/^([^\s"']*)\s*(.*)/); + if (! matches) { liberator.echoerr("E474: Invalid argument"); return false; } + let [,lhs,rhs] = matches; if (rhs) editor.addAbbreviation(mode, lhs, rhs); else From ba948246cc11476e54fd2d238efb73e3a61e05de Mon Sep 17 00:00:00 2001 From: Ted Pavlic Date: Fri, 16 Jan 2009 15:33:43 -0500 Subject: [PATCH 08/40] Fix ":abbr this'is'a'test" to return an error, like Vim. Also note in map.txt that :abbr LHS cannot contain quotes or spaces. --- common/content/editor.js | 2 +- vimperator/locale/en-US/map.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/content/editor.js b/common/content/editor.js index 4dc0f8d1..a8f4c481 100644 --- a/common/content/editor.js +++ b/common/content/editor.js @@ -164,7 +164,7 @@ function Editor() //{{{ "Abbreviate a key sequence" + modeDescription, function (args) { - let matches = args.string.match(/^([^\s"']*)\s*(.*)/); + let matches = args.string.match(/^\s*([^\s"']*)(?:\s*$|\s+(.*))/); if (! matches) { liberator.echoerr("E474: Invalid argument"); diff --git a/vimperator/locale/en-US/map.txt b/vimperator/locale/en-US/map.txt index 152466bc..53fa2920 100644 --- a/vimperator/locale/en-US/map.txt +++ b/vimperator/locale/en-US/map.txt @@ -179,7 +179,8 @@ section:Abbreviations[abbreviations] ________________________________________________________________________________ Abbreviate a key sequence. Abbreviate {lhs} to {rhs}. If only {lhs} is given, list all abbreviations that start with {lhs}. List all abbreviations, if no -arguments are given. +arguments are given. To prevent ambiguity, the {lhs} cannot contain +quotes (' or ") or spaces. ________________________________________________________________________________ From 21c4f0f89e86c807a01bddc5c63bbbdda74aa0a6 Mon Sep 17 00:00:00 2001 From: Ted Pavlic Date: Sat, 17 Jan 2009 00:39:01 -0500 Subject: [PATCH 09/40] Setup abbreviation behavior to be like an isk-less Vim. For now, the internal equivalent of "iskeyword" is [^\s'"]. In the future, the internal "iskeyword" equivalent can be expanded. It may be overboard to add an "iskeyword" option, as it applies to lots more things than :abbr. Additionally, it's not clear why it's bad to call keyword characters everything except whitespace and quotes. TODO: Should abbreviations be triggered by any non-keyword character? TODO: Should abbreviations be triggered by ? TODO: Should abbreviations be able to include , etc.? --- common/content/editor.js | 43 +++++++++++++++++++++++++++++++-- vimperator/locale/en-US/map.txt | 24 ++++++++++++++++-- 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/common/content/editor.js b/common/content/editor.js index a8f4c481..f4338c47 100644 --- a/common/content/editor.js +++ b/common/content/editor.js @@ -46,6 +46,45 @@ function Editor() //{{{ // XXX: this strikes me as a rather odd ds; everyone's a critic --djk var abbreviations = {}; // abbreviations["lhr"][0]["{i,c,!}","rhs"] + // (summarized from Vim's ":help abbreviations") + // + // There are three types of abbreviations: + // + // full-id: Consists entirely of keyword characters. + // ("foo", "g3", "-1") + // + // end-id: Ends in a keyword character, but all other + // are not keyword characters. + // ("#i", "..f", "$/7") + // + // non-id: Ends in a non-keyword character, but the + // others can be of any type other than space + // and tab. + // ("def#", "4/7$") + // + // Example strings that cannot be abbreviations: + // "a.b", "#def", "a b", "_$r" + // + // For now, a keyword character is anything except for \s, ", or ' + // (i.e., whitespace and quotes). In Vim, a keyword character is + // specified by the 'iskeyword' setting and is a much less inclusive + // list. + // + // TODO: Make keyword definition closer to Vim's default keyword + // definition (which differs across platforms). + // + + let nonkw = "\\s\"'"; + let keyword = "[^" + nonkw + "]"; + let nonkeyword = "[" + nonkw + "]"; + + let full_id = keyword + "+"; + let end_id = nonkeyword + "+" + keyword; + let non_id = "\\S*" + nonkeyword; + + // Used in addAbbrevation and expandAbbreviation + var abbrevmatch = full_id + "|" + end_id + "|" + non_id; + function getEditor() { return window.document.commandDispatcher.focusedElement; @@ -164,7 +203,7 @@ function Editor() //{{{ "Abbreviate a key sequence" + modeDescription, function (args) { - let matches = args.string.match(/^\s*([^\s"']*)(?:\s*$|\s+(.*))/); + let matches = args.string.match(RegExp("^\\s*($|" + abbrevmatch + ")(?:\\s*$|\\s+(.*))")); if (! matches) { liberator.echoerr("E474: Invalid argument"); @@ -1016,7 +1055,7 @@ function Editor() //{{{ let text = textbox.value; let currStart = textbox.selectionStart; let currEnd = textbox.selectionEnd; - let foundWord = text.substring(0, currStart).replace(/^(.|\n)*?([^\s"']+)$/m, "$2"); // get last word \b word boundary + let foundWord = text.substring(0, currStart).replace(RegExp("^(.|\\n)*?\\s*(" + abbrevmatch + ")$", "m"), "$2"); // get last word \b word boundary if (!foundWord) return true; diff --git a/vimperator/locale/en-US/map.txt b/vimperator/locale/en-US/map.txt index 53fa2920..63eeb989 100644 --- a/vimperator/locale/en-US/map.txt +++ b/vimperator/locale/en-US/map.txt @@ -172,6 +172,27 @@ ________________________________________________________________________________ section:Abbreviations[abbreviations] +Vimperator can automatically replace words identified as abbreviations, +which may be used to save typing or to correct commonly misspelled +words. An abbreviation can be one of three types that are defined by the +types of constituent characters. Whitespace and quotes are non-keyword +types, and all other characters are keyword types. + +. A "full-id" abbreviation consists entirely of characters that are not +keyword characters (e.g., "teh", "msoft"). + +. An "end-id" abbreviation ends in keyword character but otherwise +contains all non-keyword characters (e.g., "'i"). + +. A "non-id" abbreviation ends in a non-keyword character but otherwise +contains any non-whitespace character (e.g., "def'"). + +Strings that cannot be abbreviations include "a'b" and "a b". + +An abbreviation is recognized when a space is typed after the +abbreviation. There are no default abbreviations, and abbreviations are +never recursive. + |:ab| |:abbreviate| ||:ab[breviate] {lhs} {rhs}|| + ||:ab[breviate] {lhs}|| + @@ -179,8 +200,7 @@ section:Abbreviations[abbreviations] ________________________________________________________________________________ Abbreviate a key sequence. Abbreviate {lhs} to {rhs}. If only {lhs} is given, list all abbreviations that start with {lhs}. List all abbreviations, if no -arguments are given. To prevent ambiguity, the {lhs} cannot contain -quotes (' or ") or spaces. +arguments are given. ________________________________________________________________________________ From d4b88a73d71b7057b8b2e88a3a3b3d4ddcb6e3db Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Fri, 16 Jan 2009 22:23:52 +1100 Subject: [PATCH 10/40] Fix typos in :highlight help. --- vimperator/locale/en-US/styling.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vimperator/locale/en-US/styling.txt b/vimperator/locale/en-US/styling.txt index 3c5dc68f..42976956 100644 --- a/vimperator/locale/en-US/styling.txt +++ b/vimperator/locale/en-US/styling.txt @@ -50,10 +50,10 @@ Valid groups are: *Keyword* A bookmark keyword for a URL *LineNr* The line number of an error *Message* -*ModeMsg* The mode indicator in the command line +*ModeMsg* The mode indicator in the command-line *MoreMsg* The indicator that there is more text to view *NonText* -*Normal* Normal text in the command line +*Normal* Normal text in the command-line *Null* A JavaScript Null object *Number* A JavaScript Number object *Object* A JavaScript Object From a388a02cf0ce2649c7d343c22f6f70138b74c07e Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Fri, 16 Jan 2009 22:24:25 +1100 Subject: [PATCH 11/40] Add quick 'n' dirty completion.highlightGroup for :command-complete. --- common/content/completion.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/content/completion.js b/common/content/completion.js index d9058059..a136b7af 100644 --- a/common/content/completion.js +++ b/common/content/completion.js @@ -1553,6 +1553,9 @@ function Completion() //{{{ } }, + // XXX + highlightGroup: function highlightGroup(context, args) commands.get("highlight").completer(context, args), + history: function _history(context, maxItems) { context.format = history.format; From 624516108c3f3ec49edd9f1ac0278ace0b59d516 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Fri, 16 Jan 2009 23:29:09 +1100 Subject: [PATCH 12/40] Fix comment typo. --- common/content/completion.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/content/completion.js b/common/content/completion.js index a136b7af..8fb21af5 100644 --- a/common/content/completion.js +++ b/common/content/completion.js @@ -835,7 +835,7 @@ function Completion() //{{{ // Get an element from the stack. If @n is negative, // count from the top of the stack, otherwise, the bottom. // If @m is provided, return the @mth value of element @o - // of the stack entey at @n. + // of the stack entry at @n. let get = function get(n, m, o) { let a = stack[n >= 0 ? n : stack.length + n]; From 74256da392a03bf9f659dbe1b3c0311548feb2a2 Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Sat, 17 Jan 2009 02:51:18 -0500 Subject: [PATCH 13/40] Die on unclosed quote --- common/content/commands.js | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/common/content/commands.js b/common/content/commands.js index d78cf393..b95b2437 100644 --- a/common/content/commands.js +++ b/common/content/commands.js @@ -463,7 +463,15 @@ function Commands() //{{{ // using literal etc parseArgs: function (str, options, argCount, allowUnknownOptions, literal, complete, extra) { - function getNextArg(str) commands.parseArg(str); + function getNextArg(str) + { + let [count, arg, quote] = commands.parseArg(str); + if (quote == "\\" && !complete) + return [,,,"Trailing \\"]; + if (quote && !complete) + return [,,,"E114: Missing quote: " + quote]; + return [count, arg, quote]; + } if (!options) options = []; @@ -555,9 +563,9 @@ function Commands() //{{{ let sep = sub[optname.length]; if (sep == "=" || /\s/.test(sep) && opt[1] != this.OPTION_NOARG) { - [count, arg, quote] = getNextArg(sub.substr(optname.length + 1)); - if (quote == "\\" && !complete) - return liberator.echoerr("Trailing \\"); + [count, arg, quote, error] = getNextArg(sub.substr(optname.length + 1)); + if (error) + return liberator.echoerr(error); // if we add the argument to an option after a space, it MUST not be empty if (sep != "=" && !quote && arg.length == 0) @@ -646,9 +654,9 @@ function Commands() //{{{ } // if not an option, treat this token as an argument - var [count, arg, quote] = getNextArg(sub); - if (quote == "\\" && !complete) - return liberator.echoerr("Trailing \\"); + let [count, arg, quote, error] = getNextArg(sub); + if (error) + return liberator.echoerr(error); if (complete) { From 86c58757688a14dba3f0bdbe447cdd21aca5c204 Mon Sep 17 00:00:00 2001 From: Ted Pavlic Date: Sat, 17 Jan 2009 12:29:48 -0500 Subject: [PATCH 14/40] Again removed explicit numbering in asciidoc help files. Automatic numbering exists for a reason. It's more elegant and easy to manage. Additionally, because numbering rules can be specified centrally, it adds consistency to the final look of the documents. An editor shouldn't have to think about the current numbering level or number. That should be handled by asciidoc as it builds the final doc. [ However, added explicit first number to make list source code look a little better. ] Also moved $VIMPERATOR_INIT keyword to its correct location in starting.txt. This change partially reverts changeset a1f264639f27d7d5b87e5fbccf54d6890a03ca7d. --- vimperator/locale/en-US/browsing.txt | 10 +++++----- vimperator/locale/en-US/starting.txt | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/vimperator/locale/en-US/browsing.txt b/vimperator/locale/en-US/browsing.txt index ff373878..11f16b8b 100644 --- a/vimperator/locale/en-US/browsing.txt +++ b/vimperator/locale/en-US/browsing.txt @@ -41,18 +41,18 @@ opened in new tabs. Each token is analyzed and in this order: 1. Opened as a local file if it is an existing relative or absolute filename. - - [c]:open /etc/fstab[c] shows the file system table. - - [c]:open ../other/foo.html[c] in your home directory opens + * [c]:open /etc/fstab[c] shows the file system table. + * [c]:open ../other/foo.html[c] in your home directory opens [a]/home/other/foo.html[a] -2. Opened with the specified search engine if the token looks like a search + . Opened with the specified search engine if the token looks like a search string and the first word is the name of a search engine ([c]:open wikipedia linus torvalds[c] opens the Wikipedia entry for linus torvalds). The short name of a search engine is automatically guessed from its name. If you want to set a custom name, you can change it with [c]:dialog searchengines[c]. -3. Opened with the default search engine or keyword (specified with the + . Opened with the default search engine or keyword (specified with the 'defsearch' option) if the first word is no search engine ([c]:open linus torvalds[c] opens a Google search for linux torvalds). -4. Passed directly to Firefox in all other cases ([c]:open www.osnews.com, + . Passed directly to Firefox in all other cases ([c]:open www.osnews.com, www.slashdot.org[c] opens OSNews in the current, and Slashdot in a new background tab). diff --git a/vimperator/locale/en-US/starting.txt b/vimperator/locale/en-US/starting.txt index b971a2f4..a51c5907 100644 --- a/vimperator/locale/en-US/starting.txt +++ b/vimperator/locale/en-US/starting.txt @@ -10,23 +10,23 @@ At startup, Vimperator completes the following tasks in order. 1. Vimperator can perform user initialization commands. When one of the following is successfully located, it is executed, and no further locations are tried. -|$VIMPERATOR_INIT| - a. _$VIMPERATOR_INIT_ -- May contain a single ex command (e.g., + a. |$VIMPERATOR_INIT| + _$VIMPERATOR_INIT_ -- May contain a single ex command (e.g., "[c]:source {file}[c]"). - b. [a]\~/_vimperatorrc[a] -- Windows only. If this file exists, its contents - are executed. - c. [a]\~/.vimperatorrc[a] -- If this file exists, its contents are executed. + .. [a]\~/_vimperatorrc[a] -- Windows only. If this file exists, its contents + are executed. + .. [a]\~/.vimperatorrc[a] -- If this file exists, its contents are executed. -2. If 'exrc' is set, then any RC file in the current directory is also sourced. + . If 'exrc' is set, then any RC file in the current directory is also sourced. -3. All directories in 'runtimepath' are searched for a "plugin" -subdirectory and all yet unloaded plugins are loaded. For each plugin -directory, all *.\{js,vimp} files (including those in further -subdirectories) are sourced alphabetically. No plugins will be sourced -if 'noloadplugins' is set. Any particular plugin will not be loaded if -it has already been loaded (e.g., by an earlier [c]:loadplugins[c] -command). + . All directories in 'runtimepath' are searched for a "plugin" + subdirectory and all yet unloaded plugins are loaded. For each + plugin directory, all *.\{js,vimp} files (including those in further + subdirectories) are sourced alphabetically. No plugins will be + sourced if 'noloadplugins' is set. Any particular plugin will + not be loaded if it has already been loaded (e.g., by an earlier + [c]:loadplugins[c] command). The user's ~ (i.e., "home") directory is determined as follows: From 59343a3712de73edd57a1f550559bfd498820eae Mon Sep 17 00:00:00 2001 From: Ted Pavlic Date: Sat, 17 Jan 2009 12:33:28 -0500 Subject: [PATCH 15/40] Revert "Fix typos in :highlight help." This reverts commit 1455b9d27224b1289e7762fef3c4d158c7074877. "Command line" should only be hyphenated when it is a /leading/ compound /modifier/. For example, "command-line interface." See CMOS (or Strunk/White) for more information. --- vimperator/locale/en-US/styling.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vimperator/locale/en-US/styling.txt b/vimperator/locale/en-US/styling.txt index 42976956..3c5dc68f 100644 --- a/vimperator/locale/en-US/styling.txt +++ b/vimperator/locale/en-US/styling.txt @@ -50,10 +50,10 @@ Valid groups are: *Keyword* A bookmark keyword for a URL *LineNr* The line number of an error *Message* -*ModeMsg* The mode indicator in the command-line +*ModeMsg* The mode indicator in the command line *MoreMsg* The indicator that there is more text to view *NonText* -*Normal* Normal text in the command-line +*Normal* Normal text in the command line *Null* A JavaScript Null object *Number* A JavaScript Number object *Object* A JavaScript Object From f618833c183f30e54c6f1e7b0501fb3c19314f1f Mon Sep 17 00:00:00 2001 From: Ted Pavlic Date: Sat, 17 Jan 2009 12:46:10 -0500 Subject: [PATCH 16/40] More "command-line edits" in prompts. Again, by Chicago Manual of Style (CMOS) and several other style guides, we hyphenate compound /modifiers/ when they come /before/ the word being modified. So the "command line" is not hyphenated, but the "command-line mode" is. This is consistent with Vim help style conventions as well. --- vimperator/locale/en-US/cmdline.txt | 16 ++++++++-------- vimperator/locale/en-US/gui.txt | 2 +- vimperator/locale/en-US/index.txt | 8 ++++---- vimperator/locale/en-US/map.txt | 10 +++++----- vimperator/locale/en-US/options.txt | 6 +++--- vimperator/locale/en-US/tutorial.txt | 6 +++--- vimperator/locale/en-US/various.txt | 6 +++--- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/vimperator/locale/en-US/cmdline.txt b/vimperator/locale/en-US/cmdline.txt index 130bdc13..c1225733 100644 --- a/vimperator/locale/en-US/cmdline.txt +++ b/vimperator/locale/en-US/cmdline.txt @@ -1,6 +1,6 @@ HEADER -|Command-line-mode| |Command-line| + +|Command-line mode| |Command-line| + Command-line mode is used to enter Ex commands (":") and text search patterns ("/" and "?"). @@ -8,7 +8,7 @@ Command-line mode is used to enter Ex commands (":") and text search patterns |:| + ||:|| ________________________________________________________________________________ -Start Command-line mode. In Command-line mode, you can perform extended +Start command-line mode. In command-line mode, you can perform extended commands, which may require arguments. ________________________________________________________________________________ @@ -32,16 +32,16 @@ ________________________________________________________________________________ |c_| + |||| ________________________________________________________________________________ -Recall the previous command-line from the history list which matches the -current command-line. +Recall the previous command line from the history list which matches the +current command line. ________________________________________________________________________________ |c_| + |||| ________________________________________________________________________________ -Recall the next command-line from the history list which matches the current -command-line. +Recall the next command line from the history list which matches the current +command line. ________________________________________________________________________________ @@ -49,7 +49,7 @@ ________________________________________________________________________________ |||| + |||| ________________________________________________________________________________ -Recall the previous command-line from the history list. +Recall the previous command line from the history list. ________________________________________________________________________________ @@ -57,7 +57,7 @@ ________________________________________________________________________________ |||| + |||| ________________________________________________________________________________ -Recall the next command-line from the history list. +Recall the next command line from the history list. ________________________________________________________________________________ section:Command-line{nbsp}completion[cmdline-completion] diff --git a/vimperator/locale/en-US/gui.txt b/vimperator/locale/en-US/gui.txt index b638402c..f56ddfc3 100644 --- a/vimperator/locale/en-US/gui.txt +++ b/vimperator/locale/en-US/gui.txt @@ -10,7 +10,7 @@ and the sidebar. |:emenu| + ||:emenu {menu}|| ________________________________________________________________________________ -Execute {menu} from the command-line. This command provides command-line access +Execute {menu} from the command line. This command provides command-line access to all menu items available from the main Firefox menubar. {menu} is a hierarchical path to the menu item with each submenu separated by a period. E.g. [c]:emenu File.Open File...[c] diff --git a/vimperator/locale/en-US/index.txt b/vimperator/locale/en-US/index.txt index 9186d023..891a7386 100644 --- a/vimperator/locale/en-US/index.txt +++ b/vimperator/locale/en-US/index.txt @@ -128,8 +128,8 @@ section:Command-line{nbsp}editing[ex-edit-index] |||| Expand a command-line abbreviation + -|||| Recall the previous command-line from the history list which matches the current command-line + -|||| Recall the next command-line from the history list which matches the current command-line + +|||| Recall the previous command line from the history list which matches the current command line + +|||| Recall the next command line from the history list which matches the current command line + |||| Complete the word in front of the cursor according to the behavior specified in 'wildmode' + |||| Complete the previous full match when 'wildmode' contains "full" + @@ -172,7 +172,7 @@ section:Ex{nbsp}commands[ex-cmd-index,:index] ||:echo|| Echo the expression + ||:echoerr|| Echo the expression as an error message + ||:echomsg|| Echo the expression as an informational message + -||:emenu|| Execute the specified menu item from the command-line + +||:emenu|| Execute the specified menu item from the command line + ||:execute|| Execute the argument as an Ex command + ||:exusage|| List all Ex commands with a short description + ||:finish|| Stop sourcing a script file + @@ -295,7 +295,7 @@ section:Options[option-index] ||'scroll'|| Number of lines to scroll with and commands + ||'shell'|| Shell to use for executing :! and :run commands + ||'shellcmdflag'|| Flag passed to shell when executing :! and :run commands + -||'showmode'|| Show the current mode in the command-line + +||'showmode'|| Show the current mode in the command line + ||'showstatuslinks'|| Show the destination of the link under the cursor in the status bar + ||'showtabline'|| Control when to show the tab bar of opened web pages + ||'smartcase'|| Override the 'ignorecase' option if the pattern contains uppercase characters + diff --git a/vimperator/locale/en-US/map.txt b/vimperator/locale/en-US/map.txt index 63eeb989..1cfb631e 100644 --- a/vimperator/locale/en-US/map.txt +++ b/vimperator/locale/en-US/map.txt @@ -10,7 +10,7 @@ which are translated to a string of characters. Example: :map :echo new Date().toDateString() -will echo the current date to the command-line when [m][m] is pressed. +will echo the current date to the command line when [m][m] is pressed. There are separate key mapping tables for each of the Normal, Insert, Command-line modes. @@ -143,9 +143,9 @@ ________________________________________________________________________________ |:map-| + ________________________________________________________________________________ -When the first argument to one of the mapping commands is , {rhs} -is not echoed to the command-line, nor, for that matter, is anything else -until the command has completed. +When the first argument to one of the mapping commands is , +{rhs} is not echoed to the command line, nor, for that matter, anything +else until the command has completed. ________________________________________________________________________________ @@ -373,7 +373,7 @@ and will be available in the argument. Replacement text The replacement text {rep} is scanned for escape sequences and these are -replaced with values from the user entered command-line. The resulting string +replaced with values from the user-entered command line. The resulting string is then executed as an Ex command. The valid escape sequences are: diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt index fad0462e..05a433be 100644 --- a/vimperator/locale/en-US/options.txt +++ b/vimperator/locale/en-US/options.txt @@ -585,7 +585,7 @@ ____ //____ //Default height for preview window // -//Value must be between 1 and 50. If the value is too high, completions may cover the command-line. Close the preview window with :pclose. +//Value must be between 1 and 50. If the value is too high, completions may cover the command line. Close the preview window with :pclose. //Note: Option currently disabled //____ @@ -650,7 +650,7 @@ ____ |\'nosmd'| |\'noshowmode'| |\'smd'| |\'showmode'| ||'showmode' 'smd'|| boolean (default: on) ____ -Show the current mode in the command-line. +Show the current mode in the command line. ____ @@ -663,7 +663,7 @@ Also links which are focused by keyboard commands like [m][m] are shown. Po .---`-------------------------------------- *0* Don't show link destination *1* Show the link in the status line -*2* Show the link in the command-line +*2* Show the link in the command line ------------------------------------------- ____ diff --git a/vimperator/locale/en-US/tutorial.txt b/vimperator/locale/en-US/tutorial.txt index daddb9ea..70a8c019 100644 --- a/vimperator/locale/en-US/tutorial.txt +++ b/vimperator/locale/en-US/tutorial.txt @@ -159,12 +159,12 @@ to return here, depending on which key you used to activate QuickHint mode. section:Common{nbsp}issues[common-issues] Say you get half-way done typing in a new URL, only to remember that you've -already got that page open in the previous tab. Your command-line might look +already got that page open in the previous tab. Your command line might look something like this: :open my.partial.url/fooba -You can exit the command-line and access the already loaded page with the +You can exit the command line and access the already loaded page with the following: gT @@ -210,7 +210,7 @@ make the best use of them. It's exactly what it sounds like. This command will display a colorized, scrollable and clickable list of the locations in Vimperator's history. * [c]:emenu[c] -- - Access the Firefox menus through the Vimperator command-line. + Access the Firefox menus through the Vimperator command line. Feel free to explore at this point. If you use the [c]:tabopen[c] command, diff --git a/vimperator/locale/en-US/various.txt b/vimperator/locale/en-US/various.txt index 941364ba..08545ec4 100644 --- a/vimperator/locale/en-US/various.txt +++ b/vimperator/locale/en-US/various.txt @@ -19,7 +19,7 @@ ____ ||:norm[al][!] {commands}|| + ________________________________________________________________________________ Execute Normal mode commands {commands}. This makes it possible to execute -Normal mode commands typed on the command-line. {commands} is executed like it +Normal mode commands typed on the command line. {commands} is executed like it is typed. If the [!] is given, mappings will not be used. {commands} should be a complete command. {commands} cannot start with a space. Put a 1 (one) before it, 1 space is one space. @@ -94,8 +94,8 @@ section:Uncategorized{nbsp}help[uncategorized] || || + |||| ________________________________________________________________________________ -Focus content. Exits any command-line or hint mode and returns to browser -mode. Also focuses the web page, in case a form field has focus and eats +Focus content. Exits command-line or hint mode and returns to browser +mode. Also focuses the web page in case a form field has focus and eats our key presses. ________________________________________________________________________________ From 45f6153de486a6052d715bc6bd25cc31216e8f0e Mon Sep 17 00:00:00 2001 From: Ted Pavlic Date: Sat, 17 Jan 2009 12:55:56 -0500 Subject: [PATCH 17/40] More command-line edits (now elsewhere in the source). --- common/content/events.js | 2 +- common/content/liberator.js | 4 ++-- common/content/ui.js | 12 ++++++------ common/content/util.js | 2 +- vimperator/TODO | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/common/content/events.js b/common/content/events.js index 5478322a..d50c76c5 100644 --- a/common/content/events.js +++ b/common/content/events.js @@ -887,7 +887,7 @@ function Events() //{{{ * to be taken literally, prepend it with a "\\". * @param {boolean} noremap Allow recursive mappings. * @param {boolean} silent Whether the command should be echoed to the - * command-line. + * command line. * @returns {boolean} */ feedkeys: function (keys, noremap, silent) diff --git a/common/content/liberator.js b/common/content/liberator.js index ce11a326..87fcbd96 100644 --- a/common/content/liberator.js +++ b/common/content/liberator.js @@ -656,7 +656,7 @@ const liberator = (function () //{{{ beep: function () { - // FIXME: popups clear the command-line + // FIXME: popups clear the command line if (options["visualbell"]) { // flash the visual bell @@ -745,7 +745,7 @@ const liberator = (function () //{{{ // But it's _supposed_ to show the MOW on startup when there are // messages, surely? As far as I'm concerned it essentially works // exactly as it should with the DISALLOW_MULTILINE flag removed. - // Sending N messages to the command-line in a row and having them + // Sending N messages to the command line in a row and having them // overwrite each other is completely broken. I also think many of // those messages like "Added quick mark" are plain silly but if // you don't like them you can set verbose=0, or use :silent when diff --git a/common/content/ui.js b/common/content/ui.js index f526b02a..6254b67d 100644 --- a/common/content/ui.js +++ b/common/content/ui.js @@ -605,7 +605,7 @@ function CommandLine() //{{{ } /** - * Determines whether the command-line should be visible. + * Determines whether the command line should be visible. * * @return {boolean} */ @@ -1026,7 +1026,7 @@ function CommandLine() //{{{ get message() messageBox.value, /** - * Open the command-line. The main mode is set to + * Open the command line. The main mode is set to * COMMAND_LINE, the extended mode to extendedMode. * Further, callbacks defined for extendedMode are * triggered as appropriate (see {@link Liberator#registerCallback}). @@ -1061,8 +1061,8 @@ function CommandLine() //{{{ }, /** - * Closes the command-line. This is ordinarily triggered automatically - * by a mode change. Will not hide the command-line immediately if + * Closes the command line. This is ordinarily triggered automatically + * by a mode change. Will not hide the command line immediately if * called directly after a successful command, otherwise it will. */ close: function close() @@ -1099,7 +1099,7 @@ function CommandLine() //{{{ }, /** - * Hides the command-line, and shows any status messages that + * Hides the command line, and shows any status messages that * are under it. */ hide: function hide() @@ -1108,7 +1108,7 @@ function CommandLine() //{{{ }, /** - * Output the given string onto the command-line. With no flags, the + * Output the given string onto the command line. With no flags, the * message will be shown in the status line if it's short enough to * fit, and contains no new lines, and isn't XML. Otherwise, it will be * shown in the MOW. diff --git a/common/content/util.js b/common/content/util.js index 286937c3..95a73230 100644 --- a/common/content/util.js +++ b/common/content/util.js @@ -177,7 +177,7 @@ const util = { //{{{ /** * Copies a string to the system clipboard. If verbose is specified - * the copied string is also echoed to the command-line. + * the copied string is also echoed to the command line. * * @param {string} str * @param {boolean} verbose diff --git a/vimperator/TODO b/vimperator/TODO index 77810e86..7ee8644c 100644 --- a/vimperator/TODO +++ b/vimperator/TODO @@ -26,7 +26,7 @@ BUGS: else it chucks, I haven't investigated --djk - messages is still broken in several ways - needs testing. => :ls | :echomsg "Foobar" doesn't add "Foobar" to the already open MOW. - => it often overwrites the open command-line while editing etc. + => it often overwrites the open command line while editing etc. - and autocmd 'keywords' are not available when adding a bookmark - they're being set after the observer triggers the autocmd event. - MOW is broken for multiple commands when open E.g. :ls | ls From db872c5e651e55750a2b79081b46399a26939fba Mon Sep 17 00:00:00 2001 From: Ted Pavlic Date: Sat, 17 Jan 2009 13:02:41 -0500 Subject: [PATCH 18/40] Added "filetype=asciidoc" to help file modlines. At the moment, only "syntax=asciidoc" was specified. The asciidoc_filetype.vim that is distributed with Asciidoc gives the installer two options -- to either associate every *.txt file with asciidoc or to try to decipher whether or not the file is an asciidoc using the first 50 lines. So it's not given that a developer will open the *.txt files with ft=asciidoc, and so it's helpful to have it explicitly in the modeline. --- muttator/locale/en-US/intro.txt | 2 +- vimperator/locale/en-US/autocommands.txt | 2 +- vimperator/locale/en-US/browsing.txt | 2 +- vimperator/locale/en-US/buffer.txt | 2 +- vimperator/locale/en-US/cmdline.txt | 2 +- vimperator/locale/en-US/developer.txt | 2 +- vimperator/locale/en-US/eval.txt | 2 +- vimperator/locale/en-US/gui.txt | 2 +- vimperator/locale/en-US/hints.txt | 2 +- vimperator/locale/en-US/index.txt | 2 +- vimperator/locale/en-US/intro.txt | 2 +- vimperator/locale/en-US/map.txt | 2 +- vimperator/locale/en-US/marks.txt | 2 +- vimperator/locale/en-US/message.txt | 2 +- vimperator/locale/en-US/options.txt | 2 +- vimperator/locale/en-US/pattern.txt | 2 +- vimperator/locale/en-US/print.txt | 2 +- vimperator/locale/en-US/repeat.txt | 2 +- vimperator/locale/en-US/starting.txt | 2 +- vimperator/locale/en-US/styling.txt | 2 +- vimperator/locale/en-US/tabs.txt | 2 +- vimperator/locale/en-US/tutorial.txt | 2 +- vimperator/locale/en-US/various.txt | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/muttator/locale/en-US/intro.txt b/muttator/locale/en-US/intro.txt index 20369b4e..b9b633ac 100644 --- a/muttator/locale/en-US/intro.txt +++ b/muttator/locale/en-US/intro.txt @@ -99,4 +99,4 @@ on irc.freenode.net or check the Wiki for frequently asked questions. Make sure, you have read the TODO file first, as I am aware of many things which can be improved when I find time for it or get patches. -// vim: set syntax=asciidoc: +// vim: set syntax=asciidoc filetype=asciidoc: diff --git a/vimperator/locale/en-US/autocommands.txt b/vimperator/locale/en-US/autocommands.txt index 9ae46a88..5fac221e 100644 --- a/vimperator/locale/en-US/autocommands.txt +++ b/vimperator/locale/en-US/autocommands.txt @@ -86,4 +86,4 @@ Set the filetype to mail when editing email at Gmail: :autocmd LocationChange .* :set editor=gvim\ -f :autocmd LocationChange mail\.google\.com :set editor="gvim -f -c 'set ft=mail'" -// vim: set syntax=asciidoc: +// vim: set syntax=asciidoc filetype=asciidoc: diff --git a/vimperator/locale/en-US/browsing.txt b/vimperator/locale/en-US/browsing.txt index 11f16b8b..1f2e45bb 100644 --- a/vimperator/locale/en-US/browsing.txt +++ b/vimperator/locale/en-US/browsing.txt @@ -346,4 +346,4 @@ ________________________________________________________________________________ Print the current directory name. ________________________________________________________________________________ -// vim: set syntax=asciidoc: +// vim: set syntax=asciidoc filetype=asciidoc: diff --git a/vimperator/locale/en-US/buffer.txt b/vimperator/locale/en-US/buffer.txt index aa4e3d81..0453b3c9 100644 --- a/vimperator/locale/en-US/buffer.txt +++ b/vimperator/locale/en-US/buffer.txt @@ -358,4 +358,4 @@ the page's default style sheet is used. All author styling can be removed by setting the 'usermode' option. ________________________________________________________________________________ -// vim: set syntax=asciidoc fdm=marker: +// vim: set syntax=asciidoc filetype=asciidoc fdm=marker: diff --git a/vimperator/locale/en-US/cmdline.txt b/vimperator/locale/en-US/cmdline.txt index c1225733..4c050a6d 100644 --- a/vimperator/locale/en-US/cmdline.txt +++ b/vimperator/locale/en-US/cmdline.txt @@ -77,4 +77,4 @@ ________________________________________________________________________________ Complete the previous full match when 'wildmode' contains "full". ________________________________________________________________________________ -// vim: set syntax=asciidoc: +// vim: set syntax=asciidoc filetype=asciidoc: diff --git a/vimperator/locale/en-US/developer.txt b/vimperator/locale/en-US/developer.txt index b6b876d5..1a9ce853 100644 --- a/vimperator/locale/en-US/developer.txt +++ b/vimperator/locale/en-US/developer.txt @@ -85,4 +85,4 @@ Now you can copy the asciidoc text but always make sure it looks OK after you compile the help file with "make doc", as the auto-generation might not work correctly for all special cases. -// vim: set syntax=asciidoc: +// vim: set syntax=asciidoc filetype=asciidoc: diff --git a/vimperator/locale/en-US/eval.txt b/vimperator/locale/en-US/eval.txt index 139001ba..34204742 100644 --- a/vimperator/locale/en-US/eval.txt +++ b/vimperator/locale/en-US/eval.txt @@ -81,4 +81,4 @@ Deletes the variable {name}. Several variable names can be given. When used with [!] no error message is output for non-existing variables. ________________________________________________________________________________ -// vim: set syntax=asciidoc: +// vim: set syntax=asciidoc filetype=asciidoc: diff --git a/vimperator/locale/en-US/gui.txt b/vimperator/locale/en-US/gui.txt index f56ddfc3..cead079f 100644 --- a/vimperator/locale/en-US/gui.txt +++ b/vimperator/locale/en-US/gui.txt @@ -87,4 +87,4 @@ standard Firefox View->Sidebar menu. Add-ons, Preferences and Downloads are also available in the sidebar. ________________________________________________________________________________ -// vim: set syntax=asciidoc: +// vim: set syntax=asciidoc filetype=asciidoc: diff --git a/vimperator/locale/en-US/hints.txt b/vimperator/locale/en-US/hints.txt index d4bc1059..1f8a0b8f 100644 --- a/vimperator/locale/en-US/hints.txt +++ b/vimperator/locale/en-US/hints.txt @@ -63,4 +63,4 @@ Hintable elements for all extended hint modes can be set in the 'extendedhinttags' XPath string. ________________________________________________________________________________ -// vim: set syntax=asciidoc: +// vim: set syntax=asciidoc filetype=asciidoc: diff --git a/vimperator/locale/en-US/index.txt b/vimperator/locale/en-US/index.txt index 891a7386..8fa5706f 100644 --- a/vimperator/locale/en-US/index.txt +++ b/vimperator/locale/en-US/index.txt @@ -311,4 +311,4 @@ section:Options[option-index] ||'wildoptions'|| Change how command-line completion is done + ||'wordseparators'|| How words are split for hintmatching + -// vim: set syntax=asciidoc: +// vim: set syntax=asciidoc filetype=asciidoc: diff --git a/vimperator/locale/en-US/intro.txt b/vimperator/locale/en-US/intro.txt index e7acfbf4..473e7926 100644 --- a/vimperator/locale/en-US/intro.txt +++ b/vimperator/locale/en-US/intro.txt @@ -111,4 +111,4 @@ on irc.freenode.net or check the Wiki for frequently asked questions. Make sure, you have read the TODO file first, as I am aware of many things which can be improved when I find time for it or get patches. -// vim: set syntax=asciidoc: +// vim: set syntax=asciidoc filetype=asciidoc: diff --git a/vimperator/locale/en-US/map.txt b/vimperator/locale/en-US/map.txt index 1cfb631e..28ab0df5 100644 --- a/vimperator/locale/en-US/map.txt +++ b/vimperator/locale/en-US/map.txt @@ -410,4 +410,4 @@ Add a :Google command to search via google: // TODO: add decent examples -// vim: set syntax=asciidoc: +// vim: set syntax=asciidoc filetype=asciidoc: diff --git a/vimperator/locale/en-US/marks.txt b/vimperator/locale/en-US/marks.txt index 9295c117..0bdfecf1 100644 --- a/vimperator/locale/en-US/marks.txt +++ b/vimperator/locale/en-US/marks.txt @@ -245,4 +245,4 @@ Show all location marks of current web page. If [a][arg][a] is specified then limit the list to those marks mentioned. ________________________________________________________________________________ -// vim: set syntax=asciidoc: +// vim: set syntax=asciidoc filetype=asciidoc: diff --git a/vimperator/locale/en-US/message.txt b/vimperator/locale/en-US/message.txt index 134e4f90..c25bf477 100644 --- a/vimperator/locale/en-US/message.txt +++ b/vimperator/locale/en-US/message.txt @@ -19,4 +19,4 @@ Redisplay the last command output. Only the most recent command's output is available. ________________________________________________________________________________ -// vim: set syntax=asciidoc: +// vim: set syntax=asciidoc filetype=asciidoc: diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt index 05a433be..b8505cbf 100644 --- a/vimperator/locale/en-US/options.txt +++ b/vimperator/locale/en-US/options.txt @@ -826,4 +826,4 @@ A regexp which defines the word separators which are used for the the text of a link. ____ -// vim: set syntax=asciidoc: +// vim: set syntax=asciidoc filetype=asciidoc: diff --git a/vimperator/locale/en-US/pattern.txt b/vimperator/locale/en-US/pattern.txt index 64022465..07347382 100644 --- a/vimperator/locale/en-US/pattern.txt +++ b/vimperator/locale/en-US/pattern.txt @@ -67,4 +67,4 @@ Remove the search highlighting. The document highlighting is turned back on when another search command is used or the 'hlsearch' option is set. ________________________________________________________________________________ -// vim: set syntax=asciidoc: +// vim: set syntax=asciidoc filetype=asciidoc: diff --git a/vimperator/locale/en-US/print.txt b/vimperator/locale/en-US/print.txt index c1bec123..278ee648 100644 --- a/vimperator/locale/en-US/print.txt +++ b/vimperator/locale/en-US/print.txt @@ -30,4 +30,4 @@ and respectively. -// vim: set syntax=asciidoc: +// vim: set syntax=asciidoc filetype=asciidoc: diff --git a/vimperator/locale/en-US/repeat.txt b/vimperator/locale/en-US/repeat.txt index afdda5e6..32d94f9a 100644 --- a/vimperator/locale/en-US/repeat.txt +++ b/vimperator/locale/en-US/repeat.txt @@ -142,4 +142,4 @@ Use the special version with [!] if you just want to run any command multiple times without showing profiling statistics. ________________________________________________________________________________ -// vim: set syntax=asciidoc: +// vim: set syntax=asciidoc filetype=asciidoc: diff --git a/vimperator/locale/en-US/starting.txt b/vimperator/locale/en-US/starting.txt index a51c5907..993f4cda 100644 --- a/vimperator/locale/en-US/starting.txt +++ b/vimperator/locale/en-US/starting.txt @@ -57,4 +57,4 @@ ________________________________________________________________________________ Force the browser to restart. Useful when installing extensions. ________________________________________________________________________________ -// vim: set syntax=asciidoc: +// vim: set syntax=asciidoc filetype=asciidoc: diff --git a/vimperator/locale/en-US/styling.txt b/vimperator/locale/en-US/styling.txt index 3c5dc68f..e9c37f4d 100644 --- a/vimperator/locale/en-US/styling.txt +++ b/vimperator/locale/en-US/styling.txt @@ -118,4 +118,4 @@ style for [c]www.google.com,mozilla.org[c], will result in a style for (short option: [c]-i[c]) ________________________________________________________________________________ -// vim: set syntax=asciidoc: +// vim: set syntax=asciidoc filetype=asciidoc: diff --git a/vimperator/locale/en-US/tabs.txt b/vimperator/locale/en-US/tabs.txt index d4a8e84d..b8b29740 100644 --- a/vimperator/locale/en-US/tabs.txt +++ b/vimperator/locale/en-US/tabs.txt @@ -209,4 +209,4 @@ Undo closing of all closed tabs. Firefox stores up to 10 closed tabs, even after a browser restart. ________________________________________________________________________________ -// vim: set syntax=asciidoc: +// vim: set syntax=asciidoc filetype=asciidoc: diff --git a/vimperator/locale/en-US/tutorial.txt b/vimperator/locale/en-US/tutorial.txt index 70a8c019..451a2d4f 100644 --- a/vimperator/locale/en-US/tutorial.txt +++ b/vimperator/locale/en-US/tutorial.txt @@ -250,4 +250,4 @@ are neither infinite nor omnipotent; please bear with us. If you can't wait for us to get around to it, rest assured patches are welcome! See the help:Developer[developer.html] page for more information. -// vim: set syntax=asciidoc: +// vim: set syntax=asciidoc filetype=asciidoc: diff --git a/vimperator/locale/en-US/various.txt b/vimperator/locale/en-US/various.txt index 08545ec4..08048af4 100644 --- a/vimperator/locale/en-US/various.txt +++ b/vimperator/locale/en-US/various.txt @@ -115,4 +115,4 @@ ________________________________________________________________________________ //Close preview window on bottom of screen. //________________________________________________________________________________ -// vim: set syntax=asciidoc: +// vim: set syntax=asciidoc filetype=asciidoc: From a381a3947a0fa6ec7fbf2a75cb89a934c963719c Mon Sep 17 00:00:00 2001 From: anekos Date: Sun, 18 Jan 2009 03:07:47 +0900 Subject: [PATCH 19/40] Fix let-command's extraInfo 'let g:foo="c:\"' raise a error. -> E114: Missing quote: " --- common/content/options.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/content/options.js b/common/content/options.js index 584fc344..54b3bb8d 100644 --- a/common/content/options.js +++ b/common/content/options.js @@ -700,7 +700,11 @@ function Options() //{{{ " "; liberator.echo(reference[1] + "\t\t" + prefix + value); } - }); + }, + { + literal: 0 + } + ); commands.add(["setl[ocal]"], "Set local option", From 211e68f8d3919c8f4686df590b4c1d2ac78ab773 Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Sat, 17 Jan 2009 23:45:50 -0500 Subject: [PATCH 20/40] Revert "Again removed explicit numbering in asciidoc help files." This reverts commit a401e3ebf34c964ca508c189e1daf9b0b18e57b9. Explicit numbering is easier to read, and will likely be required if and when we switch to Vim's help format. --- vimperator/locale/en-US/browsing.txt | 10 +++++----- vimperator/locale/en-US/starting.txt | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/vimperator/locale/en-US/browsing.txt b/vimperator/locale/en-US/browsing.txt index 1f2e45bb..22b6d3e9 100644 --- a/vimperator/locale/en-US/browsing.txt +++ b/vimperator/locale/en-US/browsing.txt @@ -41,18 +41,18 @@ opened in new tabs. Each token is analyzed and in this order: 1. Opened as a local file if it is an existing relative or absolute filename. - * [c]:open /etc/fstab[c] shows the file system table. - * [c]:open ../other/foo.html[c] in your home directory opens + - [c]:open /etc/fstab[c] shows the file system table. + - [c]:open ../other/foo.html[c] in your home directory opens [a]/home/other/foo.html[a] - . Opened with the specified search engine if the token looks like a search +2. Opened with the specified search engine if the token looks like a search string and the first word is the name of a search engine ([c]:open wikipedia linus torvalds[c] opens the Wikipedia entry for linus torvalds). The short name of a search engine is automatically guessed from its name. If you want to set a custom name, you can change it with [c]:dialog searchengines[c]. - . Opened with the default search engine or keyword (specified with the +3. Opened with the default search engine or keyword (specified with the 'defsearch' option) if the first word is no search engine ([c]:open linus torvalds[c] opens a Google search for linux torvalds). - . Passed directly to Firefox in all other cases ([c]:open www.osnews.com, +4. Passed directly to Firefox in all other cases ([c]:open www.osnews.com, www.slashdot.org[c] opens OSNews in the current, and Slashdot in a new background tab). diff --git a/vimperator/locale/en-US/starting.txt b/vimperator/locale/en-US/starting.txt index 993f4cda..fc2f1050 100644 --- a/vimperator/locale/en-US/starting.txt +++ b/vimperator/locale/en-US/starting.txt @@ -10,23 +10,23 @@ At startup, Vimperator completes the following tasks in order. 1. Vimperator can perform user initialization commands. When one of the following is successfully located, it is executed, and no further locations are tried. +|$VIMPERATOR_INIT| - a. |$VIMPERATOR_INIT| - _$VIMPERATOR_INIT_ -- May contain a single ex command (e.g., + a. _$VIMPERATOR_INIT_ -- May contain a single ex command (e.g., "[c]:source {file}[c]"). - .. [a]\~/_vimperatorrc[a] -- Windows only. If this file exists, its contents - are executed. - .. [a]\~/.vimperatorrc[a] -- If this file exists, its contents are executed. + b. [a]\~/_vimperatorrc[a] -- Windows only. If this file exists, its contents + are executed. + c. [a]\~/.vimperatorrc[a] -- If this file exists, its contents are executed. - . If 'exrc' is set, then any RC file in the current directory is also sourced. +2. If 'exrc' is set, then any RC file in the current directory is also sourced. - . All directories in 'runtimepath' are searched for a "plugin" - subdirectory and all yet unloaded plugins are loaded. For each - plugin directory, all *.\{js,vimp} files (including those in further - subdirectories) are sourced alphabetically. No plugins will be - sourced if 'noloadplugins' is set. Any particular plugin will - not be loaded if it has already been loaded (e.g., by an earlier - [c]:loadplugins[c] command). +3. All directories in 'runtimepath' are searched for a "plugin" +subdirectory and all yet unloaded plugins are loaded. For each plugin +directory, all *.\{js,vimp} files (including those in further +subdirectories) are sourced alphabetically. No plugins will be sourced +if 'noloadplugins' is set. Any particular plugin will not be loaded if +it has already been loaded (e.g., by an earlier [c]:loadplugins[c] +command). The user's ~ (i.e., "home") directory is determined as follows: From 5cf64c5d57ab10ea6cf8137154743dfc444f0e64 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Sat, 17 Jan 2009 22:08:10 +1100 Subject: [PATCH 21/40] Mention accessibility.typeaheadfind.* in overridden-preferences help. --- vimperator/locale/en-US/options.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt index b8505cbf..71938f6d 100644 --- a/vimperator/locale/en-US/options.txt +++ b/vimperator/locale/en-US/options.txt @@ -198,6 +198,8 @@ The following preferences are set: * browser.startup.page * dom.popup_allowed_events +* accessibility.typeaheadfind.autostart +* accessibility.typeaheadfind // TODO: others? From ed9555d8d7917325f401e18ee57f953c1aeb3182 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Sun, 18 Jan 2009 15:18:16 +1100 Subject: [PATCH 22/40] Fix regressions#getSinglelineOutput() (Luo Chunlei). --- vimperator/regressions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vimperator/regressions.js b/vimperator/regressions.js index 9939560f..27fc87fc 100644 --- a/vimperator/regressions.js +++ b/vimperator/regressions.js @@ -19,8 +19,8 @@ var skipTests = [":bmarks", "gg"]; ///////////////////////////////////////////////////////////////////////////////////////// var doc; // document where we output status messages -var multilineOutput = document.getElementById("liberator-multiline-output") -var singlelineOutput = document.getElementById("liberator-commandline-command") +var multilineOutput = document.getElementById("liberator-multiline-output"); +var singlelineOutput = document.getElementById("liberator-message"); ///////////////////////////////////////////////////////////////////////////////////////// // TESTS From aaa36956c5035d34313d7ce33822de1d7c375b68 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Mon, 19 Jan 2009 00:31:30 +1100 Subject: [PATCH 23/40] Fix abbreviation tests (Luo Chunlei). --- vimperator/regressions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vimperator/regressions.js b/vimperator/regressions.js index 27fc87fc..fd7f043a 100644 --- a/vimperator/regressions.js +++ b/vimperator/regressions.js @@ -37,9 +37,9 @@ let tests = [ { cmds: [":!dir"], verify: function () getMultilineOutput().length > 10 }, { cmds: [":abbr VIMP vimperator labs", ":abbr"], - verify: function () getMultilineOutput().indexOf("vimperator labs") >= 0 }, + verify: function () getOutput().indexOf("vimperator labs") >= 0 }, { cmds: [":unabbr VIMP", ":abbr"], - verify: function () getMultilineOutput().indexOf("vimperator labs") == -1 }, + verify: function () getOutput().indexOf("vimperator labs") == -1 }, { cmds: [":bmarks"], verify: function () getMultilineOutput().length > 100 }, { cmds: [":echo \"test\""], From 16b9b98a459812aabf662afbf691fb7974156afe Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Mon, 19 Jan 2009 00:45:58 +1100 Subject: [PATCH 24/40] Remove setting of 'syntax' in Asciidoc file modelines. Setting 'filetype' makes this redundant. --- muttator/locale/en-US/intro.txt | 2 +- vimperator/locale/en-US/autocommands.txt | 2 +- vimperator/locale/en-US/browsing.txt | 2 +- vimperator/locale/en-US/buffer.txt | 2 +- vimperator/locale/en-US/cmdline.txt | 2 +- vimperator/locale/en-US/developer.txt | 2 +- vimperator/locale/en-US/eval.txt | 2 +- vimperator/locale/en-US/gui.txt | 2 +- vimperator/locale/en-US/hints.txt | 2 +- vimperator/locale/en-US/index.txt | 2 +- vimperator/locale/en-US/intro.txt | 2 +- vimperator/locale/en-US/map.txt | 2 +- vimperator/locale/en-US/marks.txt | 2 +- vimperator/locale/en-US/message.txt | 2 +- vimperator/locale/en-US/options.txt | 2 +- vimperator/locale/en-US/pattern.txt | 2 +- vimperator/locale/en-US/print.txt | 2 +- vimperator/locale/en-US/repeat.txt | 2 +- vimperator/locale/en-US/starting.txt | 2 +- vimperator/locale/en-US/styling.txt | 2 +- vimperator/locale/en-US/tabs.txt | 2 +- vimperator/locale/en-US/tutorial.txt | 2 +- vimperator/locale/en-US/various.txt | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/muttator/locale/en-US/intro.txt b/muttator/locale/en-US/intro.txt index b9b633ac..46930a06 100644 --- a/muttator/locale/en-US/intro.txt +++ b/muttator/locale/en-US/intro.txt @@ -99,4 +99,4 @@ on irc.freenode.net or check the Wiki for frequently asked questions. Make sure, you have read the TODO file first, as I am aware of many things which can be improved when I find time for it or get patches. -// vim: set syntax=asciidoc filetype=asciidoc: +// vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/autocommands.txt b/vimperator/locale/en-US/autocommands.txt index 5fac221e..ece39507 100644 --- a/vimperator/locale/en-US/autocommands.txt +++ b/vimperator/locale/en-US/autocommands.txt @@ -86,4 +86,4 @@ Set the filetype to mail when editing email at Gmail: :autocmd LocationChange .* :set editor=gvim\ -f :autocmd LocationChange mail\.google\.com :set editor="gvim -f -c 'set ft=mail'" -// vim: set syntax=asciidoc filetype=asciidoc: +// vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/browsing.txt b/vimperator/locale/en-US/browsing.txt index 1f2e45bb..e98edaa7 100644 --- a/vimperator/locale/en-US/browsing.txt +++ b/vimperator/locale/en-US/browsing.txt @@ -346,4 +346,4 @@ ________________________________________________________________________________ Print the current directory name. ________________________________________________________________________________ -// vim: set syntax=asciidoc filetype=asciidoc: +// vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/buffer.txt b/vimperator/locale/en-US/buffer.txt index 0453b3c9..f9738466 100644 --- a/vimperator/locale/en-US/buffer.txt +++ b/vimperator/locale/en-US/buffer.txt @@ -358,4 +358,4 @@ the page's default style sheet is used. All author styling can be removed by setting the 'usermode' option. ________________________________________________________________________________ -// vim: set syntax=asciidoc filetype=asciidoc fdm=marker: +// vim: set filetype=asciidoc fdm=marker: diff --git a/vimperator/locale/en-US/cmdline.txt b/vimperator/locale/en-US/cmdline.txt index 4c050a6d..81e5d593 100644 --- a/vimperator/locale/en-US/cmdline.txt +++ b/vimperator/locale/en-US/cmdline.txt @@ -77,4 +77,4 @@ ________________________________________________________________________________ Complete the previous full match when 'wildmode' contains "full". ________________________________________________________________________________ -// vim: set syntax=asciidoc filetype=asciidoc: +// vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/developer.txt b/vimperator/locale/en-US/developer.txt index 1a9ce853..13757c3d 100644 --- a/vimperator/locale/en-US/developer.txt +++ b/vimperator/locale/en-US/developer.txt @@ -85,4 +85,4 @@ Now you can copy the asciidoc text but always make sure it looks OK after you compile the help file with "make doc", as the auto-generation might not work correctly for all special cases. -// vim: set syntax=asciidoc filetype=asciidoc: +// vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/eval.txt b/vimperator/locale/en-US/eval.txt index 34204742..0f1292b2 100644 --- a/vimperator/locale/en-US/eval.txt +++ b/vimperator/locale/en-US/eval.txt @@ -81,4 +81,4 @@ Deletes the variable {name}. Several variable names can be given. When used with [!] no error message is output for non-existing variables. ________________________________________________________________________________ -// vim: set syntax=asciidoc filetype=asciidoc: +// vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/gui.txt b/vimperator/locale/en-US/gui.txt index cead079f..0b1f5102 100644 --- a/vimperator/locale/en-US/gui.txt +++ b/vimperator/locale/en-US/gui.txt @@ -87,4 +87,4 @@ standard Firefox View->Sidebar menu. Add-ons, Preferences and Downloads are also available in the sidebar. ________________________________________________________________________________ -// vim: set syntax=asciidoc filetype=asciidoc: +// vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/hints.txt b/vimperator/locale/en-US/hints.txt index 1f8a0b8f..6d9b767b 100644 --- a/vimperator/locale/en-US/hints.txt +++ b/vimperator/locale/en-US/hints.txt @@ -63,4 +63,4 @@ Hintable elements for all extended hint modes can be set in the 'extendedhinttags' XPath string. ________________________________________________________________________________ -// vim: set syntax=asciidoc filetype=asciidoc: +// vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/index.txt b/vimperator/locale/en-US/index.txt index 8fa5706f..8a3af99a 100644 --- a/vimperator/locale/en-US/index.txt +++ b/vimperator/locale/en-US/index.txt @@ -311,4 +311,4 @@ section:Options[option-index] ||'wildoptions'|| Change how command-line completion is done + ||'wordseparators'|| How words are split for hintmatching + -// vim: set syntax=asciidoc filetype=asciidoc: +// vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/intro.txt b/vimperator/locale/en-US/intro.txt index 473e7926..2064d015 100644 --- a/vimperator/locale/en-US/intro.txt +++ b/vimperator/locale/en-US/intro.txt @@ -111,4 +111,4 @@ on irc.freenode.net or check the Wiki for frequently asked questions. Make sure, you have read the TODO file first, as I am aware of many things which can be improved when I find time for it or get patches. -// vim: set syntax=asciidoc filetype=asciidoc: +// vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/map.txt b/vimperator/locale/en-US/map.txt index 28ab0df5..d0306571 100644 --- a/vimperator/locale/en-US/map.txt +++ b/vimperator/locale/en-US/map.txt @@ -410,4 +410,4 @@ Add a :Google command to search via google: // TODO: add decent examples -// vim: set syntax=asciidoc filetype=asciidoc: +// vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/marks.txt b/vimperator/locale/en-US/marks.txt index 0bdfecf1..80b3a34c 100644 --- a/vimperator/locale/en-US/marks.txt +++ b/vimperator/locale/en-US/marks.txt @@ -245,4 +245,4 @@ Show all location marks of current web page. If [a][arg][a] is specified then limit the list to those marks mentioned. ________________________________________________________________________________ -// vim: set syntax=asciidoc filetype=asciidoc: +// vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/message.txt b/vimperator/locale/en-US/message.txt index c25bf477..99c1d723 100644 --- a/vimperator/locale/en-US/message.txt +++ b/vimperator/locale/en-US/message.txt @@ -19,4 +19,4 @@ Redisplay the last command output. Only the most recent command's output is available. ________________________________________________________________________________ -// vim: set syntax=asciidoc filetype=asciidoc: +// vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt index 71938f6d..c16c99cc 100644 --- a/vimperator/locale/en-US/options.txt +++ b/vimperator/locale/en-US/options.txt @@ -828,4 +828,4 @@ A regexp which defines the word separators which are used for the the text of a link. ____ -// vim: set syntax=asciidoc filetype=asciidoc: +// vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/pattern.txt b/vimperator/locale/en-US/pattern.txt index 07347382..33e6ac17 100644 --- a/vimperator/locale/en-US/pattern.txt +++ b/vimperator/locale/en-US/pattern.txt @@ -67,4 +67,4 @@ Remove the search highlighting. The document highlighting is turned back on when another search command is used or the 'hlsearch' option is set. ________________________________________________________________________________ -// vim: set syntax=asciidoc filetype=asciidoc: +// vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/print.txt b/vimperator/locale/en-US/print.txt index 278ee648..0d14ee37 100644 --- a/vimperator/locale/en-US/print.txt +++ b/vimperator/locale/en-US/print.txt @@ -30,4 +30,4 @@ and respectively. -// vim: set syntax=asciidoc filetype=asciidoc: +// vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/repeat.txt b/vimperator/locale/en-US/repeat.txt index 32d94f9a..0501ba63 100644 --- a/vimperator/locale/en-US/repeat.txt +++ b/vimperator/locale/en-US/repeat.txt @@ -142,4 +142,4 @@ Use the special version with [!] if you just want to run any command multiple times without showing profiling statistics. ________________________________________________________________________________ -// vim: set syntax=asciidoc filetype=asciidoc: +// vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/starting.txt b/vimperator/locale/en-US/starting.txt index 993f4cda..53c79396 100644 --- a/vimperator/locale/en-US/starting.txt +++ b/vimperator/locale/en-US/starting.txt @@ -57,4 +57,4 @@ ________________________________________________________________________________ Force the browser to restart. Useful when installing extensions. ________________________________________________________________________________ -// vim: set syntax=asciidoc filetype=asciidoc: +// vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/styling.txt b/vimperator/locale/en-US/styling.txt index e9c37f4d..e7a2801c 100644 --- a/vimperator/locale/en-US/styling.txt +++ b/vimperator/locale/en-US/styling.txt @@ -118,4 +118,4 @@ style for [c]www.google.com,mozilla.org[c], will result in a style for (short option: [c]-i[c]) ________________________________________________________________________________ -// vim: set syntax=asciidoc filetype=asciidoc: +// vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/tabs.txt b/vimperator/locale/en-US/tabs.txt index b8b29740..63242e17 100644 --- a/vimperator/locale/en-US/tabs.txt +++ b/vimperator/locale/en-US/tabs.txt @@ -209,4 +209,4 @@ Undo closing of all closed tabs. Firefox stores up to 10 closed tabs, even after a browser restart. ________________________________________________________________________________ -// vim: set syntax=asciidoc filetype=asciidoc: +// vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/tutorial.txt b/vimperator/locale/en-US/tutorial.txt index 451a2d4f..5302b922 100644 --- a/vimperator/locale/en-US/tutorial.txt +++ b/vimperator/locale/en-US/tutorial.txt @@ -250,4 +250,4 @@ are neither infinite nor omnipotent; please bear with us. If you can't wait for us to get around to it, rest assured patches are welcome! See the help:Developer[developer.html] page for more information. -// vim: set syntax=asciidoc filetype=asciidoc: +// vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/various.txt b/vimperator/locale/en-US/various.txt index 08048af4..0ace34cf 100644 --- a/vimperator/locale/en-US/various.txt +++ b/vimperator/locale/en-US/various.txt @@ -115,4 +115,4 @@ ________________________________________________________________________________ //Close preview window on bottom of screen. //________________________________________________________________________________ -// vim: set syntax=asciidoc filetype=asciidoc: +// vim: set filetype=asciidoc: From d782ff48628204583139abedc0a155d9129b7ae7 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Mon, 19 Jan 2009 00:54:12 +1100 Subject: [PATCH 25/40] Fix "Command-line-mode" help tag name. Help tags don't contain whitespace. Words are separated by "-". --- vimperator/locale/en-US/cmdline.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vimperator/locale/en-US/cmdline.txt b/vimperator/locale/en-US/cmdline.txt index 81e5d593..076bac4b 100644 --- a/vimperator/locale/en-US/cmdline.txt +++ b/vimperator/locale/en-US/cmdline.txt @@ -1,6 +1,6 @@ HEADER -|Command-line mode| |Command-line| + +|Command-line-mode| |Command-line| + Command-line mode is used to enter Ex commands (":") and text search patterns ("/" and "?"). From 207913e49a7eb95a7d9787759608f108bf269ede Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Sun, 18 Jan 2009 17:24:51 -0500 Subject: [PATCH 26/40] s/Itarator/Iterator/ --- common/content/tabs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/content/tabs.js b/common/content/tabs.js index bb68506f..dd8b4f4d 100644 --- a/common/content/tabs.js +++ b/common/content/tabs.js @@ -629,7 +629,7 @@ function Tabs() //{{{ "Undo closing of all closed tabs", function (args) { - for (let i in Itarator(tabs.closedTabs)) + for (let i in Iterator(tabs.closedTabs)) window.undoCloseTab(0); }, From 2f2f753f2d45bd9ee8c0670d22a380b96fe079d5 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Mon, 19 Jan 2009 12:48:12 +1100 Subject: [PATCH 27/40] Remove some erroneous entries from :help option-index (Janus Wel). --- vimperator/locale/en-US/index.txt | 7 ++----- vimperator/locale/en-US/options.txt | 9 ++++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/vimperator/locale/en-US/index.txt b/vimperator/locale/en-US/index.txt index 8a3af99a..d573b28d 100644 --- a/vimperator/locale/en-US/index.txt +++ b/vimperator/locale/en-US/index.txt @@ -255,17 +255,14 @@ section:Ex{nbsp}commands[ex-cmd-index,:index] section:Options[option-index] ||'activate'|| Define when tabs are automatically activated + -||'autodetector'|| set auto detect character encoding + ||'cdpath'|| List of directories searched when executing :cd + ||'complete'|| Items which are completed at the :[tab]open prompt + ||'defsearch'|| Set the default search engine + -||'disabledcssheets'|| Set disabled CSS style sheets + ||'editor'|| Set the external text editor + ||'errorbells'|| Ring the bell when an error message is displayed + ||'eventignore'|| List of autocommand event names which should be ignored + ||'exrc'|| Allow reading of an RC file in the current directory + ||'extendedhinttags'|| XPath string of hintable elements activated by [m];[m] + -||'fileencoding'|| set the charactor encoding for the current page + ||'focuscontent'|| Try to stay in normal mode after loading a web page + ||'followhints'|| Change the behaviour of [m][m] in hint mode + ||'fullscreen'|| Show the current window fullscreen + @@ -273,7 +270,7 @@ section:Options[option-index] ||'helpfile'|| Name of the main help file + ||'hintmatching'|| How links are matched + ||'hinttags'|| XPath string of hintable elements activated by [m]f[m] and [m]F[m] + -||'hinttimeout'|| Automatically follow non unique numerical hint + +||'hinttimeout'|| Timeout before automatically following a non-unique numerical hint + ||'history'|| Number of Ex commands and search patterns to store in the command-line history + ||'hlsearch'|| Highlight previous search pattern matches + ||'ignorecase'|| Ignore case in search patterns + @@ -292,7 +289,7 @@ section:Options[option-index] ||'preload'|| Speed up first time history/bookmark completion + ||'previouspattern'|| Patterns to use when guessing the \'previous' page in a document sequence + ||'runtimepath'|| List of directories searched for runtime files + -||'scroll'|| Number of lines to scroll with and commands + +||'scroll'|| Number of lines to scroll with [m][m] and [m][m] commands + ||'shell'|| Shell to use for executing :! and :run commands + ||'shellcmdflag'|| Flag passed to shell when executing :! and :run commands + ||'showmode'|| Show the current mode in the command line + diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt index c16c99cc..6b043cb7 100644 --- a/vimperator/locale/en-US/options.txt +++ b/vimperator/locale/en-US/options.txt @@ -406,10 +406,9 @@ ____ |\'hto'| |\'hinttimeout'| ||'hinttimeout' 'hto'|| number (default: 0) ____ -Automatically follow non unique numerical hint after 'hinttimeout' -milliseconds. + -Set to 0 (the default) to only follow numeric hints after pressing -[m][m] or when the hint is unique. +Timeout before automatically following a non-unique numerical hint. Set to 0 +(the default) to only follow numeric hints after pressing [m][m] or +when the hint is unique. ____ @@ -625,7 +624,7 @@ ____ |\'scr'| |\'scroll'| ||'scroll' 'scr'|| number (default: 0) ____ -Number of lines to scroll with C-u and C-d commands. +Number of lines to scroll with [m][m] and [m][m] commands. The number of lines scrolled defaults to half the window size. When a [count] is specified to the [m][m] or [m][m] commands this is used to set the value of 'scroll' and also used for the current command. The From 7f305e8ba4cf27a83ee227a9de57e36c5e3617a9 Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Mon, 19 Jan 2009 00:39:35 -0500 Subject: [PATCH 28/40] Allow extra args to be bassed to completion.addUrlCompleter --- common/content/completion.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/common/content/completion.js b/common/content/completion.js index 8fb21af5..19fec8fc 100644 --- a/common/content/completion.js +++ b/common/content/completion.js @@ -579,7 +579,7 @@ CompletionContext.prototype = { let context = new CompletionContext(this, name, offset); this.contextList.push(context); if (completer) - return completer.apply(self || this, [context].concat(Array.slice(arguments, 4))); + return completer.apply(self || this, [context].concat(Array.slice(arguments, arguments.callee.length))); return context; }, @@ -1803,15 +1803,19 @@ function Completion() //{{{ context.advance(skip[0].length); // Will, and should, throw an error if !(c in opts) - Array.forEach(complete || options["complete"], - function (c) context.fork(c, 0, completion, completion.urlCompleters[c].completer)); + Array.forEach(complete || options["complete"], function (c) { + let completer = completion.urlCompleters[c]; + context.fork.apply(context, [c, 0, completion, completer.completer].concat(completer.args)); + }); }, urlCompleters: {}, addUrlCompleter: function addUrlCompleter(opt) { - this.urlCompleters[opt] = UrlCompleter.apply(null, Array.slice(arguments)); + let completer = UrlCompleter.apply(null, Array.slice(arguments)); + completer.args = Array.slice(arguments, completer.length); + this.urlCompleters[opt] = completer; }, urls: function (context, tags) From 30db94b3dbecf56037da8539f1f51a9f944c6218 Mon Sep 17 00:00:00 2001 From: Martin Stubenschrott Date: Mon, 19 Jan 2009 18:42:33 +0100 Subject: [PATCH 29/40] Fixed zoom level messages (not opening MOW anymore on subsequent zi's) --- common/content/buffer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/content/buffer.js b/common/content/buffer.js index 93e8dabb..5c984553 100644 --- a/common/content/buffer.js +++ b/common/content/buffer.js @@ -68,7 +68,7 @@ function Buffer() //{{{ ZoomManager.zoom = value / 100; if ("FullZoom" in window) FullZoom._applySettingToPref(); - liberator.echo((fullZoom ? "Full" : "Text") + " zoom: " + value + "%"); + liberator.echomsg((fullZoom ? "Full" : "Text") + " zoom: " + value + "%"); } function bumpZoomLevel(steps, fullZoom) From 08dbdcb7ba7d77b5c0dfd2b8cd821343625bdf25 Mon Sep 17 00:00:00 2001 From: Martin Stubenschrott Date: Mon, 19 Jan 2009 20:28:49 +0100 Subject: [PATCH 30/40] Fixed external editor on Linux, maybe broke it for some other system? --- common/content/io.js | 9 +++++++-- vimperator/Donors | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/common/content/io.js b/common/content/io.js index eb4a5f0c..4acb103c 100644 --- a/common/content/io.js +++ b/common/content/io.js @@ -118,8 +118,13 @@ function IO() //{{{ try { path.appendRelativePath(self.expandPath(tail, true)); // FIXME: should only expand env vars and normalise path separators - if (path.exists() && path.normalize) - path.normalize(); + // TODO: This code breaks the external editor at least in ubuntu + // because /usr/bin/gvim becomes /usr/bin/vim.gnome normalized and for + // some strange reason it will start without a gui then (which is not + // optimal if you don't start firefox from a terminal ;) + // Why do we need this code? + // if (path.exists() && path.normalize) + // path.normalize(); } catch (e) { diff --git a/vimperator/Donors b/vimperator/Donors index 46fa3099..a24d01e2 100644 --- a/vimperator/Donors +++ b/vimperator/Donors @@ -1,4 +1,5 @@ 2009: +* Peleg Michaeli ("Every hand revealed" from my amazon.de wishlist) * InspireFocus * Michael Fremont * Kamil Dworakowski From 9b8a23ca40e6b74f39bfbcfc7fb90230f35949a7 Mon Sep 17 00:00:00 2001 From: Martin Stubenschrott Date: Mon, 19 Jan 2009 22:39:02 +0100 Subject: [PATCH 31/40] added dpb to Donors --- vimperator/Donors | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vimperator/Donors b/vimperator/Donors index a24d01e2..ec93f6f7 100644 --- a/vimperator/Donors +++ b/vimperator/Donors @@ -1,3 +1,6 @@ +Contiuous donations: +* Daniel Bainton (web hosting) + 2009: * Peleg Michaeli ("Every hand revealed" from my amazon.de wishlist) * InspireFocus From 3abd88276efee87f63a06eeee5d4307e982d16a0 Mon Sep 17 00:00:00 2001 From: anekos Date: Tue, 20 Jan 2009 23:40:07 +0900 Subject: [PATCH 32/40] Fix OPTION_NOARG's completion. If the option is OPTION_NOARG, args[-opt] becomes null. --- common/content/commands.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/content/commands.js b/common/content/commands.js index b95b2437..170568b1 100644 --- a/common/content/commands.js +++ b/common/content/commands.js @@ -623,7 +623,7 @@ function Commands() //{{{ } } - args[opt[0][0]] = arg; // always use the first name of the option + args[opt[0][0]] = opt[1] == this.OPTION_NOARG || arg; // always use the first name of the option i += optname.length + count; if (i == str.length) break outer; From 9993f0594e5a28ac53f49eca38b8b0ac171ea487 Mon Sep 17 00:00:00 2001 From: Ted Pavlic Date: Tue, 20 Jan 2009 10:41:19 -0500 Subject: [PATCH 33/40] Make abbreviations expand on quotes as well as space. Also added rough documentation for insert mode. TODO: Abbreviations should also expand on and , but right now adding to the mappings.add() has no effect, and adding to the mappings.add() breaks tab completion. TODO: Rather than listing non-keyword characters in two places (ui.js and mappings.js), they should be specified in one location (that could someday be trumped by an 'iskeyword' option). --- common/content/ui.js | 9 ++++++++- vimperator/content/config.js | 10 +++++----- vimperator/locale/en-US/cmdline.txt | 2 +- vimperator/locale/en-US/index.txt | 5 +++++ vimperator/locale/en-US/insert.txt | 30 +++++++++++++++++++++++++++++ vimperator/locale/en-US/map.txt | 10 +++++----- 6 files changed, 54 insertions(+), 12 deletions(-) create mode 100644 vimperator/locale/en-US/insert.txt diff --git a/common/content/ui.js b/common/content/ui.js index 6254b67d..622fb6ac 100644 --- a/common/content/ui.js +++ b/common/content/ui.js @@ -878,8 +878,15 @@ function CommandLine() //{{{ [""], "Focus content", function () { events.onEscape(); }); + // Any "non-keyword" character triggers abbreviation expansion + // TODO: Add "" and "" to this list + // At the moment, adding "" breaks tab completion. Adding + // "" has no effect. + // TODO: Make non-keyword recognition smarter so that there need not + // be two lists of the same characters (one here and a regexp in + // mappings.js) mappings.add(myModes, - [""], "Expand command line abbreviation", + ["", '"', "'"], "Expand command line abbreviation", function () { commandline.resetCompletions(); diff --git a/vimperator/content/config.js b/vimperator/content/config.js index 33ea2a4c..7d4dd586 100644 --- a/vimperator/content/config.js +++ b/vimperator/content/config.js @@ -113,11 +113,11 @@ const config = { //{{{ // they are sorted by relevance, not alphabetically helpFiles: [ "intro.html", "tutorial.html", "starting.html", "browsing.html", - "buffer.html", "cmdline.html", "options.html", "pattern.html", - "tabs.html", "hints.html", "map.html", "eval.html", "marks.html", - "repeat.html", "autocommands.html", "print.html", "gui.html", - "styling.html", "message.html", "developer.html", "various.html", - "index.html" + "buffer.html", "cmdline.html", "insert.html", "options.html", + "pattern.html", "tabs.html", "hints.html", "map.html", "eval.html", + "marks.html", "repeat.html", "autocommands.html", "print.html", + "gui.html", "styling.html", "message.html", "developer.html", + "various.html", "index.html" ], scripts: [ diff --git a/vimperator/locale/en-US/cmdline.txt b/vimperator/locale/en-US/cmdline.txt index 076bac4b..a0499e6e 100644 --- a/vimperator/locale/en-US/cmdline.txt +++ b/vimperator/locale/en-US/cmdline.txt @@ -1,6 +1,6 @@ HEADER -|Command-line-mode| |Command-line| + +|Command-line-mode| |Command-line| |mode-cmdline| + Command-line mode is used to enter Ex commands (":") and text search patterns ("/" and "?"). diff --git a/vimperator/locale/en-US/index.txt b/vimperator/locale/en-US/index.txt index d573b28d..747e3f53 100644 --- a/vimperator/locale/en-US/index.txt +++ b/vimperator/locale/en-US/index.txt @@ -4,6 +4,11 @@ HEADER This file contains a list of all available commands. +section:Insert{nbsp}mode[insert-index] + +|||| Launch the external editor + +|||| Expand an insert-mode abbreviation + + section:Normal{nbsp}mode[normal-index] |||| Select the alternate tab or the [count]th tab + diff --git a/vimperator/locale/en-US/insert.txt b/vimperator/locale/en-US/insert.txt new file mode 100644 index 00000000..67ff3d8c --- /dev/null +++ b/vimperator/locale/en-US/insert.txt @@ -0,0 +1,30 @@ +HEADER + +|Insert-mode| |Insert| |mode-insert| + + +Insert mode is used to enter text in text boxes and text areas. When +'insertmode' is set, focusing on a text area immediately switches to +insert mode. + +|i| + +||i|| +________________________________________________________________________________ +Starts insert mode in text areas when 'insertmode' is not set. +________________________________________________________________________________ + + +section:Insert-mode{nbsp}special{nbsp}keys[ins-special-keys] + +|i_| + +|||| +________________________________________________________________________________ +Launch the external editor. See the 'editor' option. +________________________________________________________________________________ + +|i_| + +|||| +________________________________________________________________________________ +Expand an insert-mode abbreviation. +________________________________________________________________________________ + +// vim: set filetype=asciidoc: diff --git a/vimperator/locale/en-US/map.txt b/vimperator/locale/en-US/map.txt index d0306571..5cbb10da 100644 --- a/vimperator/locale/en-US/map.txt +++ b/vimperator/locale/en-US/map.txt @@ -189,9 +189,9 @@ contains any non-whitespace character (e.g., "def'"). Strings that cannot be abbreviations include "a'b" and "a b". -An abbreviation is recognized when a space is typed after the -abbreviation. There are no default abbreviations, and abbreviations are -never recursive. +An abbreviation is recognized when a space, quote character, or +[m][m] is typed after the abbreviation. There are no default +abbreviations, and abbreviations are never recursive. |:ab| |:abbreviate| ||:ab[breviate] {lhs} {rhs}|| + @@ -199,8 +199,8 @@ never recursive. ||:ab[breviate]|| ________________________________________________________________________________ Abbreviate a key sequence. Abbreviate {lhs} to {rhs}. If only {lhs} is given, -list all abbreviations that start with {lhs}. List all abbreviations, if no -arguments are given. +list all abbreviations that start with {lhs}. If no arguments are given, +list all abbreviations. ________________________________________________________________________________ From 4e203e0840e1ac64b492047d402f74cb6288a1e2 Mon Sep 17 00:00:00 2001 From: Ted Pavlic Date: Tue, 20 Jan 2009 10:49:42 -0500 Subject: [PATCH 34/40] Removed implicit numbering in map.txt; made numbering explicit. This commit is in the spirit of a3fc60c011b8ed42c2efec2147b1268abc10d578. Vim's help format really numbers everything manually? Sections too? That's unbelievable. --- vimperator/locale/en-US/map.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vimperator/locale/en-US/map.txt b/vimperator/locale/en-US/map.txt index 5cbb10da..a323454a 100644 --- a/vimperator/locale/en-US/map.txt +++ b/vimperator/locale/en-US/map.txt @@ -178,13 +178,13 @@ words. An abbreviation can be one of three types that are defined by the types of constituent characters. Whitespace and quotes are non-keyword types, and all other characters are keyword types. -. A "full-id" abbreviation consists entirely of characters that are not +1. A "full-id" abbreviation consists entirely of characters that are not keyword characters (e.g., "teh", "msoft"). -. An "end-id" abbreviation ends in keyword character but otherwise +2. An "end-id" abbreviation ends in keyword character but otherwise contains all non-keyword characters (e.g., "'i"). -. A "non-id" abbreviation ends in a non-keyword character but otherwise +3. A "non-id" abbreviation ends in a non-keyword character but otherwise contains any non-whitespace character (e.g., "def'"). Strings that cannot be abbreviations include "a'b" and "a b". From 1927574ef5b60c1032922e375f0a4236bdd3148b Mon Sep 17 00:00:00 2001 From: Ted Pavlic Date: Tue, 20 Jan 2009 11:15:17 -0500 Subject: [PATCH 35/40] Linked insert.html to :help's intro --- vimperator/locale/en-US/intro.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/vimperator/locale/en-US/intro.txt b/vimperator/locale/en-US/intro.txt index 2064d015..27e9954f 100644 --- a/vimperator/locale/en-US/intro.txt +++ b/vimperator/locale/en-US/intro.txt @@ -51,6 +51,7 @@ section:Help{nbsp}topics[overview] - help:Buffer{nbsp}commands[buffer.html]: Operations on the current document like scrolling or copying text. - help:Command-line[cmdline.html]: Command-line editing. +- help:Insert-mode[insert.html]: Insert-mode editing. - help:Options[options.html]: A description of all options. - help:Search{nbsp}commands[pattern.html]: Searching for text in the current buffer. From 1f93e422e7a99f10089baaf46b56cf31ee204b15 Mon Sep 17 00:00:00 2001 From: Ted Pavlic Date: Tue, 20 Jan 2009 11:28:32 -0500 Subject: [PATCH 36/40] Fixed (:abbr """a b) so it stopped throwing E114 (like Vim). --- common/content/editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/content/editor.js b/common/content/editor.js index f4338c47..8e0c603e 100644 --- a/common/content/editor.js +++ b/common/content/editor.js @@ -217,7 +217,7 @@ function Editor() //{{{ }, { completer: function (context, args) completion.abbreviation(context, args, mode), - literal: 1, + literal: 0, serial: function () [ { command: this.name, From 8b95e72115f55d56d3793b3a02abe774ab18ed1a Mon Sep 17 00:00:00 2001 From: Ted Pavlic Date: Tue, 20 Jan 2009 11:54:46 -0500 Subject: [PATCH 37/40] Minor copyedits. --- common/content/hints.js | 6 +++--- vimperator/locale/en-US/browsing.txt | 12 ++++++------ vimperator/locale/en-US/buffer.txt | 6 +++--- vimperator/locale/en-US/eval.txt | 4 ++-- vimperator/locale/en-US/hints.txt | 6 +++--- vimperator/locale/en-US/intro.txt | 2 +- vimperator/locale/en-US/map.txt | 4 ++-- vimperator/locale/en-US/options.txt | 8 ++++---- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/common/content/hints.js b/common/content/hints.js index 343cc10f..b68f821c 100644 --- a/common/content/hints.js +++ b/common/content/hints.js @@ -74,9 +74,9 @@ function Hints() //{{{ b: Mode("Follow hint in a background tab", function (elem) buffer.followLink(elem, liberator.NEW_BACKGROUND_TAB)), w: Mode("Follow hint in a new window", function (elem) buffer.followLink(elem, liberator.NEW_WINDOW), extended), F: Mode("Open multiple hints in tabs", hintAction_F), - O: Mode(":open URL based on hint location", function (elem, loc) commandline.open(":", "open " + loc, modes.EX)), - T: Mode(":tabopen URL based on hint location", function (elem, loc) commandline.open(":", "tabopen " + loc, modes.EX)), - W: Mode(":winopen URL based on hint location", function (elem, loc) commandline.open(":", "winopen " + loc, modes.EX)), + O: Mode("Generate an ':open URL' using hint", function (elem, loc) commandline.open(":", "open " + loc, modes.EX)), + T: Mode("Generate a ':tabopen URL' using hint",function (elem, loc) commandline.open(":", "tabopen " + loc, modes.EX)), + W: Mode("Generate a ':winopen URL' using hint",function (elem, loc) commandline.open(":", "winopen " + loc, modes.EX)), v: Mode("View hint source", function (elem, loc) buffer.viewSource(loc, false), extended), V: Mode("View hint source in external editor", function (elem, loc) buffer.viewSource(loc, true), extended), y: Mode("Yank hint location", function (elem, loc) util.copyToClipboard(loc, true)), diff --git a/vimperator/locale/en-US/browsing.txt b/vimperator/locale/en-US/browsing.txt index 5688ce8f..57f8ce84 100644 --- a/vimperator/locale/en-US/browsing.txt +++ b/vimperator/locale/en-US/browsing.txt @@ -70,7 +70,7 @@ ________________________________________________________________________________ ||:tabopen[!] [a][arg1][a], [a][arg2][a], ...|| + ||t|| ________________________________________________________________________________ -Just like [c]:open[c], but also uses a new tab for the first URL. When +Just like [c]:open[c] but also uses a new tab for the first URL. When used with [!], the 'tabopen' value of the 'activate' option is negated. ________________________________________________________________________________ @@ -79,7 +79,7 @@ ________________________________________________________________________________ ||T|| ________________________________________________________________________________ Open one or more URLs in a new tab based on current location. Works like -[m]t[m], but preselects current URL in the [c]:tabopen[c] query. +[m]t[m] but preselects current URL in the [c]:tabopen[c] query. ________________________________________________________________________________ @@ -96,14 +96,14 @@ ________________________________________________________________________________ ||O|| ________________________________________________________________________________ Open one or more URLs in the current tab based on current location. Works -like [m]o[m], but preselects current URL in the [c]:open[c] query. +like [m]o[m] but preselects current URL in the [c]:open[c] query. ________________________________________________________________________________ |:winopen| |:wopen| |:winedit| ||:wino[pen][!] [a][arg1][a], [a][arg2][a], ...|| + ________________________________________________________________________________ -Just like [c]:tabopen[c], but opens the resulting web page(s) in a new window. +Just like [c]:tabopen[c] but opens the resulting web page(s) in a new window. ________________________________________________________________________________ @@ -121,7 +121,7 @@ ________________________________________________________________________________ ||P|| ________________________________________________________________________________ Open (put) a URL based on the current clipboard contents in a new buffer. Works -like [m]p[m], but opens a new tab. + +like [m]p[m] but opens a new tab. + Whether the new buffer is activated, depends on the 'activate' option. ________________________________________________________________________________ @@ -130,7 +130,7 @@ ________________________________________________________________________________ ||gP|| ________________________________________________________________________________ Open (put) a URL based on the current clipboard contents in a new buffer. -Works like [m]P[m], but inverts the 'activate' option. +Works like [m]P[m] but inverts the 'activate' option. ________________________________________________________________________________ diff --git a/vimperator/locale/en-US/buffer.txt b/vimperator/locale/en-US/buffer.txt index f9738466..86c3c259 100644 --- a/vimperator/locale/en-US/buffer.txt +++ b/vimperator/locale/en-US/buffer.txt @@ -326,9 +326,9 @@ ________________________________________________________________________________ section:Copying{nbsp}text[copying,yanking] -When running in X11 the text of the following commands is not only copied to -the clipboard, but also put into the X11 selection, which can be pasted with -the middle mouse button: +When running in X11, the text of the following commands is not only +copied to the clipboard but is also put into the X11 selection, which +can be pasted with the middle mouse button: |y| + ||y|| diff --git a/vimperator/locale/en-US/eval.txt b/vimperator/locale/en-US/eval.txt index 0f1292b2..17c71dda 100644 --- a/vimperator/locale/en-US/eval.txt +++ b/vimperator/locale/en-US/eval.txt @@ -17,7 +17,7 @@ ________________________________________________________________________________ |:echoe| |:echoerr| ||:echoe[rr] {expr}|| + ________________________________________________________________________________ -Echo the expression as an error message. Just like [c]:ec[ho][c], but echoes +Echo the expression as an error message. Just like [c]:ec[ho][c] but echoes the result highlighted as ErrorMsg and saves it to the message history. ________________________________________________________________________________ @@ -25,7 +25,7 @@ ________________________________________________________________________________ |:echom| |:echomsg| ||:echom[sg] {expr}|| + ________________________________________________________________________________ -Echo the expression as an informational message. Just like [c]:ec[ho][c], but +Echo the expression as an informational message. Just like [c]:ec[ho][c] but also saves the message in the message history. ________________________________________________________________________________ diff --git a/vimperator/locale/en-US/hints.txt b/vimperator/locale/en-US/hints.txt index 6d9b767b..794044e2 100644 --- a/vimperator/locale/en-US/hints.txt +++ b/vimperator/locale/en-US/hints.txt @@ -51,9 +51,9 @@ this hint mode. Then press [a]24[a] to copy the hint location. * |;b| [m]b[m] to open its location in a new background tab * |;w| [m]w[m] to open its destination in a new window * |;F| [m]F[m] to follow a sequence of [m][m]-delimited hints in background tabs -* |;O| [m]O[m] to [c]:open[c] a URL based on hint location -* |;T| [m]T[m] to [c]:tabopen[c] a URL based on its location -* |;W| [m]W[m] to [c]:winopen[c] a URL based on its location +* |;O| [m]O[m] to generate an [c]:open[c] with hint's URL (like [m]O[m]) +* |;T| [m]T[m] to generate a [c]:tabopen[c] with hint's URL (like [m]T[m]) +* |;W| [m]W[m] to generate a [c]:winopen[c] with hint's URL * |;v| [m]v[m] to view its destination source * |;V| [m]V[m] to view its destination source in the external editor * |;y| [m]y[m] to yank its destination location diff --git a/vimperator/locale/en-US/intro.txt b/vimperator/locale/en-US/intro.txt index 27e9954f..7c666295 100644 --- a/vimperator/locale/en-US/intro.txt +++ b/vimperator/locale/en-US/intro.txt @@ -20,7 +20,7 @@ are hidden. + If you really need them, type: [c]:set guioptions+=mT[c] to get them back. + If you don't like Vimperator at all, you can uninstall it by typing [c]:addons[c] and remove/disable it. + -If you like it, but can't remember the shortcuts, press [m]F1[m] or +If you like it but can't remember the shortcuts, then press [m]F1[m] or [c]:help[c] to get this help window back. |author| |donation| + diff --git a/vimperator/locale/en-US/map.txt b/vimperator/locale/en-US/map.txt index a323454a..5dcd49ae 100644 --- a/vimperator/locale/en-US/map.txt +++ b/vimperator/locale/en-US/map.txt @@ -219,7 +219,7 @@ ________________________________________________________________________________ ||:ia[bbrev] {lhs}|| + ||:ia[bbrev]|| ________________________________________________________________________________ -Abbreviate a key sequence for Insert mode. Same as [c]:ab[breviate][c], but +Abbreviate a key sequence for Insert mode. Same as [c]:ab[breviate][c] but for Insert mode only. ________________________________________________________________________________ @@ -242,7 +242,7 @@ ________________________________________________________________________________ |:iuna| |:iunabbrev| ||:iuna[bbrev] {lhs}|| + ________________________________________________________________________________ -Remove an abbreviation for Insert mode. Same as [c]:una[bbreviate][c], but for +Remove an abbreviation for Insert mode. Same as [c]:una[bbreviate][c] but for Insert mode only. ________________________________________________________________________________ diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt index 6b043cb7..ddd38a3e 100644 --- a/vimperator/locale/en-US/options.txt +++ b/vimperator/locale/en-US/options.txt @@ -132,8 +132,8 @@ ____ ||:setl[ocal] {option}-={value}|| + ____ -The same as [c]:set[c] command, but operates on local for current -tab options only. See [c]:set[c] for details. +The same as [c]:set[c] command, but it operates for current tab options +only. See [c]:set[c] for details. ____ |:setglobal| |:setg| @@ -151,7 +151,7 @@ ____ ||:setg[lobal] {option}-={value}|| + ____ -The same as [c]:set[c] command, but operates on global options only. +The same as [c]:set[c] command, but it operates on global options only. See [c]:set[c] for details. ____ @@ -367,7 +367,7 @@ Change the hint matching algorithm during hint mode. Possible values: `--------------------`------------------------------------------------------------------------------------------------------------------------------- *contains* The typed characters are split on whitespace, and these character groups have to match anywhere inside the text of the link. *wordstartswith* The typed characters are matched with the beginning of the first word (see 'wordseparators') in the link as long as possible. If no matches occur in the current word, then the matching is continued at the beginning of the next word. The words are worked through in the order they appear in the link. If the typed characters contain spaces, then the characters are split on whitespace. These character groups are then matched with the beginning of the words, beginning at the first one and continuing with the following words in the order they appear in the link. -*firstletters* Behaves like wordstartswith, but non matching words aren't overleaped. +*firstletters* Behaves like wordstartswith, but non-matching words aren't overleaped. *custom* Delegate to a custom function: liberator.plugins.customHintMatcher(hintString) ----------------------------------------------------------------------------------------------------------------------------------------------------- From 912bf911330bfafb6776ea3cc2c9cd6ce0e25d45 Mon Sep 17 00:00:00 2001 From: janus_wel Date: Wed, 21 Jan 2009 04:13:49 +0900 Subject: [PATCH 38/40] Fix erroneous info and add group names in styling.txt * Delete the desctiption of nonexistent command :highlight-clear. * Delete the erroneous info about bang of :highlight command. * Add unwritten group names from styling.js. Signed-off-by: Kris Maglione --- vimperator/locale/en-US/styling.txt | 101 +++++++++++++++------------- 1 file changed, 56 insertions(+), 45 deletions(-) diff --git a/vimperator/locale/en-US/styling.txt b/vimperator/locale/en-US/styling.txt index e7a2801c..5cb0759e 100644 --- a/vimperator/locale/en-US/styling.txt +++ b/vimperator/locale/en-US/styling.txt @@ -27,58 +27,69 @@ valid, [!] will override the check, to speed Vimperator startup. if provided will restrict the match to matching elements. Valid groups are: -`------------------`----------------------------------- -*Bell* Vimperator's visual bell -*Boolean* A JavaScript Boolean object -*CompDesc* The description column of the completion list -*CompIcon* The favicon of a completion row -*CompItem* A completion row -*CompLess* The indicator shown when completions may be scrolled up -*CompMore* The indicator shown when completions may be scrolled down -*CompResult* The result column of the completion list -*CompTitle* Completion row titles -*ErrorMsg* Error messages -*Filter* The matching text in a completion list -*FrameIndicator* The indicator shown when a new frame is selected -*Function* A JavaScript Function object -*Hint* A hint indicator. See [c]:help hints[c]. -*HintActive* The hint element which will be selected on -*HintElem* The element which a hint refers to. -*HintImage* The indicator which floats above hinted images. +`--------------------`----------------------------------- +*Bell* Vimperator's visual bell +*Boolean* A JavaScript Boolean object +*CmdLine* The command line +*CmdOutput* +*CompDesc* The description column of the completion list +*CompGroup* +*CompIcon* The favicon of a completion row +*CompItem* A row of completion list +*CompItem[selected]* A selected row of completion list +*CompLess* The indicator shown when completions may be scrolled up +*CompLess::after* The character of indicator shown when completions may be scrolled up +*CompMore* The indicator shown when completions may be scrolled down +*CompMore::after* The character of indicator shown when completions may be scrolled down +*CompMsg* +*CompResult* The result column of the completion list +*CompTitle* Completion row titles +*ErrorMsg* Error messages +*Filter* The matching text in a completion list +*FrameIndicator* The indicator shown when a new frame is selected +*Function* A JavaScript Function object +*Gradient* +*GradientLeft* +*GradientRight* +*Hint* A hint indicator. See [c]:help hints[c] +*HintActive* The hint element of link which will be followed by +*HintElem* The hintable element +*HintImage* The indicator which floats above hinted images *Indicator* -*InfoMsg* Information messages -*Keyword* A bookmark keyword for a URL -*LineNr* The line number of an error +*InfoMsg* Information messages +*Keyword* A bookmark keyword for a URL +*LineNr* The line number of an error *Message* -*ModeMsg* The mode indicator in the command line -*MoreMsg* The indicator that there is more text to view +*ModeMsg* The mode indicator in the command line +*MoreMsg* The indicator that there is more text to view *NonText* -*Normal* Normal text in the command line -*Null* A JavaScript Null object -*Number* A JavaScript Number object -*Object* A JavaScript Object -*Question* A prompt for a decision -*Search* Highlighted search results in a web page -*StatusLine* The status bar -*StatusLineBroken* The status bar for a broken web page -*StatusLineSecure* The status bar for a secure web page -*String* A JavaScript String object -*TabClose* The close button of a browser tab -*TabIcon* The icon of a browser tab -*TabIconNumber* The number of a browser tab, over its icon -*TabNumber* The number of a browser tab, next to its icon -*TabText* The text of a browser tab -*Tag* A bookmark tag for a URL -*Title* The title of a listing, including [c]:bmarks[c], [c]:jumps[c] -*URL* A URL -*WarningMsg* A warning message +*Normal* Normal text in the command line +*Null* A JavaScript Null object +*Number* A JavaScript Number object +*Object* A JavaScript Object +*Preview* +*Question* A prompt for a decision +*Search* Highlighted search results in a web page +*StatusLine* The status bar +*StatusLineBroken* The status bar for a broken web page +*StatusLineSecure* The status bar for a secure web page +*String* A JavaScript String object +*TabClose* The close button of a browser tab +*TabIcon* The icon of a browser tab +*TabIconNumber* The number of a browser tab, over its icon +*TabNumber* The number of a browser tab, next to its icon +*TabText* The text of a browser tab +*Tag* A bookmark tag for a URL +*Title* The title of a listing, including [c]:pageinfo[c], [c]:jumps[c] +*URL* A URL +*WarningMsg* A warning message ------------------------------------------------------- Every invocation completely replaces the styling of any previous invocation, unless [-append] (short option: -a) is provided, in which case, {css} is -appended to its current value. If {css} is not provided and [!] is, any -styles matching {group} are listed. If neither {css} nor [!] is provided, the -style for {group} is reset to its default value. +appended to its current value. If {css} is not provided, any styles matching +{group} are listed. If you want to set its default value, you can refer from +complete list. ________________________________________________________________________________ |:highlight-clear| + From 4d07a8b47ffb65cad32e52f1da504b501af21303 Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Tue, 20 Jan 2009 23:40:05 -0500 Subject: [PATCH 39/40] Cleanup last patch --- vimperator/locale/en-US/styling.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vimperator/locale/en-US/styling.txt b/vimperator/locale/en-US/styling.txt index 5cb0759e..74b3e9ea 100644 --- a/vimperator/locale/en-US/styling.txt +++ b/vimperator/locale/en-US/styling.txt @@ -88,8 +88,7 @@ Valid groups are: Every invocation completely replaces the styling of any previous invocation, unless [-append] (short option: -a) is provided, in which case, {css} is appended to its current value. If {css} is not provided, any styles matching -{group} are listed. If you want to set its default value, you can refer from -complete list. +{group} are listed. ________________________________________________________________________________ |:highlight-clear| + From 050cd4b2e4eafa669c27bd7c0bd0318a14224cd3 Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Wed, 21 Jan 2009 03:37:40 -0500 Subject: [PATCH 40/40] Make [count] behave as expected. --- common/content/tabs.js | 9 +++++++-- vimperator/NEWS | 5 +++-- vimperator/locale/en-US/tabs.txt | 8 +++++++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/common/content/tabs.js b/common/content/tabs.js index dd8b4f4d..8f5f6578 100644 --- a/common/content/tabs.js +++ b/common/content/tabs.js @@ -223,9 +223,14 @@ function Tabs() //{{{ "Go to the last tab", function (count) { tabs.select("$"); }); - mappings.add([modes.NORMAL], ["gt", "", "", ""], + mappings.add([modes.NORMAL], ["gt"], "Go to the next tab", - function (count) { tabs.select(count > 0 ? count - 1: "+1", count > 0 ? false : true); }, + function (count) { tabs.select(count > 0 ? count - 1 : "+1", count > 0 ? false : true); }, + { flags: Mappings.flags.COUNT }); + + mappings.add([modes.NORMAL], ["", "", ""], + "Go to the next tab", + function (count) { tabs.select("+" + (count < 1 ? 1 : count), true); }, { flags: Mappings.flags.COUNT }); mappings.add([modes.NORMAL], ["gT", "", "", ""], diff --git a/vimperator/NEWS b/vimperator/NEWS index dc72df66..7a69e195 100644 --- a/vimperator/NEWS +++ b/vimperator/NEWS @@ -21,8 +21,9 @@ * IMPORTANT: 'verbose' is now by default at 1, set to 0 to not show any status messages * IMPORTANT: $VIMPERATOR_HOME is no longer used. - * Added ~/.vimperator/info/{profile}/, similar to viminfo - * added $VIMPERATOR_RUNTIME, $VIMPERATOR_INIT + * [count] now goes to the [count]th next tab rather than the [count]th tab. + * add ~/.vimperator/info/{profile}/, similar to viminfo + * add $VIMPERATOR_RUNTIME, $VIMPERATOR_INIT * :hardcopy now supports output redirection to a file on Unix and MacUnix * add ";f" extended hint mode to focus a frame * add "r", "l", and "b" to 'guioptions' to toggle the scrollbars. diff --git a/vimperator/locale/en-US/tabs.txt b/vimperator/locale/en-US/tabs.txt index 63242e17..3305e05d 100644 --- a/vimperator/locale/en-US/tabs.txt +++ b/vimperator/locale/en-US/tabs.txt @@ -59,13 +59,19 @@ but in the other direction. ________________________________________________________________________________ -|| || || |gt| + +|gt| + ||[count]gt|| ________________________________________________________________________________ Go to the next tab. Cycles to the first tab, when the last is selected. + If [count] is specified go to the [count]th tab. ________________________________________________________________________________ +|| || || + +||[count]|| +________________________________________________________________________________ +Go to the next tab. Cycles to the first tab, when the last is selected. + +If [count] is specified go to the [count]th next tab. +________________________________________________________________________________ || || || |gT| + ||[count]gT||