From 1de88a4016f76c832b4dc83ce9cc3eaf8dabf6ab Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Wed, 29 Dec 2010 23:46:56 -0500 Subject: Get rid of offensively long list of specs for :setl and :setg, and other small help formatting changes. --- common/locale/en-US/gui.xml | 11 +++--- common/locale/en-US/options.xml | 79 ++++++++++++++++------------------------- 2 files changed, 37 insertions(+), 53 deletions(-) (limited to 'common/locale') diff --git a/common/locale/en-US/gui.xml b/common/locale/en-US/gui.xml index 25c34fb6..b1365f47 100644 --- a/common/locale/en-US/gui.xml +++ b/common/locale/en-US/gui.xml @@ -228,16 +228,17 @@ progress messages are also output to this field.
  • - History and bookmark status ([+-❤⋯]): The position - of the current page in the tab's session history; + and - - indicate that it is possible to move backwards and forwards + History and bookmark status ([+-❤⋯]): The position + of the current page in the tab's session history; + and + - indicate that it is possible to move backwards and forwards through the history respectively. ❤ indicates that the current page is bookmarked. Any other character indicates a QuickMark matching the current page.
  • - Tab index ([N/M]): N is the index of the currently selected tab and M is - the total number of tabs in the current window. + Tab index ([N/M]): N is the index of the + currently selected tab and M is the total number of tabs in + the current window.
  • Vertical scroll: The vertical scroll percentage of the current buffer, diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml index 099f6384..ca0651dd 100644 --- a/common/locale/en-US/options.xml +++ b/common/locale/en-US/options.xml @@ -38,7 +38,7 @@
    stringlist
    A comma-separated list of strings. Any comma appearing within single - or double quotes, or prefixed with a \, will not be treated + or double quotes, or prefixed with a \, will not be treated as an item separator.
    @@ -50,12 +50,12 @@
    regexplist
    A comma-separated list of regular expressions. Expressions may be - prefixed with a !, in which case the match will be negated. A - literal ! at the beginning of the expression may be matched - with [!] or by placing the regular expression in quotes. + prefixed with a !, in which case the match will be negated. A + literal ! at the beginning of the expression may be matched + with [!] or by placing the regular expression in quotes. Generally, the first matching regular expression is used. Any comma appearing within single or double quotes, or prefixed with a - \, will not be treated as an item separator. + \, will not be treated as an item separator.
    @@ -63,7 +63,7 @@
    A combination of a stringmap and a regexplist. Each key in the key:value pair is a regexp. If the regexp begins with a - !, the sense of the match is negated, such that a non-matching + !, the sense of the match is negated, such that a non-matching expression will be considered a match and vice versa. The first key to match yields value.
    @@ -71,23 +71,24 @@

    Some options may be given format strings containing macro replacements in - the form of <name>. These tokens are replaced by + the form of <name>. These tokens are replaced by the parameter name as specified in the relevant documentation. - If the token is in the form <q-name>, the value of the + If the token is in the form <q-name>, the value of the parameter is automatically quoted. If it is in - the form of <e-name>, its value is never shown but may be + the form of <e-name>, its value is never shown but may be used to test whether the given parameter is empty.

    - Any substring enclosed by <{ and }> is automatically - elided if any of the contained macros aren't currently valid. A - literal < or > character may be included with the - special escape sequences <lt> or <gt> respectively. + Any substring enclosed by <{ and }> + is automatically elided if any of the contained macros aren't currently + valid. A literal < or > character may + be included with the special escape sequences <lt> or + <gt> respectively.

    -

    +

    For example, given the format string - <{(cmd: <column>) }><{line: <line> }><file>, + <{(cmd: <column>) }><{line: <line> }><file>, where line=32 and file=Lieder eines fahrenden Gesellen.txt, the result is formatted as @@ -156,16 +157,20 @@

    For list options, toggle the specified values.

    -

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

    - foo,bar -

    then,

    - foo,baz -

    has the same result as

    - bar,baz +

    + If the option is a list, the given values are toggled. Given, + foo,bar + then, + foo,baz + has the same result as + bar,baz +

    -

    This extends to string options in a natural way, e.g.

    - always,never -

    toggles between the two values.

    +

    + This extends to string options in a natural way, e.g., + always,never + toggles between the two values. +

    @@ -240,18 +245,7 @@ :setlocal :setl - :setlocal - :setlocal all - :setlocal option? - :setlocal option - :setlocal nooption - :setlocal invoption - :setlocal option& - :setlocal all& - :setlocal option=value - :setlocal option+=value - :setlocal option^=value - :setlocal option-=value + :setlocal …

    The same as :set command, but operates on current tab options @@ -262,18 +256,7 @@ :setglobal :setg - :setglobal - :setglobal all - :setglobal option? - :setglobal option - :setglobal nooption - :setglobal invoption - :setglobal option& - :setglobal all& - :setglobal option=value - :setglobal option+=value - :setglobal option^=value - :setglobal option-=value + :setglobal …

    The same as :set command, but operates on global options only. -- cgit v1.2.3