Merge branch 'master' into fixTailQuote

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)

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

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 <b>extendedMode</b>.
          * Further, callbacks defined for <b>extendedMode</b> are
          * triggered as appropriate (see {@link Liberator#registerCallback}).
@@ -1061,8 +1061,8 @@ function CommandLine() //{{{
         },
 
         /**
-         * Closes the command-line. This is ordinarily triggered automatically
+         * Closes the command line. This is ordinarily triggered automatically
-         * by a mode change. Will not hide the command-line immediately if
+         * 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.

common/content/util.js

@@ -177,7 +177,7 @@ const util = { //{{{
 
     /**
      * Copies a string to the system clipboard. If <b>verbose</b> 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

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:

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.
 - <tags> and <keyword> 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

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:

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 /etc/fstab[c] shows the file system table.
-   - [c]:open ../other/foo.html[c] in your home directory opens
+   * [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).
 
@@ -346,4 +346,4 @@ ________________________________________________________________________________
 Print the current directory name.
 ________________________________________________________________________________
 
-// vim: set syntax=asciidoc:
+// vim: set syntax=asciidoc filetype=asciidoc:

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:

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_<Up>| +
 ||<Up>||
 ________________________________________________________________________________
-Recall the previous command-line from the history list which matches the
+Recall the previous command line from the history list which matches the
-current command-line.
+current command line.
 ________________________________________________________________________________
 
 
 |c_<Down>| +
 ||<Down>||
 ________________________________________________________________________________
-Recall the next command-line from the history list which matches the current
+Recall the next command line from the history list which matches the current
-command-line.
+command line.
 ________________________________________________________________________________
 
 
@@ -49,7 +49,7 @@ ________________________________________________________________________________
 ||<S-Up>|| +
 ||<PageUp>||
 ________________________________________________________________________________
-Recall the previous command-line from the history list.
+Recall the previous command line from the history list.
 ________________________________________________________________________________
 
 
@@ -57,7 +57,7 @@ ________________________________________________________________________________
 ||<S-Down>|| +
 ||<PageDown>||
 ________________________________________________________________________________
-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]
@@ -77,4 +77,4 @@ ________________________________________________________________________________
 Complete the previous full match when 'wildmode' contains "full".
 ________________________________________________________________________________
 
-// vim: set syntax=asciidoc:
+// vim: set syntax=asciidoc filetype=asciidoc:

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:

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:

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]
@@ -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:

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:

vimperator/locale/en-US/index.txt

@@ -128,8 +128,8 @@ section:Command-line{nbsp}editing[ex-edit-index]
 
 ||<C-]>|| Expand a command-line abbreviation +
 
-||<Up>|| Recall the previous command-line from the history list which matches the current command-line +
+||<Up>|| Recall the previous command line from the history list which matches the current command line +
-||<Down>|| Recall the next command-line from the history list which matches the current command-line +
+||<Down>|| Recall the next command line from the history list which matches the current command line +
 
 ||<Tab>|| Complete the word in front of the cursor according to the behavior specified in 'wildmode' +
 ||<S-Tab>|| 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 +
@@ -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:

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:

vimperator/locale/en-US/map.txt

@@ -10,7 +10,7 @@ which are translated to a string of characters. Example:
 
   :map <F2> :echo new Date().toDateString()<CR>
 
-will echo the current date to the command-line when [m]<F2>[m] is pressed.
+will echo the current date to the command line when [m]<F2>[m] is pressed.
 
 There are separate key mapping tables for each of the Normal, Insert,
 Command-line modes.
@@ -143,9 +143,9 @@ ________________________________________________________________________________
 
 |:map-<silent>| +
 ________________________________________________________________________________
-When the first argument to one of the mapping commands is <silent>, {rhs}
+When the first argument to one of the mapping commands is <silent>,
-is not echoed to the command-line, nor, for that matter, is anything else
+{rhs} is not echoed to the command line, nor, for that matter, anything
-until the command has completed.
+else until the command has completed.
 ________________________________________________________________________________
 
 
@@ -373,7 +373,7 @@ and <bang> 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:
@@ -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:

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:

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:

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]<Tab>[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
 -------------------------------------------
 
 ____
@@ -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:

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:

vimperator/locale/en-US/print.txt

@@ -30,4 +30,4 @@ and
 
 respectively.
 
-// vim: set syntax=asciidoc:
+// vim: set syntax=asciidoc filetype=asciidoc:

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:

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
+  .. [a]\~/_vimperatorrc[a] -- Windows only. If this file exists, its contents
-	are executed.
+	                           are executed.
-  c. [a]\~/.vimperatorrc[a] -- 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"
+ . All directories in 'runtimepath' are searched for a "plugin"
-subdirectory and all yet unloaded plugins are loaded. For each plugin
+   subdirectory and all yet unloaded plugins are loaded. For each
-directory, all *.\{js,vimp} files (including those in further
+   plugin directory, all *.\{js,vimp} files (including those in further
-subdirectories) are sourced alphabetically. No plugins will be sourced
+   subdirectories) are sourced alphabetically. No plugins will be
-if 'noloadplugins' is set. Any particular plugin will not be loaded if
+   sourced if 'noloadplugins' is set. Any particular plugin will
-it has already been loaded (e.g., by an earlier [c]:loadplugins[c]
+   not be loaded if it has already been loaded (e.g., by an earlier
-command).
+   [c]:loadplugins[c] command).
 
 The user's ~ (i.e., "home") directory is determined as follows:
 
@@ -57,4 +57,4 @@ ________________________________________________________________________________
 Force the browser to restart. Useful when installing extensions.
 ________________________________________________________________________________
 
-// vim: set syntax=asciidoc:
+// vim: set syntax=asciidoc filetype=asciidoc:

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
@@ -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:

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:

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:
 
   <Esc>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,
@@ -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:

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]
 |<C-[>| |<Esc>| +
 ||<Esc>||
 ________________________________________________________________________________
-Focus content. Exits any command-line or hint mode and returns to browser
+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
+mode. Also focuses the web page in case a form field has focus and eats
 our key presses.
 ________________________________________________________________________________
 
@@ -115,4 +115,4 @@ ________________________________________________________________________________
 //Close preview window on bottom of screen.
 //________________________________________________________________________________
 
-// vim: set syntax=asciidoc:
+// vim: set syntax=asciidoc filetype=asciidoc: