Hi Bram,
2017/2/28 Tue 4:34:17 UTC+9 Bram Moolenaar wrote:
> Ken Takata wrote:
>
> > I attached another patch for the document.
> >
> > * Two functions were missing from usr_41.txt.
> > * A typo in version8.txt.
>
> Thanks. We can also make the difference between funcref() and
> function() a bit more clear:
>
> funcref() get a Funcref for a function reference
> function() get a Funcref for a function name
The following hunk was not included in the latest runtime update.
Is this intended or just a mistake?
--- a/runtime/doc/version8.txt
+++ b/runtime/doc/version8.txt
@@ -426,7 +426,7 @@ When no vimrc file is found, the |defaul
useful default values for new users. That includes setting 'nocompatible'.
Thus Vim no longer starts up in Vi compatible mode. If you do want that,
either create a .vimrc file that does "set compatible" or start Vim with
-"Vim -C".
+"vim -C".
Support removed ~
BTW, I wrote another patch. This is a supplemental patch for #1161.
There were some typos, and also notes for the 'compatible' option were
missing from many options.
Regards,
Ken Takata
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
# HG changeset patch
# Parent 3251bacb36886ba1f84ab6f5e38ab17504c25a20
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -276,7 +276,7 @@ 2. Editing a file *edit-a-file*
*:vie* *:view*
:vie[w][!] [++opt] [+cmd] file
- When used in Ex mode: Leave |Ex mode|, go back to
+ When used in Ex mode: Leave |Ex-mode|, go back to
Normal mode. Otherwise same as |:edit|, but set
'readonly' option for this buffer. {not in Vi}
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -734,6 +734,7 @@ A jump table for the options with a shor
which can be easier to read at certain sizes on certain displays.
Setting this option can sometimes cause problems if 'guifont' is set
to its default (empty string).
+ NOTE: This option is reset when 'compatible' is set.
*'autochdir'* *'acd'* *'noautochdir'* *'noacd'*
'autochdir' 'acd' boolean (default off)
@@ -767,6 +768,7 @@ A jump table for the options with a shor
- Disable the use of 'keymap' (without changing its value).
Note that 'arabicshape' and 'delcombine' are not reset (it is a global
option).
+ NOTE: This option is reset when 'compatible' is set.
Also see |arabic.txt|.
*'arabicshape'* *'arshape'*
@@ -788,6 +790,7 @@ A jump table for the options with a shor
form.
Arabic is a complex language which requires other settings, for
further details see |arabic.txt|.
+ NOTE: This option is set when 'compatible' is set.
*'autoindent'* *'ai'* *'noautoindent'* *'noai'*
'autoindent' 'ai' boolean (default off)
@@ -1000,6 +1003,9 @@ A jump table for the options with a shor
the system may refuse to do this. In that case the "auto" value will
again not rename the file.
+ NOTE: This option is set to the Vi default value when 'compatible' is
+ set and to the Vim default value when 'compatible' is reset.
+
*'backupdir'* *'bdir'*
'backupdir' 'bdir' string (default for Amiga: ".,t:",
for MS-DOS and Win32: ".,$TEMP,c:/tmp,c:/temp"
@@ -1146,6 +1152,7 @@ A jump table for the options with a shor
< 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.
+ NOTE: This option is set to "" when 'compatible' is set.
*'belloff'* *'bo'*
'belloff' 'bo' string (default "")
@@ -1266,6 +1273,7 @@ A jump table for the options with a shor
Every wrapped line will continue visually indented (same amount of
space as the beginning of that line), thus preserving horizontal blocks
of text.
+ NOTE: This option is reset when 'compatible' is set.
*'breakindentopt'* *'briopt'*
'breakindentopt' 'briopt' string (default empty)
@@ -1442,6 +1450,8 @@ A jump table for the options with a shor
:exe "set cedit=\<Esc>"
< |Nvi| also has this option, but it only uses the first character.
See |cmdwin|.
+ NOTE: This option is set to the Vim default value when 'compatible'
+ is reset.
*'charconvert'* *'ccv'* *E202* *E214* *E513*
'charconvert' 'ccv' string (default "")
@@ -1750,7 +1760,7 @@ A jump table for the options with a shor
set to its Vim default when 'compatible' is unset.
The {effect} column summarises the change when 'compatible' is set.
- option ? set value effect
+ option ? set value effect ~
'allowrevins' + off no CTRL-_ command
'antialias' + off don't use antialiased fonts
@@ -1770,7 +1780,7 @@ A jump table for the options with a shor
'cscopepathcomp'+ 0 don't show directories in tags list
'cscoperelative'+ off
'cscopetag' + off don't use cscope for ":tag"
- 'cscopetagorder' 0 see |cscopetagorder|
+ 'cscopetagorder'+ 0 see |cscopetagorder|
'cscopeverbose' + off see |cscopeverbose|
'delcombine' + off unicode: delete whole char combination
'digraph' + off no digraphs
@@ -2000,7 +2010,7 @@ A jump table for the options with a shor
existing line. 'expandtab' has no effect on these characters, a Tab
remains a Tab. If the new indent is greater than on the existing
line, the remaining space is filled in the normal manner.
- NOTE: 'copyindent' is reset when 'compatible' is set.
+ NOTE: This option is reset when 'compatible' is set.
Also see 'preserveindent'.
*'cpoptions'* *'cpo'* *cpo*
@@ -2361,6 +2371,7 @@ A jump table for the options with a shor
{not in Vi}
Determines how many components of the path to show in a list of tags.
See |cscopepathcomp|.
+ NOTE: This option is set to 0 when 'compatible' is set.
*'cscopeprg'* *'csprg'*
'cscopeprg' 'csprg' string (default "cscope")
@@ -2390,6 +2401,7 @@ A jump table for the options with a shor
In the absence of a prefix (-P) for cscope. setting this option enables
to use the basename of cscope.out path as the prefix.
See |cscoperelative|.
+ NOTE: This option is reset when 'compatible' is set.
*'cscopetag'* *'cst'* *'nocscopetag'* *'nocst'*
'cscopetag' 'cst' boolean (default off)
@@ -2509,6 +2521,7 @@ A jump table for the options with a shor
This is useful for Arabic, Hebrew and many other languages where one
may have combining characters overtop of base characters, and want
to remove only the combining ones.
+ NOTE: This option is reset when 'compatible' is set.
*'dictionary'* *'dict'*
'dictionary' 'dict' string (default "")
@@ -3429,6 +3442,7 @@ A jump table for the options with a shor
The expression will be evaluated in the |sandbox| when set from a
modeline, see |sandbox-option|. That stops the option from working,
since changing the buffer text is not allowed.
+ NOTE: This option is set to "" when 'compatible' is set.
*'formatoptions'* *'fo'*
'formatoptions' 'fo' string (Vim default: "tcq", Vi default: "vt")
@@ -4089,31 +4103,6 @@ A jump table for the options with a shor
define one. The default uses a different group for each occasion.
See |highlight-default| for the default highlight groups.
- *'hlsearch'* *'hls'* *'nohlsearch'* *'nohls'*
-'hlsearch' 'hls' boolean (default off)
- global
- {not in Vi}
- {not available when compiled without the
- |+extra_search| feature}
- When there is a previous search pattern, highlight all its matches.
- The type of highlighting used can be set with the 'l' occasion in the
- 'highlight' option. This uses the "Search" highlight group by
- default. Note that only the matching text is highlighted, any offsets
- are not applied.
- See also: 'incsearch' and |:match|.
- When you get bored looking at the highlighted matches, you can turn it
- off with |:nohlsearch|. This does not change the option value, as
- soon as you use a search command, the highlighting comes back.
- 'redrawtime' specifies the maximum time spent on finding matches.
- When the search pattern can match an end-of-line, Vim will try to
- highlight all of the matched text. However, this depends on where the
- search starts. This will be the first line in the window or the first
- line below a closed fold. A match in a previous line which is not
- drawn may not continue in a newly drawn line.
- You can specify whether the highlight status is restored on startup
- with the 'h' flag in 'viminfo' |viminfo-h|.
- NOTE: This option is reset when 'compatible' is set.
-
*'history'* *'hi'*
'history' 'hi' number (Vim default: 50, Vi default: 0,
set to 200 in |defaults.vim|)
@@ -4148,6 +4137,31 @@ A jump table for the options with a shor
See |rileft.txt|.
NOTE: This option is reset when 'compatible' is set.
+ *'hlsearch'* *'hls'* *'nohlsearch'* *'nohls'*
+'hlsearch' 'hls' boolean (default off)
+ global
+ {not in Vi}
+ {not available when compiled without the
+ |+extra_search| feature}
+ When there is a previous search pattern, highlight all its matches.
+ The type of highlighting used can be set with the 'l' occasion in the
+ 'highlight' option. This uses the "Search" highlight group by
+ default. Note that only the matching text is highlighted, any offsets
+ are not applied.
+ See also: 'incsearch' and |:match|.
+ When you get bored looking at the highlighted matches, you can turn it
+ off with |:nohlsearch|. This does not change the option value, as
+ soon as you use a search command, the highlighting comes back.
+ 'redrawtime' specifies the maximum time spent on finding matches.
+ When the search pattern can match an end-of-line, Vim will try to
+ highlight all of the matched text. However, this depends on where the
+ search starts. This will be the first line in the window or the first
+ line below a closed fold. A match in a previous line which is not
+ drawn may not continue in a newly drawn line.
+ You can specify whether the highlight status is restored on startup
+ with the 'h' flag in 'viminfo' |viminfo-h|.
+ NOTE: This option is reset when 'compatible' is set.
+
*'icon'* *'noicon'*
'icon' boolean (default off, on when title can be restored)
global
@@ -4441,7 +4455,7 @@ A jump table for the options with a shor
< Error messages will be suppressed, unless the 'debug' option contains
"msg".
See |indent-expression|.
- NOTE: This option is made empty when 'compatible' is set.
+ NOTE: This option is set to "" when 'compatible' is set.
The expression will be evaluated in the |sandbox| when set from a
modeline, see |sandbox-option|.
@@ -5446,6 +5460,8 @@ A jump table for the options with a shor
feature}
The number of milliseconds between polls for MzScheme threads.
Negative or zero value means no thread scheduling.
+ NOTE: This option is set to the Vim default value when 'compatible'
+ is reset.
*'nrformats'* *'nf'*
'nrformats' 'nf' string (default "bin,octal,hex",
@@ -5511,7 +5527,8 @@ A jump table for the options with a shor
is set. Thus with the Vim default of 4 there is room for a line number
up to 999. When the buffer has 1000 lines five columns will be used.
The minimum value is 1, the maximum value is 10.
- NOTE: 'numberwidth' is reset to 8 when 'compatible' is set.
+ NOTE: This option is set to the Vi default value when 'compatible' is
+ set and to the Vim default value when 'compatible' is reset.
*'omnifunc'* *'ofu'*
'omnifunc' 'ofu' string (default: empty)
@@ -5751,7 +5768,7 @@ A jump table for the options with a shor
a Tab.
NOTE: When using ">>" multiple times the resulting indent is a mix of
tabs and spaces. You might not like this.
- NOTE: 'preserveindent' is reset when 'compatible' is set.
+ NOTE: This option is reset when 'compatible' is set.
Also see 'copyindent'.
Use |:retab| to clean up white space.
@@ -6627,6 +6644,8 @@ A jump table for the options with a shor
'shelltemp' is off.
The `system()` function does not respect this option and always uses
temp files.
+ NOTE: This option is set to the Vim default value when 'compatible'
+ is reset.
*'shelltype'* *'st'*
'shelltype' 'st' number (default 0)
@@ -6943,7 +6962,7 @@ A jump table for the options with a shor
mapping: ":inoremap # X^H#", where ^H is entered with CTRL-V CTRL-H.
When using the ">>" command, lines starting with '#' are not shifted
right.
- NOTE: 'smartindent' is reset when 'compatible' is set.
+ NOTE: This option is reset when 'compatible' is set.
This option is reset when 'paste' is set and restored when 'paste' is
reset.
@@ -7598,6 +7617,8 @@ A jump table for the options with a shor
ignore Ignore case
match Match case
smart Ignore case unless an upper case letter is used
+ NOTE: This option is set to the Vi default value when 'compatible' is
+ set and to the Vim default value when 'compatible' is reset.
*'taglength'* *'tl'*
'taglength' 'tl' number (default 0)
@@ -7744,6 +7765,7 @@ A jump table for the options with a shor
compatible terminal.
If setting this option does not work (produces a colorless UI)
reading |xterm-true-color| might help.
+ NOTE: This option is reset when 'compatible' is set.
*'terse'* *'noterse'*
'terse' boolean (default off)
@@ -8154,6 +8176,7 @@ A jump table for the options with a shor
The undo file is not read when 'undoreload' causes the buffer from
before a reload to be saved for undo.
When 'undofile' is turned off the undo file is NOT deleted.
+ NOTE: This option is reset when 'compatible' is set.
*'undolevels'* *'ul'*
'undolevels' 'ul' number (default 100, 1000 for Unix, VMS,
@@ -8409,6 +8432,8 @@ A jump table for the options with a shor
This option cannot be set from a |modeline| or in the |sandbox|, for
security reasons.
+ NOTE: This option is set to the Vim default value when 'compatible'
+ is reset.
*'virtualedit'* *'ve'*
'virtualedit' 've' string (default "")
@@ -8437,6 +8462,7 @@ A jump table for the options with a shor
The `g$` command will move to the end of the screen line.
It doesn't make sense to combine "all" with "onemore", but you will
not get a warning for it.
+ NOTE: This option is set to "" when 'compatible' is set.
*'visualbell'* *'vb'* *'novisualbell'* *'novb'* *beep*
'visualbell' 'vb' boolean (default off)
