diff options
| -rw-r--r-- | nsis/lang/simpchinese.nsi | 36 | ||||
| -rw-r--r-- | runtime/defaults.vim | 2 | ||||
| -rw-r--r-- | runtime/doc/change.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/eval.txt | 139 | ||||
| -rw-r--r-- | runtime/doc/if_perl.txt | 10 | ||||
| -rw-r--r-- | runtime/doc/if_ruby.txt | 10 | ||||
| -rw-r--r-- | runtime/doc/indent.txt | 6 | ||||
| -rw-r--r-- | runtime/doc/message.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 9 | ||||
| -rw-r--r-- | runtime/doc/pi_netrw.txt | 8 | ||||
| -rw-r--r-- | runtime/doc/popup.txt | 12 | ||||
| -rw-r--r-- | runtime/doc/syntax.txt | 6 | ||||
| -rw-r--r-- | runtime/doc/tags | 5 | ||||
| -rw-r--r-- | runtime/doc/terminal.txt | 8 | ||||
| -rw-r--r-- | runtime/doc/todo.txt | 96 | ||||
| -rw-r--r-- | runtime/doc/vi_diff.txt | 5 | ||||
| -rw-r--r-- | runtime/filetype.vim | 2 | ||||
| -rw-r--r-- | runtime/indent/testdir/yaml.in | 14 | ||||
| -rw-r--r-- | runtime/indent/testdir/yaml.ok | 14 | ||||
| -rw-r--r-- | runtime/indent/yaml.vim | 4 | ||||
| -rw-r--r-- | runtime/syntax/named.vim | 4 |
21 files changed, 229 insertions, 165 deletions
diff --git a/nsis/lang/simpchinese.nsi b/nsis/lang/simpchinese.nsi index 389adc503e..a6875a79cc 100644 --- a/nsis/lang/simpchinese.nsi +++ b/nsis/lang/simpchinese.nsi @@ -5,7 +5,7 @@ # # Locale ID : 2052 # fileencoding : UTF-8 -# Author : Guopeng Wen +# Author : Guopeng Wen, David Liu !insertmacro MUI_LANGUAGE "SimpChinese" @@ -112,7 +112,7 @@ LangString str_desc_plugin ${LANG_SIMPCHINESE} \ LangString str_section_plugin_home ${LANG_SIMPCHINESE} \ "私有插件目录" LangString str_desc_plugin_home ${LANG_SIMPCHINESE} \ - "Create plugin directories in HOME directory." + "在主目录创建私有插件目录。" LangString str_section_plugin_vim ${LANG_SIMPCHINESE} \ "公共插件目录" @@ -141,14 +141,14 @@ LangString str_desc_rm_exe ${LANG_SIMPCHINESE} \ "删除 Vim 的所有执行文件及脚本。" LangString str_ungroup_plugin ${LANG_SIMPCHINESE} \ - "Remove plugin directories" + "移除插件目录" LangString str_desc_rm_plugin ${LANG_SIMPCHINESE} \ - "Remove the plugin directories if they are empty." + "移除插件目录（如果目录为空）。" LangString str_unsection_plugin_home ${LANG_SIMPCHINESE} \ "私有插件目录" LangString str_desc_rm_plugin_home ${LANG_SIMPCHINESE} \ - "Remove the plugin directories from HOME directory." + "从主目录中移除私有插件目录。" LangString str_unsection_plugin_vim ${LANG_SIMPCHINESE} \ "公共插件目录" @@ -241,37 +241,37 @@ LangString str_msg_unregistering ${LANG_SIMPCHINESE} \ LangString str_vimrc_page_title ${LANG_SIMPCHINESE} \ "设置 _vimrc" LangString str_vimrc_page_subtitle ${LANG_SIMPCHINESE} \ - "选择键盘、鼠标和增强选项。" + "选择键盘、鼠标和扩展设置。" LangString str_msg_compat_title ${LANG_SIMPCHINESE} \ "Vi / Vim 行为" LangString str_msg_compat_desc ${LANG_SIMPCHINESE} \ - "&Compatibility and enhancements" + "兼容性与扩展(&B)" LangString str_msg_compat_vi ${LANG_SIMPCHINESE} \ - "Vi compatible" + "原始 Vi" LangString str_msg_compat_vim ${LANG_SIMPCHINESE} \ - "Vim original" + "原始 Vim" LangString str_msg_compat_defaults ${LANG_SIMPCHINESE} \ - "Vim with some enhancements (load defaults.vim)" + "Vim 原始版本和部分扩展 (加载 defaults.vim)" LangString str_msg_compat_all ${LANG_SIMPCHINESE} \ - "Vim with all enhancements (load vimrc_example.vim) (Default)" + "Vim 原始版本和所有扩展 (加载 vimrc_example.vim) (缺省)" LangString str_msg_keymap_title ${LANG_SIMPCHINESE} \ "键盘映射" LangString str_msg_keymap_desc ${LANG_SIMPCHINESE} \ - "&Remap a few keys for Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)" + "为 Windows 映射按键(&R) (例如:Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F 等)" LangString str_msg_keymap_default ${LANG_SIMPCHINESE} \ - "Do not remap keys (Default)" + "不映射按键 (缺省)" LangString str_msg_keymap_windows ${LANG_SIMPCHINESE} \ - "Remap a few keys" + "映射一些按键" LangString str_msg_mouse_title ${LANG_SIMPCHINESE} \ "鼠标" LangString str_msg_mouse_desc ${LANG_SIMPCHINESE} \ - "&Behavior of right and left buttons" + "左键和右键行为(&B)" LangString str_msg_mouse_default ${LANG_SIMPCHINESE} \ - "Right: popup menu, Left: visual mode (Default)" + "右键：弹出菜单, 左键：可视化模式 (缺省)" LangString str_msg_mouse_windows ${LANG_SIMPCHINESE} \ - "Right: popup menu, Left: select mode (Windows)" + "右键：弹出菜单, 左键:选择模式 (Windows)" LangString str_msg_mouse_unix ${LANG_SIMPCHINESE} \ - "Right: extends selection, Left: visual mode (Unix)" + "右键： 扩展选择, 左键：可视化模式 (Unix)" diff --git a/runtime/defaults.vim b/runtime/defaults.vim index e8a0ff40fc..255b67b470 100644 --- a/runtime/defaults.vim +++ b/runtime/defaults.vim @@ -1,7 +1,7 @@ " The default vimrc file. " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last change: 2019 Feb 18 +" Last change: 2019 Sep 28 " " This is loaded if no vimrc file was found. " Except when Vim is run with "-u NONE" or "-C". diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index 542d97217a..9b8155ca91 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1,4 +1,4 @@ -*change.txt* For Vim version 8.1. Last change: 2019 Sep 27 +*change.txt* For Vim version 8.1. Last change: 2019 Sep 28 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 927651ce02..09310e627e 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 8.1. Last change: 2019 Sep 27 +*eval.txt* For Vim version 8.1. Last change: 2019 Oct 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2880,7 +2880,7 @@ win_id2tabwin({expr}) List get tab and window nr from window ID win_id2win({expr}) Number get window nr from window ID win_screenpos({nr}) List get screen position of window {nr} win_splitmove({nr}, {target} [, {options}]) - none move window {nr} to split of {target} + Number move window {nr} to split of {target} winbufnr({nr}) Number buffer number of window {nr} wincol() Number window column of the cursor winheight({nr}) Number height of window {nr} @@ -2974,6 +2974,9 @@ append({lnum}, {text}) *append()* appendbufline({expr}, {lnum}, {text}) *appendbufline()* Like |append()| but append the text in buffer {expr}. + This function works only for loaded buffers. First call + |bufload()| if needed. + For the use of {expr}, see |bufname()|. {lnum} is used like with |append()|. Note that using |line()| @@ -3540,8 +3543,8 @@ complete({startcol}, {matches}) *complete()* *E785* < This isn't very useful, but it shows how it works. Note that an empty string is returned to avoid a zero being inserted. - Can also be used as a |method|, the second argument is passed - in: > + Can also be used as a |method|, the base is passed as the + second argument: > GetMatches()->complete(col('.')) complete_add({expr}) *complete_add()* @@ -3676,7 +3679,7 @@ confirm({msg} [, {choices} [, {default} [, {type}]]]) Can also be used as a |method|in: > BuildMessage()->confirm("&Yes\n&No") - +< *copy()* copy({expr}) Make a copy of {expr}. For Numbers and Strings this isn't different from using {expr} directly. @@ -3871,6 +3874,9 @@ deletebufline({expr}, {first} [, {last}]) *deletebufline()* If {last} is omitted then delete line {first} only. On success 0 is returned, on failure 1 is returned. + This function works only for loaded buffers. First call + |bufload()| if needed. + For the use of {expr}, see |bufname()| above. {first} and {last} are used like with |getline()|. Note that @@ -3879,7 +3885,7 @@ deletebufline({expr}, {first} [, {last}]) *deletebufline()* Can also be used as a |method|: > GetBuffer()->deletebufline(1) - +< *did_filetype()* did_filetype() Returns |TRUE| when autocommands are being executed and the FileType event has been triggered at least once. Can be used @@ -4040,7 +4046,7 @@ exepath({expr}) *exepath()* Can also be used as a |method|: > GetCommand()->exepath() - +< *exists()* exists({expr}) The result is a Number, which is |TRUE| if {expr} is defined, zero otherwise. @@ -4566,7 +4572,7 @@ foldlevel({lnum}) *foldlevel()* Can also be used as a |method|: > GetLnum()->foldlevel() - +< *foldtext()* foldtext() Returns a String, to be displayed for a closed fold. This is the default function used for the 'foldtext' option and should @@ -5848,7 +5854,7 @@ histadd({history}, {item}) *histadd()* :let date=input("Enter date: ") < This function is not available in the |sandbox|. - Can also be used as a |method|, the base is used for the + Can also be used as a |method|, the base is passed as the second argument: > GetHistory()->histadd('search') @@ -6376,8 +6382,8 @@ libcall({libname}, {funcname}, {argument}) Examples: > :echo libcall("libc.so", "getenv", "HOME") -< Can also be used as a |method|, where the base is passed as - the argument to the called function: > +< Can also be used as a |method|, the base is passed as the + third argument: > GetValue()->libcall("libc.so", "getenv") < *libcallnr()* @@ -6391,8 +6397,8 @@ libcallnr({libname}, {funcname}, {argument}) :call libcallnr("libc.so", "printf", "Hello World!\n") :call libcallnr("libc.so", "sleep", 10) < - Can also be used as a |method|, where the base is passed as - the argument to the called function: > + Can also be used as a |method|, the base is passed as the + third argument: > GetValue()->libcallnr("libc.so", "printf") < @@ -6543,8 +6549,8 @@ listener_add({callback} [, {buf}]) *listener_add()* The {callback} is also not invoked when the buffer is unloaded, use the |BufUnload| autocmd event for that. - Can also be used as a |method|, where the base is passed as - the second argument, the buffer: > + Can also be used as a |method|, the base is passed as the + second argument: > GetBuffer()->listener_add(callback) listener_flush([{buf}]) *listener_flush()* @@ -7014,6 +7020,7 @@ matchstrpos({expr}, {pat} [, {start} [, {count}]]) *matchstrpos()* Can also be used as a |method|: > GetText()->matchstrpos('word') +< *max()* max({expr}) Return the maximum value of all items in {expr}. {expr} can be a list or a dictionary. For a dictionary, @@ -8270,20 +8277,31 @@ serverlist() *serverlist()* :echo serverlist() < setbufline({expr}, {lnum}, {text}) *setbufline()* - Set line {lnum} to {text} in buffer {expr}. To insert - lines use |append()|. Any text properties in {lnum} are - cleared. + Set line {lnum} to {text} in buffer {expr}. This works like + |setline()| for the specified buffer. + + This function works only for loaded buffers. First call + |bufload()| if needed. + + To insert lines use |appendbufline()|. + Any text properties in {lnum} are cleared. + + {text} can be a string to set one line, or a list of strings + to set multiple lines. If the list extends below the last + line then those lines are added. For the use of {expr}, see |bufname()| above. {lnum} is used like with |setline()|. - This works like |setline()| for the specified buffer. + When {lnum} is just below the last line the {text} will be + added below the last line. When {expr} is not a valid buffer, the buffer is not loaded or {lnum} is not valid then 1 is returned. On success 0 is returned. - Can also be used as a |method|: > + Can also be used as a |method|, the base is passed as the + third argument: > GetText()->setbufline(buf, lnum) setbufvar({expr}, {varname}, {val}) *setbufvar()* @@ -8299,7 +8317,8 @@ setbufvar({expr}, {varname}, {val}) *setbufvar()* :call setbufvar("todo", "myvar", "foobar") < This function is not available in the |sandbox|. - Can also be used as a |method|: > + Can also be used as a |method|, the base is passed as the + third argument: > GetValue()->setbufvar(buf, varname) setcharsearch({dict}) *setcharsearch()* @@ -8348,7 +8367,8 @@ setenv({name}, {val}) *setenv()* When {val} is |v:null| the environment variable is deleted. See also |expr-env|. - Can also be used as a |method|, passing the value as the base: > + Can also be used as a |method|, the base is passed as the + second argument: > GetPath()->setenv('PATH') setfperm({fname}, {mode}) *setfperm()* *chmod* @@ -8379,7 +8399,7 @@ setline({lnum}, {text}) *setline()* {lnum} is used like with |getline()|. When {lnum} is just below the last line the {text} will be - added as a new line. + added below the last line. If this succeeds, 0 is returned. If this fails (most likely because {lnum} is invalid) 1 is returned. @@ -8397,7 +8417,8 @@ setline({lnum}, {text}) *setline()* < Note: The '[ and '] marks are not set. - Can also be used as a |method|, passing the text as the base: > + Can also be used as a |method|, the base is passed as the + second argument: > GetText()->setline(lnum) setloclist({nr}, {list} [, {action} [, {what}]]) *setloclist()* @@ -8646,7 +8667,8 @@ settabvar({tabnr}, {varname}, {val}) *settabvar()* Tabs are numbered starting with one. This function is not available in the |sandbox|. - Can also be used as a |method|, the base is used as the value: > + Can also be used as a |method|, the base is passed as the + third argument: > GetValue()->settabvar(tab, name) settabwinvar({tabnr}, {winnr}, {varname}, {val}) *settabwinvar()* @@ -8667,7 +8689,8 @@ settabwinvar({tabnr}, {winnr}, {varname}, {val}) *settabwinvar()* :call settabwinvar(3, 2, "myvar", "foobar") < This function is not available in the |sandbox|. - Can also be used as a |method|, the base is used as the value: > + Can also be used as a |method|, the base is passed as the + fourth argument: > GetValue()->settabvar(tab, winnr, name) settagstack({nr}, {dict} [, {action}]) *settagstack()* @@ -8701,7 +8724,8 @@ settagstack({nr}, {dict} [, {action}]) *settagstack()* call settagstack(1003, stack) unlet stack < - Can also be used as a |method|, the base is used as the Dict: > + Can also be used as a |method|, the base is passed as the + second argument: > GetStack()->settagstack(winnr) setwinvar({winnr}, {varname}, {val}) *setwinvar()* @@ -8710,7 +8734,8 @@ setwinvar({winnr}, {varname}, {val}) *setwinvar()* :call setwinvar(1, "&list", 0) :call setwinvar(2, "myvar", "foobar") -< Can also be used as a |method|, the base is used as the value: > +< Can also be used as a |method|, the base is passed as the + third argument: > GetValue()->setwinvar(winnr, name) sha256({string}) *sha256()* @@ -9078,8 +9103,8 @@ state([{what}]) *state()* e.g. after |f| a Insert mode autocomplete active x executing an autocommand - w blocked on waiting, e.g. ch_evalexpr() and - ch_read(), ch_readraw() when reading json. + w blocked on waiting, e.g. ch_evalexpr(), ch_read() and + ch_readraw() when reading json. S not triggering SafeState or SafeStateAgain c callback invoked, including timer (repeats for recursiveness up to "ccc") @@ -9130,7 +9155,7 @@ str2nr({expr} [, {base} [, {quoted}]]) *str2nr()* When {base} is omitted base 10 is used. This also means that a leading zero doesn't cause octal conversion to be used, as with the default String to Number conversion. Example: > - let nr = str2nr('123') + let nr = str2nr('0123') < When {base} is 16 a leading "0x" or "0X" is ignored. With a different base the result will be zero. Similarly, when @@ -9247,6 +9272,7 @@ stridx({haystack}, {needle} [, {start}]) *stridx()* Can also be used as a |method|: > GetHaystack()->stridx(needle) +< *string()* string({expr}) Return {expr} converted to a String. If {expr} is a Number, Float, String, Blob or a composition of them, then the result @@ -10142,8 +10168,8 @@ win_execute({id}, {command} [, {silent}]) *win_execute()* Not all commands are allowed in popup windows. When window {id} does not exist then no error is given. - Can also be used as a |method|, the base is used for the - command: > + Can also be used as a |method|, the base is passed as the + second argument: > GetCommand()->win_execute(winid) win_findbuf({bufnr}) *win_findbuf()* @@ -10461,11 +10487,11 @@ xor({expr}, {expr}) *xor()* to a number. A List, Dict or Float argument causes an error. Example: > :let bits = xor(bits, 0x80) -< Can also be used as a |method|: > +< + Can also be used as a |method|: > :let bits = bits->xor(0x80) < - *feature-list* There are four types of features: 1. Features that are only supported when they have been enabled when Vim @@ -11338,21 +11364,22 @@ This does NOT work: > *:let=<<* *:let-heredoc* *E990* *E991* *E172* *E221* -:let {var-name} =<< [trim] {marker} +:let {var-name} =<< [trim] {endmarker} text... text... -{marker} +{endmarker} Set internal variable {var-name} to a List containing - the lines of text bounded by the string {marker}. - {marker} must not contain white space. - {marker} cannot start with a lower case character. - The last line should end only with the {marker} string - without any other character. Watch out for white - space after {marker}! + the lines of text bounded by the string {endmarker}. + {endmarker} must not contain white space. + {endmarker} cannot start with a lower case character. + The last line should end only with the {endmarker} + string without any other character. Watch out for + white space after {endmarker}! Without "trim" any white space characters in the lines of text are preserved. If "trim" is specified before - {marker}, then indentation is stripped so you can do: > + {endmarker}, then indentation is stripped so you can + do: > let text =<< trim END if ok echo 'done' @@ -11366,23 +11393,31 @@ text... non-empty text line is stripped from the input lines. All leading indentation exactly matching the leading indentation before `let` is stripped from the line - containing {marker}. Note that the difference between - space and tab matters here. + containing {endmarker}. Note that the difference + between space and tab matters here. If {var-name} didn't exist yet, it is created. Cannot be followed by another command, but can be followed by a comment. + To avoid line continuation to be applied, consider + adding 'C' to 'cpoptions': > + set cpo+=C + let var =<< END + \ leading backslash + END + set cpo-=C +< Examples: > let var1 =<< END - Sample text 1 - Sample text 2 - Sample text 3 - END + Sample text 1 + Sample text 2 + Sample text 3 + END let data =<< trim DATA - 1 2 3 4 - 5 6 7 8 + 1 2 3 4 + 5 6 7 8 DATA < *E121* diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt index bee9b88bf4..a34e7c944d 100644 --- a/runtime/doc/if_perl.txt +++ b/runtime/doc/if_perl.txt @@ -55,14 +55,14 @@ The ActiveState one should work, Strawberry Perl is a good alternative. working: > :perl VIM::Msg("Hello") -:pe[rl] << [endpattern] +:pe[rl] << [endmarker] {script} -{endpattern} +{endmarker} Execute Perl script {script}. - The {endpattern} after {script} must NOT be preceded - by any white space. + The {endmarker} after {script} must NOT be preceded by + any white space. - If [endpattern] is omitted, it defaults to a dot '.' + If [endmarker] is omitted, it defaults to a dot '.' like for the |:append| and |:insert| commands. Using '.' helps when inside a function, because "$i;" looks like the start of an |:insert| command to Vim. diff --git a/runtime/doc/if_ruby.txt b/runtime/doc/if_ruby.txt index 0eca0b6b66..0950e02aa5 100644 --- a/runtime/doc/if_ruby.txt +++ b/runtime/doc/if_ruby.txt @@ -28,14 +28,14 @@ downloading Ruby there. :rub[y] {cmd} Execute Ruby command {cmd}. A command to try it out: > :ruby print "Hello" -:rub[y] << [endpattern] +:rub[y] << [endmarker] {script} -{endpattern} +{endmarker} Execute Ruby script {script}. - The {endpattern} after {script} must NOT be preceded - by any white space. + The {endmarker} after {script} must NOT be preceded by + any white space. - If [endpattern] is omitted, it defaults to a dot '.' + If [endmarker] is omitted, it defaults to a dot '.' like for the |:append| and |:insert| commands. This form of the |:ruby| command is mainly useful for diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt index 36c49b8ba1..e7f9af9217 100644 --- a/runtime/doc/indent.txt +++ b/runtime/doc/indent.txt @@ -949,10 +949,12 @@ Function call arguments will indent 1 extra level. For two-space indentation: > ------------- *PHP_IndentFunctionDeclarationParameters* -Extra indentation levels to add to arguments in multi-line function definitions. > +Extra indentation levels to add to arguments in multi-line function +definitions. > let g:PHP_IndentFunctionDeclarationParameters = 1 -Function arguments in declarations will indent 1 extra level. For two-space indentation: > +Function arguments in declarations will indent 1 extra level. For two-space +indentation: > function call_the_thing( $with_this, diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt index 4a7edca493..c4e08f27fc 100644 --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -480,7 +480,7 @@ try to solve the memory shortage. To stay on the safe side, exit Vim and start again. If this happens while Vim is still initializing, editing files is very -unlikely to work, therefore Vim will exit with value 123. +unlikely to work, therefore Vim will exit with value 123. Buffers are only partly kept in memory, thus editing a very large file is unlikely to cause an out-of-memory situation. Undo information is completely diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index cb65535bb8..34fb484f07 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 8.1. Last change: 2019 Sep 26 +*options.txt* For Vim version 8.1. Last change: 2019 Sep 28 VIM REFERENCE MANUAL by Bram Moolenaar @@ -856,7 +856,7 @@ A jump table for the options with a short description can be found at |Q_op|. :set background& < Vim will guess the value. In the GUI this should work correctly, in other cases Vim might not be able to guess the right value. - If the GUI supports a dark them, you can use the "d" flag in + If the GUI supports a dark theme, you can use the "d" flag in 'guioptions', see 'go-d'. When the |t_RB| option is set, Vim will use it to request the background @@ -1877,7 +1877,7 @@ A jump table for the options with a short description can be found at |Q_op|. *'completeslash'* *'csl'* 'completeslash' 'csl' string (default: "") local to buffer - {not in Vi} {only for MS-Windows} + {only for MS-Windows} When this option is set it overrules 'shellslash' for completion: - When this option is set to "slash", a forward slash is used for path completion in insert mode. This is useful when editing HTML tag, or @@ -1917,7 +1917,7 @@ A jump table for the options with a short description can be found at |Q_op|. completion in a popup window. Only works in combination with "menu" or "menuone". Overrides "preview". See |'completepopup'| for specifying properties. - {only works when compiled with the +textprop feature} + {only works when compiled with the |+textprop| feature} noinsert Do not insert any text for a match until the user selects a match from the menu. Only works in combination with @@ -2470,7 +2470,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'cursorlineopt'* *'culopt'* 'cursorlineopt' 'culopt' string (default: "number,line") local to window - {not in Vi} {not available when compiled without the |+syntax| feature} Comma separated list of settings for how 'cursorline' is displayed. diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt index 9a75a95f23..9c8db6bd05 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -1,4 +1,4 @@ -*pi_netrw.txt* For Vim version 8.1. Last change: 2019 Jul 17 +*pi_netrw.txt* For Vim version 8.1. Last change: 2019 Oct 10 ------------------------------------------------ NETRW REFERENCE MANUAL by Charles E. Campbell @@ -3512,7 +3512,7 @@ Example: Clear netrw's marked file list via a mapping on gu > - Click "Add..." - Set External Editor (adjust path as needed, include the quotes and !.! at the end): - "c:\Program Files\Vim\vim70\gvim.exe" !.! + "c:\Program Files\Vim\vim81\gvim.exe" !.! - Check that the filetype in the box below is {asterisk}.{asterisk} (all files), or whatever types you want (cec: change {asterisk} to * ; I had to @@ -3762,8 +3762,8 @@ by obtaining a copy of the latest (often developmental) netrw at: The <netrw.vim> script is typically installed on systems as something like: > - /usr/local/share/vim/vim7x/plugin/netrwPlugin.vim - /usr/local/share/vim/vim7x/autoload/netrw.vim + /usr/local/share/vim/vim8x/plugin/netrwPlugin.vim + /usr/local/share/vim/vim8x/autoload/netrw.vim (see output of :echo &rtp) < which is loaded automatically at startup (assuming :set nocp). If you diff --git a/runtime/doc/popup.txt b/runtime/doc/popup.txt index 04fa0a6786..a438ce64e9 100644 --- a/runtime/doc/popup.txt +++ b/runtime/doc/popup.txt @@ -361,7 +361,7 @@ popup_getpos({id}) *popup_getpos()* core_width width of the text box in screen cells core_height height of the text box in screen cells firstline line of the buffer at top (1 unless scrolled) - (not the value of the "firstline" property) + (not the value of the "firstline" property) scrollbar non-zero if a scrollbar is displayed visible one if the popup is displayed, zero if hidden Note that these are the actual screen positions. They differ @@ -744,22 +744,22 @@ is inserted or deleted. The popup functions like a tooltip. These steps are needed to make this work: - Define a text property type, it defines the name. > - call prop_type_add('popupMarker', {}) + call prop_type_add('popupMarker', {}) - Place a text property at the desired text: > let lnum = {line of the text} let col = {start column of the text} let len = {length of the text} let propId = {arbitrary but unique number} - call prop_add(lnum, col, #{ + call prop_add(lnum, col, #{ \ length: len, \ type: 'popupMarker', \ id: propId, \ }) - Create a popup: > - let winid = popup_create('the text', #{ - \ pos: 'botleft', + let winid = popup_create('the text', #{ + \ pos: 'botleft', \ textprop: 'popupMarker', \ textpropid: propId, \ border: [], @@ -799,7 +799,7 @@ Some hints: a click, as in the example above, helps for that. - If the text property is removed the popup is closed. Use something like this: > - call prop_remove(#{type: 'popupMarker', id: propId}) + call prop_remove(#{type: 'popupMarker', id: propId}) POPUP FILTER *popup-filter* diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 6365e3622c..08a532c770 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 8.1. Last change: 2019 Sep 19 +*syntax.txt* For Vim version 8.1. Last change: 2019 Oct 04 VIM REFERENCE MANUAL by Bram Moolenaar @@ -60,8 +60,8 @@ If the VIM environment variable is not set, Vim will try to find the path in another way (see |$VIMRUNTIME|). Usually this works just fine. If it doesn't, try setting the VIM environment variable to the directory where the Vim stuff is located. For example, if your syntax files -are in the "/usr/vim/vim50/syntax" directory, set $VIMRUNTIME to -"/usr/vim/vim50". You must do this in the shell, before starting Vim. +are in the "/usr/vim/vim81/syntax" directory, set $VIMRUNTIME to +"/usr/vim/vim81". You must do this in the shell, before starting Vim. This command also sources the |menu.vim| script when the GUI is running or will start soon. See |'go-M'| about avoiding that. diff --git a/runtime/doc/tags b/runtime/doc/tags index 091c968138..1e8b1cbb68 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -1016,6 +1016,8 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX* 't_Sb' term.txt /*'t_Sb'* 't_Sf' term.txt /*'t_Sf'* 't_Si' term.txt /*'t_Si'* +'t_TE' term.txt /*'t_TE'* +'t_TI' term.txt /*'t_TI'* 't_Te' term.txt /*'t_Te'* 't_Ts' term.txt /*'t_Ts'* 't_VS' term.txt /*'t_VS'* @@ -8087,7 +8089,6 @@ new-vimgrep version7.txt /*new-vimgrep* new-virtedit version6.txt /*new-virtedit* news intro.txt /*news* nextnonblank() eval.txt /*nextnonblank()* -nice todo.txt /*nice* no-eval-feature eval.txt /*no-eval-feature* no-type-checking eval.txt /*no-type-checking* no_buffers_menu gui.txt /*no_buffers_menu* @@ -9104,6 +9105,8 @@ t_ST term.txt /*t_ST* t_Sb term.txt /*t_Sb* t_Sf term.txt /*t_Sf* t_Si term.txt /*t_Si* +t_TE term.txt /*t_TE* +t_TI term.txt /*t_TI* t_Te term.txt /*t_Te* t_Ts term.txt /*t_Ts* t_VS term.txt /*t_VS* diff --git a/runtime/doc/terminal.txt b/runtime/doc/terminal.txt index ab26631e27..fc5031dd46 100644 --- a/runtime/doc/terminal.txt +++ b/runtime/doc/terminal.txt @@ -496,7 +496,7 @@ term_dumpload({filename} [, {options}]) For {options} see |term_dumpdiff()|. Can also be used as a |method|: > - GetFilename()-> term_dumpload() + GetFilename()->term_dumpload() < *term_dumpwrite()* term_dumpwrite({buf}, {filename} [, {options}]) @@ -514,7 +514,7 @@ term_dumpwrite({buf}, {filename} [, {options}]) Can also be used as a |method|, the base is used for the file name: > - GetFilename()-> term_dumpwrite(bufnr) + GetFilename()->term_dumpwrite(bufnr) term_getaltscreen({buf}) *term_getaltscreen()* Returns 1 if the terminal of {buf} is using the alternate @@ -863,8 +863,6 @@ term_start({cmd} [, {options}]) *term_start()* Can also be used as a |method|: > GetCommand()->term_start() -< {only available when compiled with the |+terminal| feature} - term_wait({buf} [, {time}]) *term_wait()* Wait for pending updates of {buf} to be handled. @@ -1243,7 +1241,7 @@ gdb: *:Break* set a breakpoint at the cursor position :Break {position} - set a breakpoint at the specified position + set a breakpoint at the specified position *:Clear* delete the breakpoint at the cursor position *:Step* execute the gdb "step" command diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 59a2f9d3cd..47d59e95e3 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 8.1. Last change: 2019 Sep 27 +*todo.txt* For Vim version 8.1. Last change: 2019 Oct 16 VIM REFERENCE MANUAL by Bram Moolenaar @@ -47,7 +47,10 @@ Popup windows: - Use popup (or popup menu) for command line completion - Implement flip option - Why does 'nrformats' leak from the popup window buffer??? - Happens in Test_simple_popup() at the second screendump. + Happens in Test_simple_popup() at: + call VerifyScreenDump(buf, 'Test_popupwin_04a', {}) + Only when this line is in defaults.vim: + set nrformats-=octal - For the "moved" property also include mouse movement? - Make redrawing more efficient and avoid flicker: - put popup menu also in popup_mask? @@ -76,7 +79,7 @@ Text properties: See comment at top of src/textprop.c. Then :%s?foo should take the first match above the cursor line. Prompt buffer: -- Add a command line history. +- Add a command line history, using up/down keys. #5010 - delay next prompt until plugin gives OK? - add prompt_addtext({buf}, {expr}) none add text to a prompt buffer @@ -134,6 +137,21 @@ E279, E290, E292, E362, E366, E450, E451, E452, E453, E454, E460, E489, E491, E565, E578, E610, E611, E653, E654, E856, E857, E860, E861, E863, E889, E900 +Try out enabling modifyOtherKeys in xterm: + CSI > 4 ; 2 m +Need to disable when going to cooked mode: + CSI > 4 ; m +Known problems: +- CTRL-V key inserts Esc sequence + +Patch to skip tests that don't work when run as root. (James McCoy, #5020) +Or just bail out completely? + +Patch to test right click. (Dominique Pelle, #5018) + +Python output doesn't stop when got_int is set. #5053 +Check got_int in write_output() in if_p |