From 714870525e1a7c82d5c4a1466ad6179f9938c308 Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Fri, 17 Dec 2010 09:04:46 -0500 Subject: [PATCH] Standardize formatting of :set examples in :help. --- common/content/help.xsl | 25 +++++++++++++++++++++++++ common/locale/en-US/autocommands.xml | 4 ++-- common/locale/en-US/map.xml | 2 +- common/locale/en-US/options.xml | 22 +++++++++++----------- pentadactyl/locale/en-US/intro.xml | 8 ++++---- pentadactyl/locale/en-US/tutorial.xml | 8 ++++---- 6 files changed, 47 insertions(+), 22 deletions(-) diff --git a/common/content/help.xsl b/common/content/help.xsl index 8f4cfa69..3a9d6a6a 100644 --- a/common/content/help.xsl +++ b/common/content/help.xsl @@ -454,6 +454,31 @@ + + + :set + + + + + = + + + + + + + + + + + + + + + + +
HelpDescription diff --git a/common/locale/en-US/autocommands.xml b/common/locale/en-US/autocommands.xml index a182e2e7..d81bc6ec 100644 --- a/common/locale/en-US/autocommands.xml +++ b/common/locale/en-US/autocommands.xml @@ -99,8 +99,8 @@

Set the filetype to mail when editing email at Gmail:

-:autocmd LocationChange !mail\.google\.com :set editor=gvim -f -:autocmd LocationChange mail\.google\.com :set editor=gvim -f -c 'set ft=mail' +:autocmd LocationChange !mail\.google\.com gvim -f +:autocmd LocationChange mail\.google\.com gvim -f -c 'set ft=mail' diff --git a/common/locale/en-US/map.xml b/common/locale/en-US/map.xml index 8cc983e6..298c74e6 100644 --- a/common/locale/en-US/map.xml +++ b/common/locale/en-US/map.xml @@ -386,7 +386,7 @@

works like

:map \h :echo Hello

but after

- :set mapleader=, + ,

it works like

:map ,h :echo Hello diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml index 91c1a7b1..2ca61d20 100644 --- a/common/locale/en-US/options.xml +++ b/common/locale/en-US/options.xml @@ -151,11 +151,11 @@

For list options, toggle the specified values.

If the option is a list, the given values are toggled. Given,

- :set opt=foo,bar + foo,bar

then,

- :set opt!=foo,baz + foo,baz

has the same result as

- :set opt=bar,baz + bar,baz @@ -517,7 +517,7 @@

- The order is important, such that :set complete=bsf will + The order is important, such that bsf will list bookmarks followed by matching quick searches and then matching files.

@@ -978,13 +978,13 @@ For example, to prepend to the default value of this option to load all plugins except for foobar-plugin, you could use:

- :se lpl^=!foobar-plugin + !foobar-plugin

Alternatively, you can specify which plugins to load and which to omit in your &dactyl.name;rc using something like the following:

- :set loadplugins=!foo|bar,\.(js|&dactyl.fileExt;)$ + !foo|bar,\.(js|&dactyl.fileExt;)$

That will load all plugins but foo and bar.

@@ -1135,7 +1135,7 @@ through directly to &dactyl.host;, and are not processed by &dactyl.appName; in any way.

- :set passkeys+=https://mail\.google\.com/:jk + https://mail\.google\.com/:jk @@ -1225,7 +1225,7 @@

Example:

- :set runtimepath=~/my&dactyl.name;,~/.&dactyl.name; + ~/my&dactyl.name;,~/.&dactyl.name;

This will search for plugins in both @@ -1427,7 +1427,7 @@ Set the application name shown after the current page title in &dactyl.host;'s title bar.

- :set titlestring=Mozilla &dactyl.host; + Mozilla &dactyl.host; @@ -1443,7 +1443,7 @@ are never split. With the default value, the following will open three URLs in the current tab and two new background tabs,

- :open google Linux | wikipedia Arch Linux | imdb March of the Penguins + :open google Linux | wikipedia Arch Linux | imdb Serenity @@ -1540,7 +1540,7 @@ the following will ignore object files and Vim swap files:

- :set wildignore=\.o$,^\..*\.s[a-z]{2}$ + \.o$,^\..*\.s[a-z]{2}$ Unlike Vim, each pattern is a regular expression rather than a glob. diff --git a/pentadactyl/locale/en-US/intro.xml b/pentadactyl/locale/en-US/intro.xml index 74187959..1d4202c0 100644 --- a/pentadactyl/locale/en-US/intro.xml +++ b/pentadactyl/locale/en-US/intro.xml @@ -27,13 +27,13 @@ navigation, and tool bars by default. If you find it uncomfortable to work without them, you can re-enable them by typing

-:set guioptions+=mT +mT

If you have trouble remembering commands or keyboard shortcuts, you can bring up this help page at any time by typing :help or . If you find that you don't like &dactyl.appName; at all, - you can disable it by typing :extdisable &dactyl.appName; or - delete it entirely by typing :extdelete &dactyl.appName; + you can disable it by typing :extdisable &dactyl.appName; or + delete it entirely by typing :extdelete &dactyl.appName;

Help topics

@@ -151,7 +151,7 @@
  • Hit-a-hint like navigation of links (start with f to follow a link)
  • Advanced completion of bookmark and history URLs
  • Vim-like status line with a Wget-like progress bar
    • -
  • Minimal GUI (easily hide superfluous menubar and toolbar with :set guioptions=)
    • +
  • Minimal GUI (easily hide superfluous menubar and toolbar with )
  • Ability to :source JavaScript, CSS, and &dactyl.appName; command files
  • Easy quick searches (see :open)
  • Count supported for many commands (3 will go back 3 pages)
    • diff --git a/pentadactyl/locale/en-US/tutorial.xml b/pentadactyl/locale/en-US/tutorial.xml index c120d674..48dd8b5c 100644 --- a/pentadactyl/locale/en-US/tutorial.xml +++ b/pentadactyl/locale/en-US/tutorial.xml @@ -26,7 +26,7 @@ regain these by issuing the command

    -:set go+=mTB +mTB

    where represents pressing the or key. @@ -36,8 +36,8 @@

    However, in this author's opinion, the best way to get familiar with &dactyl.appName; is to leave these disabled for now. (The above action can be - reversed with :set go=) You can look at the entry for guioptions in - options for more information on this. + reversed with ) You can look at the entry + for guioptions in options for more information on this.

    &dactyl.appName;'s modal interface

    @@ -360,7 +360,7 @@

    Alternatively, you can do this the old-fashioned way: re-enable the menubar, - as above, with :set go+=m, and select Add-ons from the Tools menu. + as above, with m, and select Add-ons from the Tools menu.

    I'm interested… but lost!