updated for version 7.0216
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index 85132a6..e4c5674 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1,4 +1,4 @@
-*change.txt* For Vim version 7.0aa. Last change: 2006 Feb 15
+*change.txt* For Vim version 7.0aa. Last change: 2006 Mar 06
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -765,6 +765,10 @@
For convenience a <NL> character is also used as a line break. Prepend a
backslash to get a real <NL> character (which will be a NUL in the file).
+When the result is a |List| then the items are joined with separating line
+breaks. Thus each item becomes a line, except that they can contain line
+breaks themselves.
+
The whole matched text can be accessed with "submatch(0)". The text matched
with the first pair of () with "submatch(1)". Likewise for further
sub-matches in ().
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 391220d..38115aa 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt* For Vim version 7.0aa. Last change: 2006 Feb 24
+*editing.txt* For Vim version 7.0aa. Last change: 2006 Mar 06
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -414,7 +414,9 @@
external command, by using the syntax `={expr}` e.g.: >
:e `=tempname()`
The expression can contain just about anything, thus this can also be used to
-avoid the special meaning of '"', '|', '%' and '#'.
+avoid the special meaning of '"', '|', '%' and '#'. Names are to be separated
+with line breaks. When the result is a |List| then each item is used as a
+name. Line breaks also separate names.
*++opt* *[++opt]*
The [++opt] argument can be used to force the value of 'fileformat',
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 90a8bfb..4c43bc7 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt* For Vim version 7.0aa. Last change: 2006 Mar 04
+*eval.txt* For Vim version 7.0aa. Last change: 2006 Mar 06
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -3371,7 +3371,7 @@
If there is no match -1 is returned.
Example: >
:echo match("testing", "ing") " results in 4
- :echo match([1, 'x'], '\a') " results in 2
+ :echo match([1, 'x'], '\a') " results in 1
< See |string-match| for how {pat} is used.
*strpbrk()*
Vim doesn't have a strpbrk() function. But you can do: >
@@ -3728,6 +3728,9 @@
remote_expr({server}, {string} [, {idvar}])
Send the {string} to {server}. The string is sent as an
expression and the result is returned after evaluation.
+ The result must be a String or a |List|. A |List| is turned
+ into a String by joining the items with a line break in
+ between (not at the end), like with join(expr, "\n").
If {idvar} is present, it is taken as the name of a
variable and a {serverid} for later use with
remote_read() is stored there.
@@ -3884,9 +3887,11 @@
If there is no match a 0 is returned and the cursor doesn't
move. No error message is given.
- When a match has been found its line number is returned. With
- the 'p' flag the returned value is one more than the first
- sub-match in \(\). One if there is none.
+ When a match has been found its line number is returned.
+ *search()-sub-match*
+ With the 'p' flag the returned value is one more than the
+ first sub-match in \(\). One if none of them matched but the
+ whole pattern did match.
To get the column number too use |searchpos()|.
The cursor will be positioned at the match, unless the 'n'
@@ -4039,9 +4044,15 @@
is the line number and the second element is the byte index of
the column position of the match. If no match is found,
returns [0, 0].
->
- :let [lnum,col] = searchpos('mypattern', 'n')
-<
+ Example: >
+ :let [lnum, col] = searchpos('mypattern', 'n')
+
+< When the 'p' flag is given then there is an extra item with
+ the sub-pattern match number |search()-sub-match|. Example: >
+ :let [lnum, col, submatch] = searchpos('\(\l\)\|\(\u\)', 'np')
+< In this example "submatch" is 2 when a lowercase letter is
+ found |/\l|, 3 when an uppercase letter is found |/\u|.
+
server2client( {clientid}, {string}) *server2client()*
Send a reply string to {clientid}. The most recent {clientid}
that sent a string can be retrieved with expand("<client>").
diff --git a/runtime/doc/if_mzsch.txt b/runtime/doc/if_mzsch.txt
index d0fd793..5d41b4b 100644
--- a/runtime/doc/if_mzsch.txt
+++ b/runtime/doc/if_mzsch.txt
@@ -1,4 +1,4 @@
-*if_mzsch.txt* For Vim version 7.0aa. Last change: 2006 Jan 05
+*if_mzsch.txt* For Vim version 7.0aa. Last change: 2006 Mar 06
VIM REFERENCE MANUAL by Sergey Khorev
@@ -166,7 +166,10 @@
Common
------
(command {command-string}) Perform the vim ":Ex" style command.
- (eval {expr-string}) Evaluate the vim command string.
+ (eval {expr-string}) Evaluate the vim expression to a string.
+ A |List| is turned into a string by
+ joining the items and inserting line
+ breaks.
NOTE clashes with MzScheme eval
(range-start) Start/End of the range passed with
(range-end) the Scheme command.
diff --git a/runtime/doc/if_ole.txt b/runtime/doc/if_ole.txt
index 36efe41..eff7bb2 100644
--- a/runtime/doc/if_ole.txt
+++ b/runtime/doc/if_ole.txt
@@ -1,4 +1,4 @@
-*if_ole.txt* For Vim version 7.0aa. Last change: 2005 Mar 29
+*if_ole.txt* For Vim version 7.0aa. Last change: 2006 Mar 06
VIM REFERENCE MANUAL by Paul Moore
@@ -77,7 +77,8 @@
This method takes a single parameter, which is an expression in Vim's normal
format (see |expression|). It returns a string, which is the result of
-evaluating the expression.
+evaluating the expression. A |List| is turned into a string by joining the
+items and inserting line breaks.
Examples (Visual Basic syntax) >
Line20 = Vim.Eval("getline(20)")
diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt
index 6e0a3e4..7308c0d 100644
--- a/runtime/doc/if_perl.txt
+++ b/runtime/doc/if_perl.txt
@@ -1,4 +1,4 @@
-*if_perl.txt* For Vim version 7.0aa. Last change: 2005 Oct 14
+*if_perl.txt* For Vim version 7.0aa. Last change: 2006 Mar 06
VIM REFERENCE MANUAL by Sven Verdoolaege
@@ -181,6 +181,8 @@
value of internal |variables| x, and '$x' is equivalent
to perl's $ENV{x}. All |functions| accessible from
the command-line are valid for {expr}.
+ A |List| is turned into a string by joining the items
+ and inserting line breaks.
*perl-SetHeight*
Window->SetHeight({height})
diff --git a/runtime/doc/if_ruby.txt b/runtime/doc/if_ruby.txt
index a70d32a..194b8d1 100644
--- a/runtime/doc/if_ruby.txt
+++ b/runtime/doc/if_ruby.txt
@@ -1,4 +1,4 @@
-*if_ruby.txt* For Vim version 7.0aa. Last change: 2005 Oct 14
+*if_ruby.txt* For Vim version 7.0aa. Last change: 2006 Mar 06
VIM REFERENCE MANUAL by Shugo Maeda
@@ -117,6 +117,8 @@
VIM::evaluate({expr})
Evaluates {expr} using the vim internal expression evaluator (see
|expression|). Returns the expression result as a string.
+ A |List| is turned into a string by joining the items and inserting
+ line breaks.
==============================================================================
3. VIM::Buffer objects *ruby-buffer*
diff --git a/runtime/doc/if_tcl.txt b/runtime/doc/if_tcl.txt
index 79c43f5..cee0370 100644
--- a/runtime/doc/if_tcl.txt
+++ b/runtime/doc/if_tcl.txt
@@ -1,4 +1,4 @@
-*if_tcl.txt* For Vim version 7.0aa. Last change: 2005 Oct 14
+*if_tcl.txt* For Vim version 7.0aa. Last change: 2006 Mar 06
VIM REFERENCE MANUAL by Ingo Wilken
@@ -133,7 +133,8 @@
Evaluates the expression {expr} using vim's internal expression
evaluator (see |expression|). Any expression that queries a buffer
or window property uses the current buffer/current window. Returns
- the result as a string.
+ the result as a string. A |List| is turned into a string by joining
+ the items and inserting line breaks.
Examples: >
set perl_available [::vim::expr has("perl")]
< See also |tcl-window-expr| and |tcl-buffer-expr|.
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index a4ce0af..203fd2b 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1,4 +1,4 @@
-*index.txt* For Vim version 7.0aa. Last change: 2006 Mar 04
+*index.txt* For Vim version 7.0aa. Last change: 2006 Mar 05
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1419,6 +1419,7 @@
|:source| :so[urce] read Vim or Ex commands from a file
|:spelldump| :spelld[ump] split window and fill with all correct words
|:spellgood| :spe[llgood] add good word for spelling
+|:spellinfo| :spelli[nfo] show info about loaded spell files
|:spellrepall| :spellr[epall] replace all bad words like last |z=|
|:spellundo| :spellu[ndo] remove good or bad word
|:spellwrong| :spellw[rong] add spelling mistake
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 7d904a8..551d133 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt* For Vim version 7.0aa. Last change: 2006 Mar 04
+*insert.txt* For Vim version 7.0aa. Last change: 2006 Mar 06
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -130,6 +130,9 @@
the cursor up:
CTRL-R ="\<Up>"
Use CTRL-R CTRL-R to insert text literally.
+ When the result is a |List| the items are used
+ as lines. They can have line breaks inside
+ too.
See |registers| about registers. {not in Vi}
CTRL-R CTRL-R {0-9a-z"%#*+/:.-=} *i_CTRL-R_CTRL-R*
@@ -1239,6 +1242,30 @@
will be suggested. All other elements are not placed in suggestion list.
+PHP *ft-php-omni*
+
+Completion of PHP code requires tags file for completion of data from external
+files. You should use Exuberant ctags version 5.5.4 or newer. You can find it
+here: http://ctags.sourceforge.net/
+
+Script completes:
+
+- after $ variables name
+- function names with additonal info:
+- in case of built-in functions list of possible arguments and after | type
+ data returned by function
+- in case of user function arguments and name of file were function was
+ defined (if it is not current file)
+
+Note: when doing completion first time Vim will load all necessary data into
+memory. It may take several seconds. After next use of completion delay
+shouldn't be noticeable.
+
+Script detects if cursor is inside <?php ?> tags. If it is outside it will
+automatically switch to HTML/CSS/JavaScript completion. Note: contrary to
+original HTML files completion of tags (and only tags) isn't context aware.
+
+
SYNTAX *ft-syntax-omni*
This uses the current syntax highlighting for completion. It can be used for
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 67872fb..7a194cc 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1,4 +1,4 @@
-*map.txt* For Vim version 7.0aa. Last change: 2006 Feb 24
+*map.txt* For Vim version 7.0aa. Last change: 2006 Mar 06
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1089,6 +1089,7 @@
-complete=event autocommand events
-complete=expression Vim expression
-complete=file file and directory names
+ -complete=shellcmd Shell command
-complete=function function name
-complete=help help subjects
-complete=highlight highlight groups
diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt
index ead91ab..54dcba8 100644
--- a/runtime/doc/mbyte.txt
+++ b/runtime/doc/mbyte.txt
@@ -1,4 +1,4 @@
-*mbyte.txt* For Vim version 7.0aa. Last change: 2005 Oct 14
+*mbyte.txt* For Vim version 7.0aa. Last change: 2006 Mar 05
VIM REFERENCE MANUAL by Bram Moolenaar et al.
@@ -1257,11 +1257,16 @@
normal width and a space to fill the gap. Note that the 'guifontset' option
is no longer relevant in the GTK+ 2 GUI.
-Up to two combining characters can be used. The combining character is drawn
-on top of the preceding character. When editing text a composing character is
-mostly considered part of the preceding character. For example "x" will
-delete a character and its following composing characters by default. If the
-'delcombine' option is on, then pressing 'x' will delete the combining
+ *mbyte-combining* *mbyte-composing*
+A composing or combining character is used to change the meaning of the
+character before it. The combining characters are drawn on top of the
+preceding character.
+Up to two combining characters can be used by default. This can be changed
+with the 'maxcombine' option.
+When editing text a composing character is mostly considered part of the
+preceding character. For example "x" will delete a character and its
+following composing characters by default.
+If the 'delcombine' option is on, then pressing 'x' will delete the combining
characters, one at a time, then the base character. But when inserting, you
type the first character and the following composing characters separately,
after which they will be joined. The "r" command will not allow you to type a
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 31cd140..c7ff8f5 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 7.0aa. Last change: 2006 Mar 04
+*options.txt* For Vim version 7.0aa. Last change: 2006 Mar 06
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1050,7 +1050,10 @@
To check whether line breaks in the balloon text work use this check: >
if has("balloon_multiline")
-<
+< When they are supported "\n" characters will start a new line. If the
+ expression evaluates to a |List| this is equal to using each List item
+ as a string and putting "\n" in between them.
+
*'binary'* *'bin'* *'nobinary'* *'nobin'*
'binary' 'bin' boolean (default off)
local to buffer
@@ -3262,6 +3265,8 @@
'e' Add tab pages when indicated with 'showtabline'.
'guitablabel' can be used to change the text in the labels.
When 'e' is missing a non-GUI tab pages line may be used.
+ The GUI tabs are only supported on some systens, currently
+ only for GTK.
'f' Foreground: Don't use fork() to detach the GUI from the shell
where it was started. Use this for programs that wait for the
@@ -4289,6 +4294,20 @@
set. Note that this is not in milliseconds, like other options that
set a time. This is to be compatible with Nvi.
+ *'maxcombine'* *'mco'*
+'maxcombine' 'mco' number (default 2)
+ global
+ {not in Vi}
+ {only available when compiled with the |+multi_byte|
+ feature}
+ The maximum number of combining characters supported for displaying.
+ Only used when 'encoding' is "utf-8".
+ The default is OK for most languages. Hebrew may require 4.
+ Maximum value is 6.
+ Even when this option is set to 2 you can still edit text with more
+ combining characters, you just can't see them. Use |g8| or |ga|.
+ See |mbyte-combining|.
+
*'maxfuncdepth'* *'mfd'*
'maxfuncdepth' 'mfd' number (default 100)
global
@@ -7176,9 +7195,9 @@
"dh". If you use this, you may also want to use the mapping
":map <BS> X" to make backspace delete the character in front of the
cursor.
- When 'l' is included, you get a side effect: "yl" on an empty line
- will include the <EOL>, so that "p" will insert a new line. That's
- why including 'h' and 'l' are not recommended.
+ When 'l' is included and it is used after an operator at the end of a
+ line then it will not move to the next line. This makes "dl", "cl",
+ "yl" etc. work normally.
NOTE: This option is set to the Vi default value when 'compatible' is
set and to the Vim default value when 'compatible' is reset.
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index 11a988e..8772334 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -1,4 +1,4 @@
-*pattern.txt* For Vim version 7.0aa. Last change: 2006 Mar 01
+*pattern.txt* For Vim version 7.0aa. Last change: 2006 Mar 06
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -16,8 +16,9 @@
5. Multi items |pattern-multi-items|
6. Ordinary atoms |pattern-atoms|
7. Ignoring case in a pattern |/ignorecase|
-8. Compare with Perl patterns |perl-patterns|
-9. Highlighting matches |match-highlight|
+8. Composing characters |patterns-composing|
+9. Compare with Perl patterns |perl-patterns|
+10. Highlighting matches |match-highlight|
==============================================================================
1. Search commands *search-commands* *E486*
@@ -1104,12 +1105,6 @@
\cfoo - - foo Foo FOO
foo\C - - foo
- */\Z*
-When "\Z" appears anywhere in the pattern, composing characters are ignored.
-Thus only the base characters need to match, the composing characters may be
-different and the number of composing characters may differ. Only relevant
-when 'encoding' is "utf-8".
-
Technical detail: *NL-used-for-Nul*
<Nul> characters in the file are stored as <NL> in memory. In the display
they are shown as "^@". The translation is done when reading and writing
@@ -1134,7 +1129,27 @@
will probably never match.
==============================================================================
-8. Compare with Perl patterns *perl-patterns*
+8. Composing characters *patterns-composing*
+
+ */\Z*
+When "\Z" appears anywhere in the pattern, composing characters are ignored.
+Thus only the base characters need to match, the composing characters may be
+different and the number of composing characters may differ. Only relevant
+when 'encoding' is "utf-8".
+
+When a composing character appears at the start of the pattern of after an
+item that doesn't include the composing character, a match is found at any
+character that includes this composing character.
+
+When using a dot and a composing character, this works the same as the
+composing character by itself, except that it doesn't matter what comes before
+this.
+
+The order of composing characters matters, even though changing the order
+doen't change what a character looks like. This may change in the future.
+
+==============================================================================
+9. Compare with Perl patterns *perl-patterns*
Vim's regexes are most similar to Perl's, in terms of what you can do. The
difference between them is mostly just notation; here's a summary of where
@@ -1144,7 +1159,7 @@
----------------------------------------------------------------
force case insensitivity \c (?i)
force case sensitivity \C (?-i)
-backref-less grouping \%(atom) (?:atom)
+backref-less grouping \%(atom\) (?:atom)
conservative quantifiers \{-n,m} *?, +?, ??, {}?
0-width match atom\@= (?=atom)
0-width non-match atom\@! (?!atom)
@@ -1177,10 +1192,10 @@
- \& (which is to \| what "and" is to "or"; it forces several branches
to match at one spot)
- matching lines/columns by number: \%5l \%5c \%5v
-- limiting the "return value" of a regex: \zs \ze
+- setting the start and end of the match: \zs \ze
==============================================================================
-9. Highlighting matches *match-highlight*
+10. Highlighting matches *match-highlight*
*:mat* *:match*
:mat[ch] {group} /{pattern}/
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 192778c..b81659d 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1,4 +1,4 @@
-*quickref.txt* For Vim version 7.0aa. Last change: 2006 Feb 13
+*quickref.txt* For Vim version 7.0aa. Last change: 2006 Mar 05
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -588,337 +588,341 @@
the help.
Short explanation of each option: *option-list*
-|'aleph'| |'al'| ASCII code of the letter Aleph (Hebrew)
-|'allowrevins'| |'ari'| allow CTRL-_ in Insert and Command-line mode
-|'altkeymap'| |'akm'| for default second language (Farsi/Hebrew)
-|'ambiwidth'| |'ambw'| what to do with Unicode chars of ambiguous width
-|'antialias'| |'anti'| Mac OS X: use smooth, antialiased fonts
-|'autochdir'| |'acd'| change directory to the file in the current window
-|'arabic'| |'arab'| for Arabic as a default second language
-|'arabicshape'| |'arshape'| do shaping for Arabic characters
-|'autoindent'| |'ai'| take indent for new line from previous line
-|'autoread'| |'ar'| autom. read file when changed outside of Vim
-|'autowrite'| |'aw'| automatically write file if changed
-|'autowriteall'| |'awa'| as 'autowrite', but works with more commands
-|'background'| |'bg'| "dark" or "light", used for highlight colors
-|'backspace'| |'bs'| how backspace works at start of line
-|'backup'| |'bk'| keep backup file after overwriting a file
-|'backupcopy'| |'bkc'| make backup as a copy, don't rename the file
-|'backupdir'| |'bdir'| list of directories for the backup file
-|'backupext'| |'bex'| extension used for the backup file
-|'backupskip'| |'bsk'| no backup for files that match these patterns
-|'balloondelay'| |'bdlay'| delay in mS before a balloon may pop up
-|'ballooneval'| |'beval'| switch on balloon evaluation
-|'balloonexpr'| |'bexpr'| expression to show in balloon
-|'binary'| |'bin'| read/write/edit file in binary mode
-|'bioskey'| |'biosk'| MS-DOS: use bios calls for input characters
-|'bomb'| prepend a Byte Order Mark to the file
-|'breakat'| |'brk'| characters that may cause a line break
-|'browsedir'| |'bsdir'| which directory to start browsing in
-|'bufhidden'| |'bh'| what to do when buffer is no longer in window
-|'buflisted'| |'bl'| whether the buffer shows up in the buffer list
-|'buftype'| |'bt'| special type of buffer
-|'casemap'| |'cmp'| specifies how case of letters is changed
-|'cdpath'| |'cd'| list of directories searched with ":cd"
-|'cedit'| key used to open the command-line window
-|'charconvert'| |'ccv'| expression for character encoding conversion
-|'cindent'| |'cin'| do C program indenting
-|'cinkeys'| |'cink'| keys that trigger indent when 'cindent' is set
-|'cinoptions'| |'cino'| how to do indenting when 'cindent' is set
-|'cinwords'| |'cinw'| words where 'si' and 'cin' add an indent
-|'clipboard'| |'cb'| use the clipboard as the unnamed register
-|'cmdheight'| |'ch'| number of lines to use for the command-line
-|'cmdwinheight'| |'cwh'| height of the command-line window
-|'columns'| |'co'| number of columns in the display
-|'comments'| |'com'| patterns that can start a comment line
-|'commentstring'| |'cms'| template for comments; used for fold marker
-|'compatible'| |'cp'| behave Vi-compatible as much as possible
-|'complete'| |'cpt'| specify how Insert mode completion works
-|'completefunc'| |'cfu'| function to be used for Insert mode completion
-|'completeopt'| |'cot'| options for Insert mode completion
-|'confirm'| |'cf'| ask what to do about unsaved/read-only files
-|'conskey'| |'consk'| get keys directly from console (MS-DOS only)
-|'copyindent'| |'ci'| make 'autoindent' use existing indent structure
-|'cpoptions'| |'cpo'| flags for Vi-compatible behavior
-|'cscopepathcomp'| |'cspc'| how many components of the path to show
-|'cscopeprg'| |'csprg'| command to execute cscope
-|'cscopequickfix'| |'csqf'| use quickfix window for cscope results
-|'cscopetag'| |'cst'| use cscope for tag commands
-|'cscopetagorder'| |'csto'| determines ":cstag" search order
-|'cscopeverbose'| |'csverb'| give messages when adding a cscope database
-|'debug'| set to "msg" to see all error messages
-|'define'| |'def'| pattern to be used to find a macro definition
-|'delcombine'| |'deco'| delete combining characters on their own
-|'dictionary'| |'dict'| list of file names used for keyword completion
-|'diff'| use diff mode for the current window
-|'diffexpr'| |'dex'| expression used to obtain a diff file
-|'diffopt'| |'dip'| options for using diff mode
-|'digraph'| |'dg'| enable the entering of digraphs in Insert mode
-|'directory'| |'dir'| list of directory names for the swap file
-|'display'| |'dy'| list of flags for how to display text
-|'eadirection'| |'ead'| in which direction 'equalalways' works
-|'edcompatible'| |'ed'| toggle flags of ":substitute" command
-|'encoding'| |'enc'| encoding used internally
-|'endofline'| |'eol'| write <EOL> for last line in file
-|'equalalways'| |'ea'| windows are automatically made the same size
-|'equalprg'| |'ep'| external program to use for "=" command
-|'errorbells'| |'eb'| ring the bell for error messages
-|'errorfile'| |'ef'| name of the errorfile for the QuickFix mode
-|'errorformat'| |'efm'| description of the lines in the error file
-|'esckeys'| |'ek'| recognize function keys in Insert mode
-|'eventignore'| |'ei'| autocommand events that are ignored
-|'expandtab'| |'et'| use spaces when <Tab> is inserted
-|'exrc'| |'ex'| read .vimrc and .exrc in the current directory
-|'fileencoding'| |'fenc'| file encoding for multi-byte text
-|'fileencodings'| |'fencs'| automatically detected character encodings
-|'fileformat'| |'ff'| file format used for file I/O
-|'fileformats'| |'ffs'| automatically detected values for 'fileformat'
-|'filetype'| |'ft'| type of file, used for autocommands
-|'fillchars'| |'fcs'| characters to use for displaying special items
-|'fkmap'| |'fk'| Farsi keyboard mapping
-|'foldclose'| |'fcl'| close a fold when the cursor leaves it
-|'foldcolumn'| |'fdc'| width of the column used to indicate folds
-|'foldenable'| |'fen'| set to display all folds open
-|'foldexpr'| |'fde'| expression used when 'foldmethod' is "expr"
-|'foldignore'| |'fdi'| ignore lines when 'foldmethod' is "indent"
-|'foldlevel'| |'fdl'| close folds with a level higher than this
-|'foldlevelstart'| |'fdls'| 'foldlevel' when starting to edit a file
-|'foldmarker'| |'fmr'| markers used when 'foldmethod' is "marker"
-|'foldmethod'| |'fdm'| folding type
-|'foldminlines'| |'fml'| minimum number of lines for a fold to be closed
-|'foldnestmax'| |'fdn'| maximum fold depth
-|'foldopen'| |'fdo'| for which commands a fold will be opened
-|'foldtext'| |'fdt'| expression used to display for a closed fold
-|'formatlistpat'| |'flp'| pattern used to recognize a list header
-|'formatoptions'| |'fo'| how automatic formatting is to be done
-|'formatprg'| |'fp'| name of external program used with "gq" command
-|'formatexpr'| |'fex'| expression used with "gq" command
-|'fsync'| |'fs'| whether to invoke fsync() after file write
-|'gdefault'| |'gd'| the ":substitute" flag 'g' is default on
-|'grepformat'| |'gfm'| format of 'grepprg' output
-|'grepprg'| |'gp'| program to use for ":grep"
-|'guicursor'| |'gcr'| GUI: settings for cursor shape and blinking
-|'guifont'| |'gfn'| GUI: Name(s) of font(s) to be used
-|'guifontset'| |'gfs'| GUI: Names of multi-byte fonts to be used
-|'guifontwide'| |'gfw'| list of font names for double-wide characters
-|'guiheadroom'| |'ghr'| GUI: pixels room for window decorations
-|'guioptions'| |'go'| GUI: Which components and options are used
-|'guipty'| GUI: try to use a pseudo-tty for ":!" commands
-|'helpfile'| |'hf'| full path name of the main help file
-|'helpheight'| |'hh'| minimum height of a new help window
-|'helplang'| |'hlg'| preferred help languages
-|'hidden'| |'hid'| don't unload buffer when it is |abandon|ed
-|'highlight'| |'hl'| sets highlighting mode for various occasions
-|'hlsearch'| |'hls'| highlight matches with last search pattern
-|'history'| |'hi'| number of command-lines that are remembered
-|'hkmap'| |'hk'| Hebrew keyboard mapping
-|'hkmapp'| |'hkp'| phonetic Hebrew keyboard mapping
-|'icon'| let Vim set the text of the window icon
-|'iconstring'| string to use for the Vim icon text
-|'ignorecase'| |'ic'| ignore case in search patterns
-|'imactivatekey'| |'imak'| key that activates the X input method
-|'imcmdline'| |'imc'| use IM when starting to edit a command line
-|'imdisable'| |'imd'| do not use the IM in any mode
-|'iminsert'| |'imi'| use :lmap or IM in Insert mode
-|'imsearch'| |'ims'| use :lmap or IM when typing a search pattern
-|'include'| |'inc'| pattern to be used to find an include file
-|'includeexpr'| |'inex'| expression used to process an include line
-|'incsearch'| |'is'| highlight match while typing search pattern
-|'indentexpr'| |'inde'| expression used to obtain the indent of a line
-|'indentkeys'| |'indk'| keys that trigger indenting with 'indentexpr'
-|'infercase'| |'inf'| adjust case of match for keyword completion
-|'insertmode'| |'im'| start the edit of a file in Insert mode
-|'isfname'| |'isf'| characters included in file names and pathnames
-|'isident'| |'isi'| characters included in identifiers
-|'iskeyword'| |'isk'| characters included in keywords
-|'isprint'| |'isp'| printable characters
-|'joinspaces'| |'js'| two spaces after a period with a join command
-|'key'| encryption key
-|'keymap'| |'kmp'| name of a keyboard mapping
-|'keymodel'| |'km'| enable starting/stopping selection with keys
-|'keywordprg'| |'kp'| program to use for the "K" command
-|'langmap'| |'lmap'| alphabetic characters for other language mode
-|'langmenu'| |'lm'| language to be used for the menus
-|'laststatus'| |'ls'| tells when last window has status lines
-|'lazyredraw'| |'lz'| don't redraw while executing macros
-|'linebreak'| |'lbr'| wrap long lines at a blank
-|'lines'| number of lines in the display
-|'linespace'| |'lsp'| number of pixel lines to use between characters
-|'lisp'| automatic indenting for Lisp
-|'lispwords'| |'lw'| words that change how lisp indenting works
-|'list'| show <Tab> and <EOL>
-|'listchars'| |'lcs'| characters for displaying in list mode
-|'loadplugins'| |'lpl'| load plugin scripts when starting up
-|'magic'| changes special characters in search patterns
-|'makeef'| |'mef'| name of the errorfile for ":make"
-|'makeprg'| |'mp'| program to use for the ":make" command
-|'matchpairs'| |'mps'| pairs of characters that "%" can match
-|'matchtime'| |'mat'| tenths of a second to show matching paren
-|'maxfuncdepth'| |'mfd'| maximum recursive depth for user functions
-|'maxmapdepth'| |'mmd'| maximum recursive depth for mapping
-|'maxmem'| |'mm'| maximum memory (in Kbyte) used for one buffer
-|'maxmempattern'| |'mmp'| maximum memory (in Kbyte) used for pattern search
-|'maxmemtot'| |'mmt'| maximum memory (in Kbyte) used for all buffers
-|'menuitems'| |'mis'| maximum number of items in a menu
-|'mkspellmem'| |'msm'| memory used before |:mkspell| compresses the tree
-|'modeline'| |'ml'| recognize modelines at start or end of file
-|'modelines'| |'mls'| number of lines checked for modelines
-|'modifiable'| |'ma'| changes to the text are not possible
-|'modified'| |'mod'| buffer has been modified
-|'more'| pause listings when the whole screen is filled
-|'mouse'| enable the use of mouse clicks
-|'mousefocus'| |'mousef'| keyboard focus follows the mouse
-|'mousehide'| |'mh'| hide mouse pointer while typing
-|'mousemodel'| |'mousem'| changes meaning of mouse buttons
-|'mouseshape'| |'mouses'| shape of the mouse pointer in different modes
-|'mousetime'| |'mouset'| max time between mouse double-click
-|'mzquantum'| |'mzq'| the interval between polls for MzScheme threads
-|'nrformats'| |'nf'| number formats recognized for CTRL-A command
-|'number'| |'nu'| print the line number in front of each line
-|'numberwidth'| |'nuw'| number of columns used for the line number
-|'omnifunc'| |'ofu'| function for filetype-specific completion
-|'operatorfunc'| |'opfunc'| funtion to be called for |g@| operator
-|'osfiletype'| |'oft'| operating system-specific filetype information
-|'paragraphs'| |'para'| nroff macros that separate paragraphs
-|'paste'| allow pasting text
-|'pastetoggle'| |'pt'| key code that causes 'paste' to toggle
-|'patchexpr'| |'pex'| expression used to patch a file
-|'patchmode'| |'pm'| keep the oldest version of a file
-|'path'| |'pa'| list of directories searched with "gf" et.al.
-|'preserveindent'| |'pi'| preserve the indent structure when reindenting
-|'previewheight'| |'pvh'| height of the preview window
-|'previewwindow'| |'pvw'| identifies the preview window
-|'printdevice'| |'pdev'| name of the printer to be used for :hardcopy
-|'printencoding'| |'penc'| encoding to be used for printing
-|'printexpr'| |'pexpr'| expression used to print PostScript for :hardcopy
-|'printfont'| |'pfn'| name of the font to be used for :hardcopy
-|'printheader'| |'pheader'| format of the header used for :hardcopy
-|'printmbcharset'| |'pmbcs'| CJK character set to be used for :hardcopy
-|'printmbfont'| |'pmbfn'| font names to be used for CJK output of :hardcopy
-|'printoptions'| |'popt'| controls the format of :hardcopy output
-|'quoteescape'| |'qe'| escape characters used in a string
-|'readonly'| |'ro'| disallow writing the buffer
-|'remap'| allow mappings to work recursively
-|'report'| threshold for reporting nr. of lines changed
-|'restorescreen'| |'rs'| Win32: restore screen when exiting
-|'revins'| |'ri'| inserting characters will work backwards
-|'rightleft'| |'rl'| window is right-to-left oriented
-|'rightleftcmd'| |'rlc'| commands for which editing works right-to-left
-|'ruler'| |'ru'| show cursor line and column in the status line
-|'rulerformat'| |'ruf'| custom format for the ruler
-|'runtimepath'| |'rtp'| list of directories used for runtime files
-|'scroll'| |'scr'| lines to scroll with CTRL-U and CTRL-D
-|'scrollbind'| |'scb'| scroll in window as other windows scroll
-|'scrolljump'| |'sj'| minimum number of lines to scroll
-|'scrolloff'| |'so'| minimum nr. of lines above and below cursor
-|'scrollopt'| |'sbo'| how 'scrollbind' should behave
-|'sections'| |'sect'| nroff macros that separate sections
-|'secure'| secure mode for reading .vimrc in current dir
-|'selection'| |'sel'| what type of selection to use
-|'selectmode'| |'slm'| when to use Select mode instead of Visual mode
-|'sessionoptions'| |'ssop'| options for |:mksession|
-|'shell'| |'sh'| name of shell to use for external commands
-|'shellcmdflag'| |'shcf'| flag to shell to execute one command
-|'shellpipe'| |'sp'| string to put output of ":make" in error file
-|'shellquote'| |'shq'| quote character(s) for around shell command
-|'shellredir'| |'srr'| string to put output of filter in a temp file
-|'shellslash'| |'ssl'| use forward slash for shell file names
-|'shelltemp'| |'stmp'| whether to use a temp file for shell commands
-|'shelltype'| |'st'| Amiga: influences how to use a shell
-|'shellxquote'| |'sxq'| like 'shellquote', but include redirection
-|'shiftround'| |'sr'| round indent to multiple of shiftwidth
-|'shiftwidth'| |'sw'| number of spaces to use for (auto)indent step
-|'shortmess'| |'shm'| list of flags, reduce length of messages
-|'shortname'| |'sn'| non-MS-DOS: Filenames assumed to be 8.3 chars
-|'showbreak'| |'sbr'| string to use at the start of wrapped lines
-|'showcmd'| |'sc'| show (partial) command in status line
-|'showfulltag'| |'sft'| show full tag pattern when completing tag
-|'showmatch'| |'sm'| briefly jump to matching bracket if insert one
-|'showmode'| |'smd'| message on status line to show current mode
-|'sidescroll'| |'ss'| minimum number of columns to scroll horizontal
-|'sidescrolloff'| |'siso'| min. nr. of columns to left and right of cursor
-|'smartcase'| |'scs'| no ignore case when pattern has uppercase
-|'smartindent'| |'si'| smart autoindenting for C programs
-|'smarttab'| |'sta'| use 'shiftwidth' when inserting <Tab>
-|'softtabstop'| |'sts'| number of spaces that <Tab> uses while editing
-|'spell'| enable spell checking
-|'spellcapcheck'| |'spc'| pattern to locate end of a sentence
-|'spellfile'| |'spf'| files where |zg| and |zw| store words
-|'spelllang'| |'spl'| language(s) to do spell checking for
-|'spellsuggest'| |'sps'| method(s) used to suggest spelling corrections
-|'splitbelow'| |'sb'| new window from split is below the current one
-|'splitright'| |'spr'| new window is put right of the current one
-|'startofline'| |'sol'| commands move cursor to first blank in line
-|'statusline'| |'stl'| custom format for the status line
-|'suffixes'| |'su'| suffixes that are ignored with multiple match
-|'suffixesadd'| |'sua'| suffixes added when searching for a file
-|'swapfile'| |'swf'| whether to use a swapfile for a buffer
-|'swapsync'| |'sws'| how to sync the swap file
-|'switchbuf'| |'swb'| sets behavior when switching to another buffer
-|'synmaxcol'| |'smc'| maximum column to find syntax items
-|'syntax'| |'syn'| syntax to be loaded for current buffer
-|'tabstop'| |'ts'| number of spaces that <Tab> in file uses
-|'tagbsearch'| |'tbs'| use binary searching in tags files
-|'taglength'| |'tl'| number of significant characters for a tag
-|'tagrelative'| |'tr'| file names in tag file are relative
-|'tags'| |'tag'| list of file names used by the tag command
-|'tagstack'| |'tgst'| push tags onto the tag stack
-|'term'| name of the terminal
-|'termbidi'| |'tbidi'| terminal takes care of bi-directionality
-|'termencoding'| |'tenc'| character encoding used by the terminal
-|'terse'| shorten some messages
-|'textauto'| |'ta'| obsolete, use 'fileformats'
-|'textmode'| |'tx'| obsolete, use 'fileformat'
-|'textwidth'| |'tw'| maximum width of text that is being inserted
-|'thesaurus'| |'tsr'| list of thesaurus files for keyword completion
-|'tildeop'| |'top'| tilde command "~" behaves like an operator
-|'timeout'| |'to'| time out on mappings and key codes
-|'timeoutlen'| |'tm'| time out time in milliseconds
-|'title'| let Vim set the title of the window
-|'titlelen'| percentage of 'columns' used for window title
-|'titleold'| old title, restored when exiting
-|'titlestring'| string to use for the Vim window title
-|'toolbar'| |'tb'| GUI: which items to show in the toolbar
-|'toolbariconsize'| |'tbis'| size of the toolbar icons (for GTK 2 only)
-|'ttimeout'| time out on mappings
-|'ttimeoutlen'| |'ttm'| time out time for key codes in milliseconds
-|'ttybuiltin'| |'tbi'| use built-in termcap before external termcap
-|'ttyfast'| |'tf'| indicates a fast terminal connection
-|'ttymouse'| |'ttym'| type of mouse codes generated
-|'ttyscroll'| |'tsl'| maximum number of lines for a scroll
-|'ttytype'| |'tty'| alias for 'term'
-|'undolevels'| |'ul'| maximum number of changes that can be undone
-|'updatecount'| |'uc'| after this many characters flush swap file
-|'updatetime'| |'ut'| after this many milliseconds flush swap file
-|'verbose'| |'vbs'| give informative messages
-|'verbosefile'| |'vfile'| file to write messages in
-|'viewdir'| |'vdir'| directory where to store files with :mkview
-|'viewoptions'| |'vop'| specifies what to save for :mkview
-|'viminfo'| |'vi'| use .viminfo file upon startup and exiting
-|'virtualedit'| |'ve'| when to use virtual editing
-|'visualbell'| |'vb'| use visual bell instead of beeping
-|'warn'| warn for shell command when buffer was changed
-|'weirdinvert'| |'wi'| for terminals that have weird inversion method
-|'whichwrap'| |'ww'| allow specified keys to cross line boundaries
-|'wildchar'| |'wc'| command-line character for wildcard expansion
-|'wildcharm'| |'wcm'| like 'wildchar' but also works when mapped
-|'wildignore'| |'wig'| files matching these patterns are not completed
-|'wildmenu'| |'wmnu'| use menu for command line completion
-|'wildmode'| |'wim'| mode for 'wildchar' command-line expansion
-|'wildoptions'| |'wop'| specifies how command line completion is done.
-|'winaltkeys'| |'wak'| when the windows system handles ALT keys
-|'winheight'| |'wh'| minimum number of lines for the current window
-|'winfixheight'| |'wfh'| keep window height when opening/closing windows
-|'winminheight'| |'wmh'| minimum number of lines for any window
-|'winminwidth'| |'wmw'| minimal number of columns for any window
-|'winwidth'| |'wiw'| minimal number of columns for current window
-|'wrap'| long lines wrap and continue on the next line
-|'wrapmargin'| |'wm'| chars from the right where wrapping starts
-|'wrapscan'| |'ws'| searches wrap around the end of the file
-|'write'| writing to a file is allowed
-|'writeany'| |'wa'| write to file with no need for "!" override
-|'writebackup'| |'wb'| make a backup before overwriting a file
-|'writedelay'| |'wd'| delay this many msec for each char (for debug)
+'aleph' 'al' ASCII code of the letter Aleph (Hebrew)
+'allowrevins' 'ari' allow CTRL-_ in Insert and Command-line mode
+'altkeymap' 'akm' for default second language (Farsi/Hebrew)
+'ambiwidth' 'ambw' what to do with Unicode chars of ambiguous width
+'antialias' 'anti' Mac OS X: use smooth, antialiased fonts
+'autochdir' 'acd' change directory to the file in the current window
+'arabic' 'arab' for Arabic as a default second language
+'arabicshape' 'arshape' do shaping for Arabic characters
+'autoindent' 'ai' take indent for new line from previous line
+'autoread' 'ar' autom. read file when changed outside of Vim
+'autowrite' 'aw' automatically write file if changed
+'autowriteall' 'awa' as 'autowrite', but works with more commands
+'background' 'bg' "dark" or "light", used for highlight colors
+'backspace' 'bs' how backspace works at start of line
+'backup' 'bk' keep backup file after overwriting a file
+'backupcopy' 'bkc' make backup as a copy, don't rename the file
+'backupdir' 'bdir' list of directories for the backup file
+'backupext' 'bex' extension used for the backup file
+'backupskip' 'bsk' no backup for files that match these patterns
+'balloondelay' 'bdlay' delay in mS before a balloon may pop up
+'ballooneval' 'beval' switch on balloon evaluation
+'balloonexpr' 'bexpr' expression to show in balloon
+'binary' 'bin' read/write/edit file in binary mode
+'bioskey' 'biosk' MS-DOS: use bios calls for input characters
+'bomb' prepend a Byte Order Mark to the file
+'breakat' 'brk' characters that may cause a line break
+'browsedir' 'bsdir' which directory to start browsing in
+'bufhidden' 'bh' what to do when buffer is no longer in window
+'buflisted' 'bl' whether the buffer shows up in the buffer list
+'buftype' 'bt' special type of buffer
+'casemap' 'cmp' specifies how case of letters is changed
+'cdpath' 'cd' list of directories searched with ":cd"
+'cedit' key used to open the command-line window
+'charconvert' 'ccv' expression for character encoding conversion
+'cindent' 'cin' do C program indenting
+'cinkeys' 'cink' keys that trigger indent when 'cindent' is set
+'cinoptions' 'cino' how to do indenting when 'cindent' is set
+'cinwords' 'cinw' words where 'si' and 'cin' add an indent
+'clipboard' 'cb' use the clipboard as the unnamed register
+'cmdheight' 'ch' number of lines to use for the command-line
+'cmdwinheight' 'cwh' height of the command-line window
+'columns' 'co' number of columns in the display
+'comments' 'com' patterns that can start a comment line
+'commentstring' 'cms' template for comments; used for fold marker
+'compatible' 'cp' behave Vi-compatible as much as possible
+'complete' 'cpt' specify how Insert mode completion works
+'completefunc' 'cfu' function to be used for Insert mode completion
+'completeopt' 'cot' options for Insert mode completion
+'confirm' 'cf' ask what to do about unsaved/read-only files
+'conskey' 'consk' get keys directly from console (MS-DOS only)
+'copyindent' 'ci' make 'autoindent' use existing indent structure
+'cpoptions' 'cpo' flags for Vi-compatible behavior
+'cscopepathcomp' 'cspc' how many components of the path to show
+'cscopeprg' 'csprg' command to execute cscope
+'cscopequickfix' 'csqf' use quickfix window for cscope results
+'cscopetag' 'cst' use cscope for tag commands
+'cscopetagorder' 'csto' determines ":cstag" search order
+'cscopeverbose' 'csverb' give messages when adding a cscope database
+'debug' set to "msg" to see all error messages
+'define' 'def' pattern to be used to find a macro definition
+'delcombine' 'deco' delete combining characters on their own
+'dictionary' 'dict' list of file names used for keyword completion
+'diff' use diff mode for the current window
+'diffexpr' 'dex' expression used to obtain a diff file
+'diffopt' 'dip' options for using diff mode
+'digraph' 'dg' enable the entering of digraphs in Insert mode
+'directory' 'dir' list of directory names for the swap file
+'display' 'dy' list of flags for how to display text
+'eadirection' 'ead' in which direction 'equalalways' works
+'edcompatible' 'ed' toggle flags of ":substitute" command
+'encoding' 'enc' encoding used internally
+'endofline' 'eol' write <EOL> for last line in file
+'equalalways' 'ea' windows are automatically made the same size
+'equalprg' 'ep' external program to use for "=" command
+'errorbells' 'eb' ring the bell for error messages
+'errorfile' 'ef' name of the errorfile for the QuickFix mode
+'errorformat' 'efm' description of the lines in the error file
+'esckeys' 'ek' recognize function keys in Insert mode
+'eventignore' 'ei' autocommand events that are ignored
+'expandtab' 'et' use spaces when <Tab> is inserted
+'exrc' 'ex' read .vimrc and .exrc in the current directory
+'fileencoding' 'fenc' file encoding for multi-byte text
+'fileencodings' 'fencs' automatically detected character encodings
+'fileformat' 'ff' file format used for file I/O
+'fileformats' 'ffs' automatically detected values for 'fileformat'
+'filetype' 'ft' type of file, used for autocommands
+'fillchars' 'fcs' characters to use for displaying special items
+'fkmap' 'fk' Farsi keyboard mapping
+'foldclose' 'fcl' close a fold when the cursor leaves it
+'foldcolumn' 'fdc' width of the column used to indicate folds
+'foldenable' 'fen' set to display all folds open
+'foldexpr' 'fde' expression used when 'foldmethod' is "expr"
+'foldignore' 'fdi' ignore lines when 'foldmethod' is "indent"
+'foldlevel' 'fdl' close folds with a level higher than this
+'foldlevelstart' 'fdls' 'foldlevel' when starting to edit a file
+'foldmarker' 'fmr' markers used when 'foldmethod' is "marker"
+'foldmethod' 'fdm' folding type
+'foldminlines' 'fml' minimum number of lines for a fold to be closed
+'foldnestmax' 'fdn' maximum fold depth
+'foldopen' 'fdo' for which commands a fold will be opened
+'foldtext' 'fdt' expression used to display for a closed fold
+'formatlistpat' 'flp' pattern used to recognize a list header
+'formatoptions' 'fo' how automatic formatting is to be done
+'formatprg' 'fp' name of external program used with "gq" command
+'formatexpr' 'fex' expression used with "gq" command
+'fsync' 'fs' whether to invoke fsync() after file write
+'gdefault' 'gd' the ":substitute" flag 'g' is default on
+'grepformat' 'gfm' format of 'grepprg' output
+'grepprg' 'gp' program to use for ":grep"
+'guicursor' 'gcr' GUI: settings for cursor shape and blinking
+'guifont' 'gfn' GUI: Name(s) of font(s) to be used
+'guifontset' 'gfs' GUI: Names of multi-byte fonts to be used
+'guifontwide' 'gfw' list of font names for double-wide characters
+'guiheadroom' 'ghr' GUI: pixels room for window decorations
+'guioptions' 'go' GUI: Which components and options are used
+'guipty' GUI: try to use a pseudo-tty for ":!" commands
+'guitablabel' 'gtl' GUI: custom label for a tab page
+'helpfile' 'hf' full path name of the main help file
+'helpheight' 'hh' minimum height of a new help window
+'helplang' 'hlg' preferred help languages
+'hidden' 'hid' don't unload buffer when it is |abandon|ed
+'highlight' 'hl' sets highlighting mode for various occasions
+'hlsearch' 'hls' highlight matches with last search pattern
+'history' 'hi' number of command-lines that are remembered
+'hkmap' 'hk' Hebrew keyboard mapping
+'hkmapp' 'hkp' phonetic Hebrew keyboard mapping
+'icon' let Vim set the text of the window icon
+'iconstring' string to use for the Vim icon text
+'ignorecase' 'ic' ignore case in search patterns
+'imactivatekey' 'imak' key that activates the X input method
+'imcmdline' 'imc' use IM when starting to edit a command line
+'imdisable' 'imd' do not use the IM in any mode
+'iminsert' 'imi' use :lmap or IM in Insert mode
+'imsearch' 'ims' use :lmap or IM when typing a search pattern
+'include' 'inc' pattern to be used to find an include file
+'includeexpr' 'inex' expression used to process an include line
+'incsearch' 'is' highlight match while typing search pattern
+'indentexpr' 'inde' expression used to obtain the indent of a line
+'indentkeys' 'indk' keys that trigger indenting with 'indentexpr'
+'infercase' 'inf' adjust case of match for keyword completion
+'insertmode' 'im' start the edit of a file in Insert mode
+'isfname' 'isf' characters included in file names and pathnames
+'isident' 'isi' characters included in identifiers
+'iskeyword' 'isk' characters included in keywords
+'isprint' 'isp' printable characters
+'joinspaces' 'js' two spaces after a period with a join command
+'key' encryption key
+'keymap' 'kmp' name of a keyboard mapping
+'keymodel' 'km' enable starting/stopping selection with keys
+'keywordprg' 'kp' program to use for the "K" command
+'langmap' 'lmap' alphabetic characters for other language mode
+'langmenu' 'lm' language to be used for the menus
+'laststatus' 'ls' tells when last window has status lines
+'lazyredraw' 'lz' don't redraw while executing macros
+'linebreak' 'lbr' wrap long lines at a blank
+'lines' number of lines in the display
+'linespace' 'lsp' number of pixel lines to use between characters
+'lisp' automatic indenting for Lisp
+'lispwords' 'lw' words that change how lisp indenting works
+'list' show <Tab> and <EOL>
+'listchars' 'lcs' characters for displaying in list mode
+'loadplugins' 'lpl' load plugin scripts when starting up
+'magic' changes special characters in search patterns
+'makeef' 'mef' name of the errorfile for ":make"
+'makeprg' 'mp' program to use for the ":make" command
+'matchpairs' 'mps' pairs of characters that "%" can match
+'matchtime' 'mat' tenths of a second to show matching paren
+'maxfuncdepth' 'mfd' maximum recursive depth for user functions
+'maxmapdepth' 'mmd' maximum recursive depth for mapping
+'maxmem' 'mm' maximum memory (in Kbyte) used for one buffer
+'maxmempattern' 'mmp' maximum memory (in Kbyte) used for pattern search
+'maxmemtot' 'mmt' maximum memory (in Kbyte) used for all buffers
+'menuitems' 'mis' maximum number of items in a menu
+'mkspellmem' 'msm' memory used before |:mkspell| compresses the tree
+'modeline' 'ml' recognize modelines at start or end of file
+'modelines' 'mls' number of lines checked for modelines
+'modifiable' 'ma' changes to the text are not possible
+'modified' 'mod' buffer has been modified
+'more' pause listings when the whole screen is filled
+'mouse' enable the use of mouse clicks
+'mousefocus' 'mousef' keyboard focus follows the mouse
+'mousehide' 'mh' hide mouse pointer while typing
+'mousemodel' 'mousem' changes meaning of mouse buttons
+'mouseshape' 'mouses' shape of the mouse pointer in different modes
+'mousetime' 'mouset' max time between mouse double-click
+'mzquantum' 'mzq' the interval between polls for MzScheme threads
+'nrformats' 'nf' number formats recognized for CTRL-A command
+'number' 'nu' print the line number in front of each line
+'numberwidth' 'nuw' number of columns used for the line number
+'omnifunc' 'ofu' function for filetype-specific completion
+'operatorfunc' 'opfunc' funtion to be called for |g@| operator
+'osfiletype' 'oft' operating system-specific filetype information
+'paragraphs' 'para' nroff macros that separate paragraphs
+'paste' allow pasting text
+'pastetoggle' 'pt' key code that causes 'paste' to toggle
+'patchexpr' 'pex' expression used to patch a file
+'patchmode' 'pm' keep the oldest version of a file
+'path' 'pa' list of directories searched with "gf" et.al.
+'preserveindent' 'pi' preserve the indent structure when reindenting
+'previewheight' 'pvh' height of the preview window
+'previewwindow' 'pvw' identifies the preview window
+'printdevice' 'pdev' name of the printer to be used for :hardcopy
+'printencoding' 'penc' encoding to be used for printing
+'printexpr' 'pexpr' expression used to print PostScript for :hardcopy
+'printfont' 'pfn' name of the font to be used for :hardcopy
+'printheader' 'pheader' format of the header used for :hardcopy
+'printmbcharset' 'pmbcs' CJK character set to be used for :hardcopy
+'printmbfont' 'pmbfn' font names to be used for CJK output of :hardcopy
+'printoptions' 'popt' controls the format of :hardcopy output
+'quoteescape' 'qe' escape characters used in a string
+'readonly' 'ro' disallow writing the buffer
+'remap' allow mappings to work recursively
+'report' threshold for reporting nr. of lines changed
+'restorescreen' 'rs' Win32: restore screen when exiting
+'revins' 'ri' inserting characters will work backwards
+'rightleft' 'rl' window is right-to-left oriented
+'rightleftcmd' 'rlc' commands for which editing works right-to-left
+'ruler' 'ru' show cursor line and column in the status line
+'rulerformat' 'ruf' custom format for the ruler
+'runtimepath' 'rtp' list of directories used for runtime files
+'scroll' 'scr' lines to scroll with CTRL-U and CTRL-D
+'scrollbind' 'scb' scroll in window as other windows scroll
+'scrolljump' 'sj' minimum number of lines to scroll
+'scrolloff' 'so' minimum nr. of lines above and below cursor
+'scrollopt' 'sbo' how 'scrollbind' should behave
+'sections' 'sect' nroff macros that separate sections
+'secure' secure mode for reading .vimrc in current dir
+'selection' 'sel' what type of selection to use
+'selectmode' 'slm' when to use Select mode instead of Visual mode
+'sessionoptions' 'ssop' options for |:mksession|
+'shell' 'sh' name of shell to use for external commands
+'shellcmdflag' 'shcf' flag to shell to execute one command
+'shellpipe' 'sp' string to put output of ":make" in error file
+'shellquote' 'shq' quote character(s) for around shell command
+'shellredir' 'srr' string to put output of filter in a temp file
+'shellslash' 'ssl' use forward slash for shell file names
+'shelltemp' 'stmp' whether to use a temp file for shell commands
+'shelltype' 'st' Amiga: influences how to use a shell
+'shellxquote' 'sxq' like 'shellquote', but include redirection
+'shiftround' 'sr' round indent to multiple of shiftwidth
+'shiftwidth' 'sw' number of spaces to use for (auto)indent step
+'shortmess' 'shm' list of flags, reduce length of messages
+'shortname' 'sn' non-MS-DOS: Filenames assumed to be 8.3 chars
+'showbreak' 'sbr' string to use at the start of wrapped lines
+'showcmd' 'sc' show (partial) command in status line
+'showfulltag' 'sft' show full tag pattern when completing tag
+'showmatch' 'sm' briefly jump to matching bracket if insert one
+'showmode' 'smd' message on status line to show current mode
+'showtabline' 'stal' tells when the tab pages line is displayed
+'sidescroll' 'ss' minimum number of columns to scroll horizontal
+'sidescrolloff' 'siso' min. nr. of columns to left and right of cursor
+'smartcase' 'scs' no ignore case when pattern has uppercase
+'smartindent' 'si' smart autoindenting for C programs
+'smarttab' 'sta' use 'shiftwidth' when inserting <Tab>
+'softtabstop' 'sts' number of spaces that <Tab> uses while editing
+'spell' enable spell checking
+'spellcapcheck' 'spc' pattern to locate end of a sentence
+'spellfile' 'spf' files where |zg| and |zw| store words
+'spelllang' 'spl' language(s) to do spell checking for
+'spellsuggest' 'sps' method(s) used to suggest spelling corrections
+'splitbelow' 'sb' new window from split is below the current one
+'splitright' 'spr' new window is put right of the current one
+'startofline' 'sol' commands move cursor to first blank in line
+'statusline' 'stl' custom format for the status line
+'suffixes' 'su' suffixes that are ignored with multiple match
+'suffixesadd' 'sua' suffixes added when searching for a file
+'swapfile' 'swf' whether to use a swapfile for a buffer
+'swapsync' 'sws' how to sync the swap file
+'switchbuf' 'swb' sets behavior when switching to another buffer
+'synmaxcol' 'smc' maximum column to find syntax items
+'syntax' 'syn' syntax to be loaded for current buffer
+'tabstop' 'ts' number of spaces that <Tab> in file uses
+'tabline' 'tal' custom format for the console tab pages line
+'tabpagemax' 'tpm' maximum number of tab pages for |-p| and "tab all"
+'tagbsearch' 'tbs' use binary searching in tags files
+'taglength' 'tl' number of significant characters for a tag
+'tagrelative' 'tr' file names in tag file are relative
+'tags' 'tag' list of file names used by the tag command
+'tagstack' 'tgst' push tags onto the tag stack
+'term' name of the terminal
+'termbidi' 'tbidi' terminal takes care of bi-directionality
+'termencoding' 'tenc' character encoding used by the terminal
+'terse' shorten some messages
+'textauto' 'ta' obsolete, use 'fileformats'
+'textmode' 'tx' obsolete, use 'fileformat'
+'textwidth' 'tw' maximum width of text that is being inserted
+'thesaurus' 'tsr' list of thesaurus files for keyword completion
+'tildeop' 'top' tilde command "~" behaves like an operator
+'timeout' 'to' time out on mappings and key codes
+'timeoutlen' 'tm' time out time in milliseconds
+'title' let Vim set the title of the window
+'titlelen' percentage of 'columns' used for window title
+'titleold' old title, restored when exiting
+'titlestring' string to use for the Vim window title
+'toolbar' 'tb' GUI: which items to show in the toolbar
+'toolbariconsize' 'tbis' size of the toolbar icons (for GTK 2 only)
+'ttimeout' time out on mappings
+'ttimeoutlen' 'ttm' time out time for key codes in milliseconds
+'ttybuiltin' 'tbi' use built-in termcap before external termcap
+'ttyfast' 'tf' indicates a fast terminal connection
+'ttymouse' 'ttym' type of mouse codes generated
+'ttyscroll' 'tsl' maximum number of lines for a scroll
+'ttytype' 'tty' alias for 'term'
+'undolevels' 'ul' maximum number of changes that can be undone
+'updatecount' 'uc' after this many characters flush swap file
+'updatetime' 'ut' after this many milliseconds flush swap file
+'verbose' 'vbs' give informative messages
+'verbosefile' 'vfile' file to write messages in
+'viewdir' 'vdir' directory where to store files with :mkview
+'viewoptions' 'vop' specifies what to save for :mkview
+'viminfo' 'vi' use .viminfo file upon startup and exiting
+'virtualedit' 've' when to use virtual editing
+'visualbell' 'vb' use visual bell instead of beeping
+'warn' warn for shell command when buffer was changed
+'weirdinvert' 'wi' for terminals that have weird inversion method
+'whichwrap' 'ww' allow specified keys to cross line boundaries
+'wildchar' 'wc' command-line character for wildcard expansion
+'wildcharm' 'wcm' like 'wildchar' but also works when mapped
+'wildignore' 'wig' files matching these patterns are not completed
+'wildmenu' 'wmnu' use menu for command line completion
+'wildmode' 'wim' mode for 'wildchar' command-line expansion
+'wildoptions' 'wop' specifies how command line completion is done.
+'winaltkeys' 'wak' when the windows system handles ALT keys
+'winheight' 'wh' minimum number of lines for the current window
+'winfixheight' 'wfh' keep window height when opening/closing windows
+'winminheight' 'wmh' minimum number of lines for any window
+'winminwidth' 'wmw' minimal number of columns for any window
+'winwidth' 'wiw' minimal number of columns for current window
+'wrap' long lines wrap and continue on the next line
+'wrapmargin' 'wm' chars from the right where wrapping starts
+'wrapscan' 'ws' searches wrap around the end of the file
+'write' writing to a file is allowed
+'writeany' 'wa' write to file with no need for "!" override
+'writebackup' 'wb' make a backup before overwriting a file
+'writedelay' 'wd' delay this many msec for each char (for debug)
------------------------------------------------------------------------------
*Q_ur* Undo/Redo commands
diff --git a/runtime/doc/remote.txt b/runtime/doc/remote.txt
index a5253d9..b813715 100644
--- a/runtime/doc/remote.txt
+++ b/runtime/doc/remote.txt
@@ -1,4 +1,4 @@
-*remote.txt* For Vim version 7.0aa. Last change: 2005 Apr 01
+*remote.txt* For Vim version 7.0aa. Last change: 2006 Mar 06
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -53,8 +53,8 @@
*--remote-send*
--remote-send {keys} Send {keys} to server and exit.
*--remote-expr*
- --remote-expr {expr} Evaluate {expr} in server and
- print the result on stdout.
+ --remote-expr {expr} Evaluate {expr} in server and print the result
+ on stdout.
*--serverlist*
--serverlist Output a list of server names.
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index 68ecb0e..ef8d1ad 100644
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -1,4 +1,4 @@
-*spell.txt* For Vim version 7.0aa. Last change: 2006 Mar 04
+*spell.txt* For Vim version 7.0aa. Last change: 2006 Mar 05
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -841,6 +841,29 @@
anyway. For compatibility use an 8-bit encoding.
+INFORMATION
+
+These entries in the affix file can be used to add information to the spell
+file. There are no restrictions on the format, but they should be in the
+right encoding.
+
+ *spell-NAME* *spell-VERSION* *spell-HOME*
+ *spell-AUTHOR* *spell-EMAIL* *spell-COPYRIGHT*
+ NAME Name of the language
+ VERSION 1.0.1 with fixes
+ HOME http://www.myhome.eu
+ AUTHOR John Doe
+ EMAIL john AT Doe DOT net
+ COPYRIGHT LGPL
+
+These fields are put in the .spl file as-is. The |:spellinfo| command can be
+used to view the info.
+
+ *:spellinfo* *:spelli*
+:spelli[nfo] Display the information for the spell file(s) used for
+ the current buffer.
+
+
CHARACTER TABLES
*spell-affix-chars*
When using an 8-bit encoding the affix file should define what characters are
@@ -1157,12 +1180,12 @@
over which word comes first. Example:
COMPOUNDFLAG c ~
- *spell-COMPOUNDFLAGS*
+ *spell-COMPOUNDRULE*
A more advanced method to specify how compound words can be formed uses
multiple items with multiple flags. This is not compatible with Myspell 3.0.
Let's start with an example:
- COMPOUNDFLAGS c+ ~
- COMPOUNDFLAGS se ~
+ COMPOUNDRULE c+ ~
+ COMPOUNDRULE se ~
The first line defines that words with the "c" flag can be concatenated in any
order. The second line defines compound words that are made of one word with
@@ -1180,7 +1203,7 @@
soup
onionsoup
-The COMPOUNDFLAGS item may appear multiple times. The argument is made out of
+The COMPOUNDRULE item may appear multiple times. The argument is made out of
one or more groups, where each group can be:
one flag e.g., c
alternate flags inside [] e.g., [abc]
@@ -1190,20 +1213,20 @@
This is similar to the regexp pattern syntax (but not the same!). A few
examples with the sequence of word flags they require:
- COMPOUNDFLAGS x+ x xx xxx etc.
- COMPOUNDFLAGS yz yz
- COMPOUNDFLAGS x+z xz xxz xxxz etc.
- COMPOUNDFLAGS yx+ yx yxx yxxx etc.
+ COMPOUNDRULE x+ x xx xxx etc.
+ COMPOUNDRULE yz yz
+ COMPOUNDRULE x+z xz xxz xxxz etc.
+ COMPOUNDRULE yx+ yx yxx yxxx etc.
- COMPOUNDFLAGS [abc]z az bz cz
- COMPOUNDFLAGS [abc]+z az aaz abaz bz baz bcbz cz caz cbaz etc.
- COMPOUNDFLAGS a[xyz]+ ax axx axyz ay ayx ayzz az azy azxy etc.
- COMPOUNDFLAGS sm*e se sme smme smmme etc.
- COMPOUNDFLAGS s[xyz]*e se sxe sxye sxyxe sye syze sze szye szyxe etc.
+ COMPOUNDRULE [abc]z az bz cz
+ COMPOUNDRULE [abc]+z az aaz abaz bz baz bcbz cz caz cbaz etc.
+ COMPOUNDRULE a[xyz]+ ax axx axyz ay ayx ayzz az azy azxy etc.
+ COMPOUNDRULE sm*e se sme smme smmme etc.
+ COMPOUNDRULE s[xyz]*e se sxe sxye sxyxe sye syze sze szye szyxe etc.
A specific example: Allow a compound to be made of two words and a dash:
In the .aff file:
- COMPOUNDFLAGS sde ~
+ COMPOUNDRULE sde ~
NEEDAFFIX x ~
COMPOUNDMAX 3 ~
COMPOUNDMIN 1 ~
@@ -1237,7 +1260,7 @@
When omitted there is no maximum. It applies to all compound words.
To set a limit for words with specific flags make sure the items in
-COMPOUNDFLAGS where they appear don't allow too many words.
+COMPOUNDRULE where they appear don't allow too many words.
*spell-COMPOUNDSYLMAX*
The maximum number of syllables that a compound word may contain is specified
@@ -1458,14 +1481,20 @@
COMPLEXPREFIXES (Hunspell) *spell-COMPLEXPREFIXES*
Enables using two prefixes. Not supported.
+COMPOUND (Hunspell) *spell-COMPOUND*
+ This is one line with the count of COMPOUND items, followd by
+ that many COMPOUND lines with a pattern.
+ Remove the first line with the count and rename the other
+ items to COMPOUNDRULE |spell-COMPOUNDRULE|
+
COMPOUNDBEGIN (Hunspell) *spell-COMPOUNDBEGIN*
- Use COMPOUNDFLAGS instead. |spell-COMPOUNDFLAGS|
+ Use COMPOUNDRULE instead. |spell-COMPOUNDRULE|
COMPOUNDEND (Hunspell) *spell-COMPOUNDEND*
- Use COMPOUNDFLAGS instead. |spell-COMPOUNDFLAGS|
+ Use COMPOUNDRULE instead. |spell-COMPOUNDRULE|
COMPOUNDMIDDLE (Hunspell) *spell-COMPOUNDMIDDLE*
- Use COMPOUNDFLAGS instead. |spell-COMPOUNDFLAGS|
+ Use COMPOUNDRULE instead. |spell-COMPOUNDRULE|
COMPOUNDROOT (Hunspell) *spell-COMPOUNDROOT*
Flag for words in the dictionary that are already a compound.
@@ -1481,9 +1510,6 @@
FORBIDDENWORD (Hunspell) *spell-FORBIDDENWORD*
Use BAD instead. |spell-BAD|
-HOME (Hunspell) *spell-HOME*
- Specifies the website for the language. Not supported.
-
LANG (Hunspell) *spell-LANG*
This specifies language-specific behavior. This actually
moves part of the language knowledge into the program,
@@ -1496,9 +1522,6 @@
MAXNGRAMSUGS (Hunspell) *spell-MAXNGRAMSUGS*
Not supported.
-NAME (Hunspell) *spell-NAME*
- Specifies the name of the language. Not supported.
-
ONLYINCOMPOUND (Hunspell) *spell-ONLYINCOMPOUND*
Use NEEDCOMPOUND instead. |spell-NEEDCOMPOUND|
@@ -1515,9 +1538,6 @@
Vim does not use the TRY item, it is ignored. For making
suggestions the actual characters in the words are used.
-VERSION (Hunspell) *spell-VERSION*
- Specifies the version for the language. Not supported.
-
WORDCHARS (Hunspell) *spell-WORDCHARS*
Used to recognize words. Vim doesn't need it, because there
is no need to separate words before checking them (using a
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index b36837f..fbca425 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1,4 +1,4 @@
-*starting.txt* For Vim version 7.0aa. Last change: 2006 Mar 01
+*starting.txt* For Vim version 7.0aa. Last change: 2006 Mar 05
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1129,6 +1129,7 @@
(on Unix), s: (Amiga) or $VIM directory (MS-DOS). You could also use
autocommands |autocommand| and/or modelines |modeline|.
+ *vimrc-option-example*
If you only want to add a single option setting to your vimrc, you can use
these steps:
1. Edit your vimrc file with Vim.
@@ -1138,6 +1139,7 @@
'=' to enter the value. E.g., for the 'guifont' option: >
o:set guifont=<C-R>=&guifont<CR><Esc>
< [<C-R> is a CTRL-R, <CR> is a return, <Esc> is the escape key]
+ You need to escape special characters, esp. spaces.
Note that when you create a .vimrc file, this can influence the 'compatible'
option, which has several side effects. See |'compatible'|.
diff --git a/runtime/doc/tags b/runtime/doc/tags
index bc07faa..a2f8d7c 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -356,11 +356,13 @@
'mat' options.txt /*'mat'*
'matchpairs' options.txt /*'matchpairs'*
'matchtime' options.txt /*'matchtime'*
+'maxcombine' options.txt /*'maxcombine'*
'maxfuncdepth' options.txt /*'maxfuncdepth'*
'maxmapdepth' options.txt /*'maxmapdepth'*
'maxmem' options.txt /*'maxmem'*
'maxmempattern' options.txt /*'maxmempattern'*
'maxmemtot' options.txt /*'maxmemtot'*
+'mco' options.txt /*'mco'*
'mef' options.txt /*'mef'*
'menuitems' options.txt /*'menuitems'*
'mesg' vi_diff.txt /*'mesg'*
@@ -2547,8 +2549,12 @@
:spelld spell.txt /*:spelld*
:spelldump spell.txt /*:spelldump*
:spellgood spell.txt /*:spellgood*
+:spelli spell.txt /*:spelli*
+:spellinfo spell.txt /*:spellinfo*
:spellr spell.txt /*:spellr*
:spellrepall spell.txt /*:spellrepall*
+:spellu spell.txt /*:spellu*
+:spellundo spell.txt /*:spellundo*
:spellw spell.txt /*:spellw*
:spellwrong spell.txt /*:spellwrong*
:split windows.txt /*:split*
@@ -5188,6 +5194,7 @@
ft-papp-syntax syntax.txt /*ft-papp-syntax*
ft-pascal-syntax syntax.txt /*ft-pascal-syntax*
ft-perl-syntax syntax.txt /*ft-perl-syntax*
+ft-php-omni insert.txt /*ft-php-omni*
ft-php-syntax syntax.txt /*ft-php-syntax*
ft-php3-syntax syntax.txt /*ft-php3-syntax*
ft-phtml-syntax syntax.txt /*ft-phtml-syntax*
@@ -5932,6 +5939,8 @@
max() eval.txt /*max()*
mbyte-IME mbyte.txt /*mbyte-IME*
mbyte-XIM mbyte.txt /*mbyte-XIM*
+mbyte-combining mbyte.txt /*mbyte-combining*
+mbyte-composing mbyte.txt /*mbyte-composing*
mbyte-conversion mbyte.txt /*mbyte-conversion*
mbyte-encoding mbyte.txt /*mbyte-encoding*
mbyte-first mbyte.txt /*mbyte-first*
@@ -6189,6 +6198,7 @@
new-location-list version7.txt /*new-location-list*
new-manpage-trans version7.txt /*new-manpage-trans*
new-matchparen version7.txt /*new-matchparen*
+new-more-unicode version7.txt /*new-more-unicode*
new-multi-byte version5.txt /*new-multi-byte*
new-multi-lang version6.txt /*new-multi-lang*
new-netrw-explore version7.txt /*new-netrw-explore*
@@ -6291,6 +6301,7 @@
pattern-overview pattern.txt /*pattern-overview*
pattern-searches pattern.txt /*pattern-searches*
pattern.txt pattern.txt /*pattern.txt*
+patterns-composing pattern.txt /*patterns-composing*
pdev-option print.txt /*pdev-option*
penc-option print.txt /*penc-option*
perl if_perl.txt /*perl*
@@ -6583,6 +6594,7 @@
scrollstart-variable eval.txt /*scrollstart-variable*
sdl.vim syntax.txt /*sdl.vim*
search() eval.txt /*search()*
+search()-sub-match eval.txt /*search()-sub-match*
search-commands pattern.txt /*search-commands*
search-offset pattern.txt /*search-offset*
search-pattern pattern.txt /*search-pattern*
@@ -6656,6 +6668,7 @@
speed-up tips.txt /*speed-up*
spell spell.txt /*spell*
spell-ACCENT spell.txt /*spell-ACCENT*
+spell-AUTHOR spell.txt /*spell-AUTHOR*
spell-BAD spell.txt /*spell-BAD*
spell-CHECKCOMPOUNDCASE spell.txt /*spell-CHECKCOMPOUNDCASE*
spell-CHECKCOMPOUNDDUP spell.txt /*spell-CHECKCOMPOUNDDUP*
@@ -6665,19 +6678,22 @@
spell-CIRCUMFIX spell.txt /*spell-CIRCUMFIX*
spell-COMMON spell.txt /*spell-COMMON*
spell-COMPLEXPREFIXES spell.txt /*spell-COMPLEXPREFIXES*
+spell-COMPOUND spell.txt /*spell-COMPOUND*
spell-COMPOUNDBEGIN spell.txt /*spell-COMPOUNDBEGIN*
spell-COMPOUNDEND spell.txt /*spell-COMPOUNDEND*
spell-COMPOUNDFLAG spell.txt /*spell-COMPOUNDFLAG*
-spell-COMPOUNDFLAGS spell.txt /*spell-COMPOUNDFLAGS*
spell-COMPOUNDFORBIDFLAG spell.txt /*spell-COMPOUNDFORBIDFLAG*
spell-COMPOUNDMAX spell.txt /*spell-COMPOUNDMAX*
spell-COMPOUNDMIDDLE spell.txt /*spell-COMPOUNDMIDDLE*
spell-COMPOUNDMIN spell.txt /*spell-COMPOUNDMIN*
spell-COMPOUNDPERMITFLAG spell.txt /*spell-COMPOUNDPERMITFLAG*
spell-COMPOUNDROOT spell.txt /*spell-COMPOUNDROOT*
+spell-COMPOUNDRULE spell.txt /*spell-COMPOUNDRULE*
spell-COMPOUNDSYLLABLE spell.txt /*spell-COMPOUNDSYLLABLE*
spell-COMPOUNDSYLMAX spell.txt /*spell-COMPOUNDSYLMAX*
spell-COMPOUNDWORDMAX spell.txt /*spell-COMPOUNDWORDMAX*
+spell-COPYRIGHT spell.txt /*spell-COPYRIGHT*
+spell-EMAIL spell.txt /*spell-EMAIL*
spell-FLAG spell.txt /*spell-FLAG*
spell-FOL spell.txt /*spell-FOL*
spell-FORBIDDENWORD spell.txt /*spell-FORBIDDENWORD*
@@ -6741,6 +6757,7 @@
spell-yiddish spell.txt /*spell-yiddish*
spell.txt spell.txt /*spell.txt*
spellbadword() eval.txt /*spellbadword()*
+spellfile-cleanup spell.txt /*spellfile-cleanup*
spellfile.vim spell.txt /*spellfile.vim*
spellsuggest() eval.txt /*spellsuggest()*
split() eval.txt /*split()*
@@ -7415,6 +7432,7 @@
vimrc starting.txt /*vimrc*
vimrc-filetype usr_05.txt /*vimrc-filetype*
vimrc-intro usr_05.txt /*vimrc-intro*
+vimrc-option-example starting.txt /*vimrc-option-example*
vimrc_example.vim usr_05.txt /*vimrc_example.vim*
vimtutor usr_01.txt /*vimtutor*
virtcol() eval.txt /*virtcol()*
@@ -7636,6 +7654,10 @@
zr fold.txt /*zr*
zs scroll.txt /*zs*
zt scroll.txt /*zt*
+zuG spell.txt /*zuG*
+zuW spell.txt /*zuW*
+zug spell.txt /*zug*
+zuw spell.txt /*zuw*
zv fold.txt /*zv*
zw spell.txt /*zw*
zx fold.txt /*zx*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 6eac18d..cc0ec8f 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 7.0aa. Last change: 2006 Mar 04
+*todo.txt* For Vim version 7.0aa. Last change: 2006 Mar 06
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -30,69 +30,10 @@
*known-bugs*
-------------------- Known bugs and current work -----------------------
-Add options to optwin.vim:
-tabpagemax
-tabline
-showtabline
-guitablabel
-formatexpr
-
-Add options to quickref.txt:
-guitablabel
-showtabline
-tabline
-tabpagemax
-
-spelling:
-- Rename COMPOUNDFLAGS to COMPOUNDPATTERN or COMPOUNDRULE?
- Hunspell now uses COMPOUND with a count.
-- Check out Hunspell 1.1.3.
- Try to make the newly added features compatible.
- what does MAXNGRAMSUGS do?
- See announcement (Nemeth, 5 jan)
- is COMPLEXPREFIXES necessary now that we have flags for affixes?
-- Look into Hungarian dictionary:
- http://magyarispell.sourceforge.net/hu_HU-1.0.tar.gz
-- When compounding Hunspell doesn't allow affixes inside the compound word,
- only before and after it. COMPOUNDPERMITFLAG can be used to allow it.
- Check Myspell and Aspell if they also work this way.
- Thus a word + suffix needs a flag that it can't be used with a following
- compound, and word + prefix can't be after another word in a compound.
-- Implement COMPOUNDFORBIDFLAG .
-
-Mac unicode patch (Da Woon Jung):
-- Mac: Unicode input and display (Eckehard Berns, 2004 June 27)
- Other patch from Da Woon Jung, 2005 Jan 16.
-8 Add patch from Muraoka Taro (Mar 16) to support input method on Mac?
- New patch 2004 Jun 16
-- configuration option for platform: i386, ppc or both.
- Use __LITTLE_ENDIAN__ to test for current platform.
-- selecting proportional font breaks display
-- UTF-8 text causes display problems. Font replacement causes this.
-- Command-key mappings do not work. (Alan Schmitt)
-- Add default key mappings for the command key (Alan Schmitt)
- use http://macvim.org/OSX/files/gvimrc
-- With 'nopaste' pasting is wrong, with 'paste' Command-V doesn't work.
- (Alan Schmitt)
-
-8 Support four composing/combining characters, needed for Hebrew. (Ron Aaron)
- Add the 'maxcombining' option to set the nr. of composing characters.
- At the same time support 32 bit Unicode characters?
-8 "ga" should show all composing characters, also if there are more than 2.
-8 Searching for a composing character by itself should work. Perhaps "."
- with a composing char should work too.
-
-Win32: Use the free downloadable compiler 7.1 (2003). Figure out how to do
-debugging (with Agide?) and describe it. (George Reilly)
-Try out using the free MS compiler and debugger, using Make_mvc.mak.
-Also generate the .pdb file that can be used to generate a useful crash report
-on MS-Windows. (George Reilly)
-
-Win32: Check that installer puts menu items in "all users" dir when possible,
-not administrator dir.
-
-When "= evaluation results in a List, use it as a sequence of lines.
-As if join(list, "\n") was used.
+When expanding on the command line, recognize shell commands, such as ":!cmd".
+ Move from ExpandFromContext() to separate function.
+ Check for file being executable. EW_EXEC
+ Escape special characters ";&<>(){}". Also in file names. (Adri Verhoef)
Autoload:
- Add a Vim script in $VIMRUNTIME/tools that takes a file with a list of
@@ -105,12 +46,23 @@
helpfile doc/myscript.txt
For the "helpfile" item ":helptags" is run.
-When expanding on the command line, recognize shell commands, such as ":!cmd".
-Complete command names by searching in $PATH. When completing file names
-escape special characters ";&<>(){}". (Adri Verhoef)
+Win32: Describe how to do debugging and describe it. (George Reilly)
Are there more commands where v:swapcommand can be set to something useful?
+Mac unicode patch (Da Woon Jung):
+- Mac: Unicode input and display (Eckehard Berns, 2004 June 27)
+ Other patch from Da Woon Jung, 2005 Jan 16.
+8 Add patch from Muraoka Taro (Mar 16) to support input method on Mac?
+ New patch 2004 Jun 16
+- selecting proportional font breaks display
+- UTF-8 text causes display problems. Font replacement causes this.
+- Command-key mappings do not work. (Alan Schmitt)
+- Add default key mappings for the command key (Alan Schmitt)
+ use http://macvim.org/OSX/files/gvimrc
+- With 'nopaste' pasting is wrong, with 'paste' Command-V doesn't work.
+ (Alan Schmitt)
+
CONSIDERED FOR VERSION 7.0:
@@ -1301,6 +1253,21 @@
Spell checking:
+- Implement COMPOUNDFORBIDFLAG .
+- Check out Hunspell 1.1.4.
+ The manpage doesn't match the source code...
+ Try to make the newly added features compatible.
+ what does MAXNGRAMSUGS do?
+ is COMPLEXPREFIXES necessary when we have flags for affixes?
+- Look into Hungarian dictionary: hu_HU-1.0.tar.gz
+ This one doesn't match with Hunspell 1.1.4.
+- Add CHECKCOMPOUNDCASE: when compounding make leading capital lower case.
+ How is it supposed to work?
+- When compounding Hunspell doesn't allow affixes inside the compound word,
+ only before and after it. COMPOUNDPERMITFLAG can be used to allow it.
+ Check Myspell and Aspell if they also work this way.
+ Thus a word + suffix needs a flag that it can't be used with a following
+ compound, and word + prefix can't be after another word in a compound.
- suggestion for "KG" to "kg" when it's keepcase.
- Support flags on a suffix. Used for second level affixes, rare and
nocomp. The flags may also be used for compounding. Default is an OR
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 05908d0..c16587f 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt* For Vim version 7.0aa. Last change: 2006 Feb 20
+*various.txt* For Vim version 7.0aa. Last change: 2006 Mar 05
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -55,14 +55,16 @@
The <Nul> character in a file is stored internally as
<NL>, but it will be shown as:
<^@> 0, Hex 00, Octal 000 ~
+ If the character has composing characters these are
+ also shown. The value of 'maxcombine' doesn't matter.
Mnemonic: Get Ascii value. {not in Vi}
*g8*
g8 Print the hex values of the bytes used in the
character under the cursor, assuming it is in |UTF-8|
- encoding. This also shows composing characters.
- Example of a character with three composing
- characters:
+ encoding. This also shows composing characters. The
+ value of 'maxcombine' doesn't matter.
+ Example of a character with two composing characters:
e0 b8 81 + e0 b8 b9 + e0 b9 89 ~
{not in Vi}
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 575c0f7..63180e4 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt* For Vim version 7.0aa. Last change: 2006 Mar 04
+*version7.txt* For Vim version 7.0aa. Last change: 2006 Mar 06
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -23,6 +23,7 @@
Omni completion |new-omni-completion|
MzScheme interface |new-MzScheme|
Printing multi-byte text |new-print-multi-byte|
+Extended Unicode support |new-more-unicode|
Highlighting matching parens |new-matchparen|
Translated manual pages |new-manpage-trans|
Internal grep |new-vimgrep|
@@ -234,6 +235,23 @@
Also see |postscript-cjk-printing|. (Mike Williams)
+Extended Unicode support *new-more-unicode*
+------------------------
+
+Previously only two combining characters were displayed. The limit is now
+raised to 6. This can be set with the 'maxcombine' option. The default is
+still 2.
+
+|ga| now shows all combining characters, not just the first two.
+
+Previously only 16 bit Unicode characters were supported for displaying. Now
+the full 32 bit character set can be used. Unless manually disabled at
+compile time.
+
+For pattern matching it is now possible to search for individual composing
+characters. |patterns-composing|
+
+
Highlighting matching parens *new-matchparen*
----------------------------
@@ -1090,13 +1108,6 @@
probably didn't work. If you want to work on this: get the Vim 6.x version
and merge it back in.
-Mac: "make" now creates the Vim.app directory and "make install" copies it to
-its final destination. (Raf)
-
-Mac: Made it possible to compile with Motif, Athena or GTK without tricks and
-still being able to use the MacRoman conversion. Added the os_mac_conv.c
-file.
-
When running the tests and one of them fails to produce "test.out" the
following tests are still executed. This helps when running out of memory.
@@ -1114,13 +1125,34 @@
Moved unix_expandpath() to misc1.c, so that it can also be used by os_mac.c
without copying the code.
-Mac: When running "make install" the runtime files are installed as for Unix.
+--- Mac ---
+
+"make" now creates the Vim.app directory and "make install" copies it to its
+final destination. (Raf)
+
+Made it possible to compile with Motif, Athena or GTK without tricks and still
+being able to use the MacRoman conversion. Added the os_mac_conv.c file.
+
+When running "make install" the runtime files are installed as for Unix.
Avoids that too many files are copied. When running "make" a link to the
runtime files is created to avoid a recursive copy that takes much time.
-Mac: Configure will attempt to build Vim for both Intel and PowerPC. The
+Configure will attempt to build Vim for both Intel and PowerPC. The
--with-mac-arch configure argument can change it.
+--- Win32 ---
+
+The Make_mvc.mak file was adjusted to work with the latest MS compilers,
+including the free version of Visual Studio 2005. (George Reilly)
+
+INSTALLpc.txt was updated for the recent changes. (George Reilly)
+
+The distributed executable is now produced with the free Visual C++ Toolkit
+2003 and other free SDK chunks. msvcsetup.bat was added to support this.
+
+Also generate the .pdb file that can be used to generate a useful crash report
+on MS-Windows. (George Reilly)
+
==============================================================================
BUG FIXES *bug-fixes-7*
@@ -1818,4 +1850,16 @@
deleted and a message displayed, delayed the effect of inserting the key.
Now overwrite the message without delay.
+When 'whichwrap' includes "l" then "dl" and "yl" on a single letter line
+worked differently. Now recognize all operators when using "l" at the end of
+a line.
+
+GTK GUI: when the font selector returned a font name with a comma in it then
+it would be handled like two font names. Now put a backslash before the
+comma.
+
+MS-DOS, Win32: When 'encoding' defaults to "latin1" then the value for
+'iskeyword' was still for CPxxx. And when 'nocompatible' was set 'isprint'
+would also be the wrong value.
+
vim:tw=78:ts=8:ft=help:norl: