# HG changeset patch # User Christian Brabandt # Date 1538479807 -7200 # Node ID 40ef13331e0267a9b247a5a0fb1e801314f19357 # Parent ddb5bfb4114d570f8e5af61acbe0d51e7c2990d7 Update runtime files. commit https://github.com/vim/vim/commit/95bafa296ae97bf420d5c74dd6db517b404c5df7 Author: Bram Moolenaar Date: Tue Oct 2 13:26:25 2018 +0200 Update runtime files. diff --git a/READMEdir/README_os390.txt b/READMEdir/README_os390.txt --- a/READMEdir/README_os390.txt +++ b/READMEdir/README_os390.txt @@ -1,4 +1,4 @@ -README_zOS.txt for version 8.1 of Vim: Vi IMproved. +README_os390.txt for version 8.1 of Vim: Vi IMproved. This readme explains how to build Vim on z/OS. Formerly called OS/390. See "README.txt" for general information about Vim. diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -864,6 +864,9 @@ OptionSet After setting an option. Th plugin. You can always use `:noa` to prevent triggering this autocommand. + When using |:set| in the autocommand the event + is not triggered again. + *QuickFixCmdPre* QuickFixCmdPre Before a quickfix command is run (|:make|, |:lmake|, |:grep|, |:lgrep|, |:grepadd|, diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -708,6 +708,7 @@ The flags that you can use for the subst search pattern. {not in Vi: highlighting of the match, other responses than 'y' or 'n'} + *:s_e* [e] When the search pattern fails, do not issue an error message and, in particular, continue in maps as if no error occurred. This is most useful to prevent the "No match" error from breaking a mapping. Vim @@ -719,6 +720,7 @@ The flags that you can use for the subst Interrupted {not in Vi} + *:s_g* [g] Replace all occurrences in the line. Without this argument, replacement occurs only for the first occurrence in each line. If the 'edcompatible' option is on, Vim remembers this flag and toggles @@ -726,26 +728,30 @@ The flags that you can use for the subst pattern. If the 'gdefault' option is on, this flag is on by default and the [g] argument switches it off. + *:s_i* [i] Ignore case for the pattern. The 'ignorecase' and 'smartcase' options are not used. {not in Vi} + *:s_I* [I] Don't ignore case for the pattern. The 'ignorecase' and 'smartcase' options are not used. {not in Vi} + *:s_n* [n] Report the number of matches, do not actually substitute. The [c] flag is ignored. The matches are reported as if 'report' is zero. Useful to |count-items|. If \= |sub-replace-expression| is used, the expression will be evaluated in the |sandbox| at every match. -[p] Print the line containing the last substitute. +[p] Print the line containing the last substitute. *:s_p* + +[#] Like [p] and prepend the line number. *:s_#* -[#] Like [p] and prepend the line number. +[l] Like [p] but print the text like |:list|. *:s_l* -[l] Like [p] but print the text like |:list|. - + *:s_r* [r] Only useful in combination with `:&` or `:s` without arguments. `:&r` works the same way as `:~`: When the search pattern is empty, use the previously used search pattern instead of the search pattern from the diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -2022,8 +2022,10 @@ abs({expr}) Float or Number absolute acos({expr}) Float arc cosine of {expr} add({list}, {item}) List append {item} to |List| {list} and({expr}, {expr}) Number bitwise AND -append({lnum}, {string}) Number append {string} below line {lnum} -append({lnum}, {list}) Number append lines {list} below line {lnum} +append({lnum}, {text}) Number append {text} below line {lnum} +appendbufline({expr}, {lnum}, {text}) + Number append {text} below line {lnum} + in buffer {expr} argc() Number number of files in the argument list argidx() Number current index in the argument list arglistid([{winnr} [, {tabnr}]]) Number argument list id @@ -2108,8 +2110,8 @@ confirm({msg} [, {choices} [, {default} copy({expr}) any make a shallow copy of {expr} cos({expr}) Float cosine of {expr} cosh({expr}) Float hyperbolic cosine of {expr} -count({list}, {expr} [, {ic} [, {start}]]) - Number count how many {expr} are in {list} +count({comp}, {expr} [, {ic} [, {start}]]) + Number count how many {expr} are in {comp} cscope_connection([{num}, {dbpath} [, {prepend}]]) Number checks existence of cscope connection cursor({lnum}, {col} [, {off}]) @@ -2331,7 +2333,6 @@ remote_read({serverid} [, {timeout}]) remote_send({server}, {string} [, {idvar}]) String send key sequence remote_startserver({name}) none become server {name} - String send key sequence remove({list}, {idx} [, {end}]) any remove items {idx}-{end} from {list} remove({dict}, {key}) any remove entry {key} from {dict} rename({from}, {to}) Number rename (move) file from {from} to {to} @@ -2356,8 +2357,8 @@ searchpos({pattern} [, {flags} [, {stopl server2client({clientid}, {string}) Number send reply string serverlist() String get a list of available servers -setbufline({expr}, {lnum}, {line}) - Number set line {lnum} to {line} in buffer +setbufline({expr}, {lnum}, {text}) + Number set line {lnum} to {text} in buffer {expr} setbufvar({expr}, {varname}, {val}) none set {varname} in buffer {expr} to {val} @@ -2465,7 +2466,7 @@ term_wait({buf} [, {time}]) Number wait test_alloc_fail({id}, {countdown}, {repeat}) none make memory allocation fail test_autochdir() none enable 'autochdir' during startup -test_feedinput() none add key sequence to input buffer +test_feedinput({string}) none add key sequence to input buffer test_garbagecollect_now() none free memory right now for testing test_ignore_error({expr}) none ignore a specific error test_null_channel() Channel null value for testing @@ -2567,10 +2568,10 @@ and({expr}, {expr}) *and()* :let flag = and(bits, 0x80) -append({lnum}, {expr}) *append()* - When {expr} is a |List|: Append each item of the |List| as a +append({lnum}, {text}) *append()* + When {text} is a |List|: Append each item of the |List| as a text line below line {lnum} in the current buffer. - Otherwise append {expr} as one text line below line {lnum} in + Otherwise append {text} as one text line below line {lnum} in the current buffer. {lnum} can be zero to insert a line before the first one. Returns 1 for failure ({lnum} out of range or out of memory), @@ -2800,15 +2801,15 @@ balloon_show({expr}) *balloon_show() When showing a balloon is not possible nothing happens, no error message. - {only available when compiled with the +balloon_eval or - +balloon_eval_term feature} + {only available when compiled with the |+balloon_eval| or + |+balloon_eval_term| feature} balloon_split({msg}) *balloon_split()* Split {msg} into lines to be displayed in a balloon. The splits are made for the current window size and optimize to show debugger output. Returns a |List| with the split lines. - {only available when compiled with the +balloon_eval_term + {only available when compiled with the |+balloon_eval_term| feature} *browse()* @@ -3549,7 +3550,7 @@ deletebufline({expr}, {first} [, {last}] For the use of {expr}, see |bufname()| above. - {first} and {last} are used like with |setline()|. Note that + {first} and {last} are used like with |getline()|. Note that when using |line()| this refers to the current buffer. Use "$" to refer to the last line in buffer {expr}. @@ -4504,6 +4505,8 @@ getcmdline() *getcmdline()* Example: > :cmap eescape(getcmdline(), ' \') < Also see |getcmdtype()|, |getcmdpos()| and |setcmdpos()|. + Returns an empty string when entering a password or using + |inputsecret()|. getcmdpos() *getcmdpos()* Return the position of the cursor in the command line as a @@ -8027,11 +8030,11 @@ substitute({expr}, {pat}, {sub}, {flags} swapinfo({fname}) *swapinfo()* The result is a dictionary, which holds information about the swapfile {fname}. The available fields are: - version VIM version + version Vim version user user name host host name fname original file name - pid PID of the VIM process that created the swap + pid PID of the Vim process that created the swap file mtime last modification time in seconds inode Optional: INODE number of the file @@ -8131,7 +8134,7 @@ synconcealed({lnum}, {col}) *synconce concealable region if there are two consecutive regions with the same replacement character. For an example, if the text is "123456" and both "23" and "45" are concealed - and replace by the character "X", then: + and replaced by the character "X", then: call returns ~ synconcealed(lnum, 1) [0, '', 0] synconcealed(lnum, 2) [1, 'X', 1] @@ -8359,7 +8362,7 @@ term_dumpdiff({filename}, {filename} [, The top part of the buffer contains the contents of the first file, the bottom part of the buffer contains the contents of the second file. The middle part shows the differences. - The parts are separated by a line of dashes. + The parts are separated by a line of equals. If the {options} argument is present, it must be a Dict with these possible members: @@ -8452,8 +8455,8 @@ term_getcursor({buf}) *term_getcurso "dict" can have these members: "visible" one when the cursor is visible, zero when it is hidden. - "blink" one when the cursor is visible, zero when it - is hidden. + "blink" one when the cursor is blinking, zero when it + is not blinking. "shape" 1 for a block cursor, 2 for underline and 3 for a vertical bar. @@ -8485,7 +8488,7 @@ term_getscrolled({buf}) *term_getscr used for |term_getline()| and |getline()|, so that: > term_getline(buf, N) < is equal to: > - `getline(N + term_getscrolled(buf)) + getline(N + term_getscrolled(buf)) < (if that line exists). {buf} is used as with |term_getsize()|. diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt --- a/runtime/doc/if_pyth.txt +++ b/runtime/doc/if_pyth.txt @@ -60,9 +60,10 @@ Example: > endfunction To see what version of Python you have: > - :python import sys :python print(sys.version) +There is no need to import sys, it's done by default. + Note: Python is very sensitive to the indenting. Make sure the "class" line and "EOF" do not have any indent. @@ -110,7 +111,6 @@ Python commands cannot be used in the |s To pass arguments you need to set sys.argv[] explicitly. Example: > - :python import sys :python sys.argv = ["foo", "bar"] :pyfile myscript.py diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -371,8 +371,9 @@ job running in the terminal. See |termi *omap-info* Operator-pending mappings can be used to define a movement command that can be -used with any operator. Simple example: ":omap { w" makes "y{" work like "yw" -and "d{" like "dw". +used with any operator. Simple example: > + :omap { w +makes "y{" work like "yw" and "d{" like "dw". To ignore the starting cursor position and select different text, you can have the omap start Visual mode to select the text to be operated upon. Example @@ -383,9 +384,11 @@ Normal mode commands find the first '(' before it. That usually is the function name. To enter a mapping for Normal and Visual mode, but not Operator-pending mode, -first define it for all three modes, then unmap it for Operator-pending mode: +first define it for all three modes, then unmap it for +Operator-pending mode: > :map xx something-difficult :ounmap xx + Likewise for a mapping for Visual and Operator-pending mode or Normal and Operator-pending mode. diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -120,10 +120,10 @@ and the following arguments will be igno When 'verbose' is non-zero, displaying an option value will also tell where it was last set. Example: > :verbose set shiftwidth cindent? -< shiftwidth=4 ~ - Last set from modeline ~ - cindent ~ - Last set from /usr/local/share/vim/vim60/ftplugin/c.vim ~ +< shiftwidth=4 ~ + Last set from modeline line 1 ~ + cindent ~ + Last set from /usr/local/share/vim/vim60/ftplugin/c.vim line 30 ~ This is only done when specific option values are requested, not for ":verbose set all" or ":verbose set" without an argument. When the option was set by hand there is no "Last set" message. @@ -132,7 +132,7 @@ autocommand, the script in which it was Note that an option may also have been set as a side effect of setting 'compatible'. A few special texts: - Last set from modeline ~ + Last set from modeline line 1 ~ Option was set in a |modeline|. Last set from --cmd argument ~ Option was set with command line argument |--cmd| or +. @@ -1999,8 +1999,8 @@ A jump table for the options with a shor displayed. E.g., when moving vertically it may change column. -'conceallevel' 'cole' *'conceallevel'* *'cole'* - number (default 0) + *'conceallevel'* *'cole'* +'conceallevel' 'cole' number (default 0) local to window {not in Vi} {not available when compiled without the |+conceal| @@ -2634,6 +2634,15 @@ A jump table for the options with a shor When omitted a context of six lines is used. See |fold-diff|. + iblank Ignore changes where lines are all blank. Adds + the "-B" flag to the "diff" command if + 'diffexpr' is empty. Check the documentation + of the "diff" command for what this does + exactly. + NOTE: the diff windows will get out of sync, + because no differences between blank lines are + taken into account. + icase Ignore changes in case of text. "a" and "A" are considered the same. Adds the "-i" flag to the "diff" command if 'diffexpr' is empty. @@ -2645,6 +2654,18 @@ A jump table for the options with a shor exactly. It should ignore adding trailing white space, but not leading white space. + iwhiteall Ignore all white space changes. Adds + the "-w" flag to the "diff" command if + 'diffexpr' is empty. Check the documentation + of the "diff" command for what this does + exactly. + + iwhiteeol Ignore white space changes at end of line. + Adds the "-Z" flag to the "diff" command if + 'diffexpr' is empty. Check the documentation + of the "diff" command for what this does + exactly. + horizontal Start diff mode with horizontal splits (unless explicitly specified otherwise). @@ -4698,7 +4719,7 @@ A jump table for the options with a shor Identifiers are used in recognizing environment variables and after a match of the 'define' option. It is also used for "\i" in a |pattern|. See 'isfname' for a description of the format of this - option. + option. For '@' only characters up to 255 are used. Careful: If you change this option, it might break expanding environment variables. E.g., when '/' is included and Vim tries to expand "$HOME/.viminfo". Maybe you should change 'iskeyword' instead. @@ -4712,8 +4733,9 @@ A jump table for the options with a shor {not in Vi} Keywords are used in searching and recognizing with many commands: "w", "*", "[i", etc. It is also used for "\k" in a |pattern|. See - 'isfname' for a description of the format of this option. For C - programs you could use "a-z,A-Z,48-57,_,.,-,>". + 'isfname' for a description of the format of this option. For '@' + characters above 255 check the "word" character class. + For C programs you could use "a-z,A-Z,48-57,_,.,-,>". For a help file it is set to all non-blank printable characters except '*', '"' and '|' (so that CTRL-] on a command finds the help for that command). @@ -5424,7 +5446,7 @@ A jump table for the options with a shor h all previous modes when editing a help file a all previous modes r for |hit-enter| and |more-prompt| prompt - Normally you would enable the mouse in all four modes with: > + Normally you would enable the mouse in all five modes with: > :set mouse=a < When the mouse is not enabled, the GUI will still use the mouse for modeless selection. This doesn't move the text cursor. @@ -5946,7 +5968,7 @@ A jump table for the options with a shor security reasons. *'printencoding'* *'penc'* -'printencoding' 'penc' String (default empty, except for some systems) +'printencoding' 'penc' string (default empty, except for some systems) global {not in Vi} {only available when compiled with the |+printer| @@ -5955,7 +5977,7 @@ A jump table for the options with a shor See |penc-option|. *'printexpr'* *'pexpr'* -'printexpr' 'pexpr' String (default: see below) +'printexpr' 'pexpr' string (default: see below) global {not in Vi} {only available when compiled with the |+printer| diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -1551,7 +1551,7 @@ The backslashes before the pipe characte recognized as a command separator. The backslash before each space is required for the set command. - *cfilter-plugin* + *cfilter-plugin* *Cfilter* *Lfilter* If you have too many matching messages, you can use the cfilter plugin to reduce the number of entries. Load the plugin with: > packadd cfilter diff --git a/runtime/doc/recover.txt b/runtime/doc/recover.txt --- a/runtime/doc/recover.txt +++ b/runtime/doc/recover.txt @@ -28,6 +28,9 @@ You can see the name of the current swap :sw[apname] *:sw* *:swapname* +Or you can use the |swapname()| function, which also allows for seeing the +swap file name of other buffers. + The name of the swap file is normally the same as the file you are editing, with the extension ".swp". - On Unix, a '.' is prepended to swap file names in the same directory as the diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt --- a/runtime/doc/repeat.txt +++ b/runtime/doc/repeat.txt @@ -467,8 +467,8 @@ flag when defining the function, it is n :set cpo-=C < *line-continuation-comment* -To add a comment in between the lines start with '\" '. Notice the space -after the double quote. Example: > +To add a comment in between the lines start with '"\ '. Notice the space +after the backslash. Example: > let array = [ "\ first entry comment \ 'first', diff --git a/runtime/doc/tags b/runtime/doc/tags --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -1932,6 +1932,8 @@ 90.5 usr_90.txt /*90.5* : cmdline.txt /*:* : cmdline.txt /*:* : cmdline.txt /*:* +: cmdline.txt /*:* +: cmdline.txt /*:* := various.txt /*:=* :> change.txt /*:>* :? cmdline.txt /*:?* @@ -2872,8 +2874,17 @@ 90.5 usr_90.txt /*90.5* :sN windows.txt /*:sN* :sNext windows.txt /*:sNext* :s\= change.txt /*:s\\=* +:s_# change.txt /*:s_#* +:s_I change.txt /*:s_I* :s_c change.txt /*:s_c* +:s_e change.txt /*:s_e* :s_flags change.txt /*:s_flags* +:s_g change.txt /*:s_g* +:s_i change.txt /*:s_i* +:s_l change.txt /*:s_l* +:s_n change.txt /*:s_n* +:s_p change.txt /*:s_p* +:s_r change.txt /*:s_r* :sa windows.txt /*:sa* :sal windows.txt /*:sal* :sall windows.txt /*:sall* @@ -3462,10 +3473,12 @@ 90.5 usr_90.txt /*90.5* map.txt /** autocmd.txt /** autocmd.txt /** + cmdline.txt /** cmdline.txt /** cmdline.txt /** intro.txt /** map.txt /** + cmdline.txt /** map.txt /** term.txt /** term.txt /** @@ -3497,6 +3510,7 @@ 90.5 usr_90.txt /*90.5* map.txt /** map.txt /** cmdline.txt /** + cmdline.txt /** cmdline.txt /** intro.txt /** term.txt /** @@ -3695,6 +3709,7 @@ CTRL-\_CTRL-N intro.txt /*CTRL-\\_CTRL-N CTRL-] tagsrch.txt /*CTRL-]* CTRL-^ editing.txt /*CTRL-^* CTRL-{char} intro.txt /*CTRL-{char}* +Cfilter quickfix.txt /*Cfilter* Channel eval.txt /*Channel* Channels eval.txt /*Channels* Chinese mbyte.txt /*Chinese* @@ -3727,6 +3742,7 @@ DOS-format-write editing.txt /*DOS-forma Dictionaries eval.txt /*Dictionaries* Dictionary eval.txt /*Dictionary* Dictionary-function eval.txt /*Dictionary-function* +DiffUpdated autocmd.txt /*DiffUpdated* Digraphs digraph.txt /*Digraphs* DirChanged autocmd.txt /*DirChanged* E motion.txt /*E* @@ -4628,6 +4644,8 @@ E956 pattern.txt /*E956* E957 eval.txt /*E957* E958 eval.txt /*E958* E96 diff.txt /*E96* +E960 options.txt /*E960* +E961 cmdline.txt /*E961* E97 diff.txt /*E97* E98 diff.txt /*E98* E99 diff.txt /*E99* @@ -4702,6 +4720,7 @@ KVim gui_x11.txt /*KVim* Kibaale uganda.txt /*Kibaale* Korean mbyte.txt /*Korean* L motion.txt /*L* +Lfilter quickfix.txt /*Lfilter* Linux-backspace options.txt /*Linux-backspace* List eval.txt /*List* Lists eval.txt /*Lists* @@ -7273,6 +7292,7 @@ lifelines.vim syntax.txt /*lifelines.vim limits vi_diff.txt /*limits* line() eval.txt /*line()* line-continuation repeat.txt /*line-continuation* +line-continuation-comment repeat.txt /*line-continuation-comment* line2byte() eval.txt /*line2byte()* linefeed intro.txt /*linefeed* linewise motion.txt /*linewise* @@ -8664,6 +8684,7 @@ swapchoice-variable eval.txt /*swapchoic swapcommand-variable eval.txt /*swapcommand-variable* swapfile-changed version4.txt /*swapfile-changed* swapinfo() eval.txt /*swapinfo()* +swapname() eval.txt /*swapname()* swapname-variable eval.txt /*swapname-variable* sybase ft_sql.txt /*sybase* syn-sync-grouphere syntax.txt /*syn-sync-grouphere* @@ -9077,7 +9098,9 @@ test_null_job() eval.txt /*test_null_job test_null_list() eval.txt /*test_null_list()* test_null_partial() eval.txt /*test_null_partial()* test_null_string() eval.txt /*test_null_string()* +test_option_not_set() eval.txt /*test_option_not_set()* test_override() eval.txt /*test_override()* +test_scrollbar() eval.txt /*test_scrollbar()* test_settime() eval.txt /*test_settime()* testing eval.txt /*testing* testing-variable eval.txt /*testing-variable* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -38,8 +38,17 @@ browser use: https://github.com/vim/vim/ *known-bugs* -------------------- Known bugs and current work ----------------------- -tar plugin: use "file" to check compression type, use bzip2 only when it -recognizes bzip2 or file ends in .bz2 +Test_scrollbars() fails with X11-Athena GUI or X11-Motif GUI +(Dominique, #3451) + +Flashing highlighting with 'rnu' and folding. +(Vitaly Yashin, 2018 Sep 26, #3484) + +Still a cursorline problem. (Justin Keyes, #3488) + +Crash with recursive use of getcmdline() from Timer. save_ccline isn't used +then. Turn it around: When getcmdline() is called it checks if it is a +recursive call, and saves the cmdline then. (#3493) 'incsearch' with :s: (#3321) - :s/foo using CTRL-G moves to another line, should not happen, or use the @@ -50,6 +59,8 @@ recognizes bzip2 or file ends in .bz2 isn't one? Then :%s?foo should take the first match above the cursor line. +Don't set diffexpr when generating _vimrc for MS-Windows. + Prompt buffer: - Add a command line history. - delay next prompt until plugin gives OK? @@ -91,12 +102,8 @@ Terminal emulator window: - When 'encoding' is not utf-8, or the job is using another encoding, setup conversions. -Not possible to have a comment in between line continuation. Use |\": - let array = [ - \ item, - |\" comment - \ item, - \ ] +Key mapping times out when using a timer in Gvim. (Michael Henry, 2018 Sep 9, +#3417) Does not build with MinGW out of the box: - _stat64 is not defined, need to use "struct stat" in vim.h @@ -105,9 +112,6 @@ Does not build with MinGW out of the box Crash when mixing matchadd and substitute()? (Max Christian Pohle, 2018 May 13, #2910) Can't reproduce? -Patch to add script line number to script ID. (ichizok, Ozaki Kiichi, 2018 Aug -24, #3362) - Errors found with random data: heap-buffer-overflow in alist_add (#2472) @@ -127,12 +131,18 @@ https://lgtm.com/projects/g/vim/vim/aler Pasting foo} causes Vim to behave weird. (John Little, 2018 Jun 17) Related to bracketed paste. I cannot reproduce it. +":mksession" cannot handle a very long 'runtimepath'. (Timothy Madden, 21 Sep +2018, #3466) + Patch in pull request #2967: Allow white space in sign text. (Ben Jackson) Test fails in AppVeyor. Job_info() returns command without backslashes. (Daniel Hahler, 2018 Sep 3, #3404) +Patch to simplify nsis installer. (Ken Takata, 2018 Sep 24, was #3479) +Now included in #3501, using MUI2. + Removing flags from 'cpoptions' breaks the Winbar buttons in termdebug. (Dominique Pelle, 2018 Jul 16) @@ -143,6 +153,9 @@ Invalid memory access with old regexp en #3405) Introduced by 8.0.1517, which was fixing another memory access error. (Sep 8) +Add function to make use of internal diff, working on two lists and returning +unified diff (list of lines). + Memory leak in test_assert: ==19127== by 0x2640D7: alloc (misc2.c:874) ==19127== by 0x2646D6: vim_strsave (misc2.c:1315) @@ -183,29 +196,36 @@ Patch to support ":tag avoid writing all the text to a file, use in-memory only --> add option to use external diff above a certain size. --> when making changes, diff only the part of the buffer that changed. +ml_get error. (Dominique Pelle, 2018 Sep 14, #3434) + +Only output t_Cs when t_Ce is also set. do not use Cs and Ce termcap entries. (Daniel Hahler, 2018 Sep 25) +Add t_cS and t_cR for cursor color select and reset. Use Cs and Cr terminfo +values. + +Furthere xdiff changes: +- More options, e.g. different kind of whitespace diff. +- when editing text, update the surrounding diff blocks. +- omit diff.exe from distribution +- Can we make this show differences within a line? +- add option to use external diff above a certain size. Difference between two regexp engines: #3373 +Patch to handle missin glibwinpthread-1.dll. (Ken Takata, 2018 Sep 23, #2827) + Patch to add arguments to argc() and argv(). (Yegappan Lakshmanan, 2016 Jan 24, #832) Also need a way to get the global arg list? Update later on Jan 24 Update Mar 5. Update Apr 7. Update Jun 5. @@ -215,13 +235,13 @@ includes the first screen line. (2018 Au Refactored HTML indent file. (Michael Lee, #1821) -Test for user name completeion ":e ~s" fails because we don't get all -user names. Is there another function to get more? (2018 Sep 3, Stuckrad) - Patch to add getregpoint() and setreg() with an option to set "". (Andy Massimino, 2018 Aug 24, #3370) Better name? +MS-Windows: .lnk file not resolved properly when 'encoding' is set. +(lkintact, 2018 Sep 22, #3473) + Script generated by :mksession does not work well if there are windows with modified buffers change "silent only" into "silent only!" @@ -238,6 +258,8 @@ Compiler warnings (geeknik, 2017 Oct 26) Win32 console: and typed in Insert mode don't result in normal characters. (#3246) +'foldtext' is evaluated too often. (Daniel Hahler, #2773) + Height of quickfix window is not retained with vertical splits. (Lifepillar, 2018 Aug 24, #2998) @@ -253,6 +275,9 @@ is cleared, to avoid going back to the l windows with it). Can we just remove the jump list entries for the quickfix buffer? +Patch to be able to use hex numbers with :digraph. (Lcd, 2015 Sep 6) +Update Sep 7. Update by Christian Brabandt, 2015 Sep 8, 2016 Feb 1. + Make balloon_show() work outside of 'balloonexpr'? Users expect it to work: #2948. (related to #1512?) On Win32 it stops showing, because showState is already ShS_SHOWING. @@ -260,6 +285,12 @@ balloon_show() does not work properly in 20, #2481) Also see #2352, want better control over balloon, perhaps set the position. Should also be possible to add highlighting, like in the status line? +balloonexpr() on MS-Windows GUI doesn't handle accented chars? (nivaemail, +2018 Sep 14) + +Add v:motion_force. (Kana Natsuno, 2008 Dec 6) +Maybe call it v:motiontype. Update in #3490) +Alternaitve: add the force flag to mode(), after "no". Patch to fix that executable() may fail on very long filename in MS-Windows. (Ken Takata, 2016 Feb 1) @@ -281,6 +312,10 @@ Cursor in wrong position when line wraps Patch to parse ":line" in tags file and use it for search. (Daniel Hahler, #2546) Fixes #1057. Missing a test. +Setting 'columns' in a BufEnter autocommand causes a second tab width to +behave strangely, as if there is a gap and a vertical window separator. +(Michael Soyka, 2018 Sep 23, #3477) + Make {skip} argument of searchpair() consistent with other places where we pass an expression to evaluate. Allow passing zero for "never skip". @@ -301,6 +336,11 @@ If 'readonly' is not set but the file ap (wait a little while). CreateFile() returns ERROR_SHARING_VIOLATION (Linwei, 2018 May 5) +Using --remote to open a file in which a # appears does not work on +MS-Windows. Perhaps in \# the \ is seen as a path separator. (Axel Bender, +2017 Feb 9) Can we expand wildcards first and send the path literally to the +receiving Vim? Or make an exception for #, it's not useful remotely. + Should add a test for every command line argument. Check coverage for what is missing: --nofork, -A , -b, -h, etc. @@ -311,6 +351,7 @@ Quickfix window height is not kept with Jun 10, #2998) Improve the installer for MS-Windows. There are a few alternatives: +- mui2 installer improved by Ken Takata (2018 Sep 29) - Add silent install option. (Shane Lee, #751) - Installer from Cream (Steve Hall). - Modern UI 2.0 for the Nsis installer. (Guopeng Wen) @@ -328,10 +369,6 @@ Alternative manpager.vim. (Enno, 2018 Ja Delete all the speficic stuff for the Borland compiler? (#3374) Patch in #3377 (Thomas Dziedzic) -Does setting 'cursorline' cause syntax highlighting to slow down? Perhaps is -mess up the cache? (Mike Lee Williams, 2018 Jan 27, #2539) -Also: 'foldtext' is evaluated too often. (Daniel Hahler, #2773) - With 'foldmethod' "indent" and appending an empty line, what follows isn't included in the existing fold. Deleting the empty line and undo fixes it. (Oleg Koshovetc, 2018 Jul 15, #3214) @@ -490,6 +527,9 @@ Problem with 'delcombine'. (agguser, 201 MS-Windows: buffer completion doesn't work when using backslash (or slash) for a path separator. (xtal8, #2201) +Would be nice for insert mode completion to highlight the text that was added +(and may change when picking another compltion). + Test runtime files. Start with filetype detection: testdir/test_filetype.vim @@ -773,11 +813,6 @@ Or point to nightly builds: https://gith Problem passing non-UTF-8 strings to Python 3. (Björn Linse, 2016 Sep 11, #1053) With patch, does it work? -Using --remote to open a file in which a # appears does not work on -MS-Windows. Perhaps in \# the \ is seen as a path separator. (Axel Bender, -2017 Feb 9) Can we expand wildcards first and send the path literally to the -receiving Vim? Or make an exception for #, it's not useful remotely. - ":sbr" docs state it respects 'switchbuf', but "vsplit" does not cause a vertical split. (Haldean Brown, 2017 Mar 1) @@ -1113,9 +1148,6 @@ Patch to avoid redrawing tabline when th Patch to add {skip} argument to search(). (Christian Brabandt, 2016 Feb 24) Update 2016 Jun 10, #861 -Patch to be able to use hex numbers with :digraph. (Lcd, 2015 Sep 6) -Update Sep 7. Update by Christian Brabandt, 2015 Sep 8, 2016 Feb 1. - Patch to show search statistics. (Christian Brabandt, 2016 Jul 22) When the CursorMovedI event triggers, and CTRL-X was typed, a script cannot @@ -2191,9 +2223,6 @@ that Vim doesn't find the edited file in ATTENTION message? (Tony Mechelynck, 2008 Dec 1) Also: swap files are in ~/tmp/ One has relative file name ".mozilla/...". -Add v:motion_force. (Kana Natsuno, 2008 Dec 6) -Maybe call it v:motiontype. - MS-Windows: editing the first, empty buffer, 'ffs' set to "unix,dos", ":enew" doesn't set 'ff' to "unix". (Ben Fritz, 2008 Dec 5) Reusing the old buffer probably causes this. diff --git a/runtime/indent/prolog.vim b/runtime/indent/prolog.vim --- a/runtime/indent/prolog.vim +++ b/runtime/indent/prolog.vim @@ -2,6 +2,7 @@ " Maintainer : Gergely Kontra " Revised on : 2002.02.18. 23:34:05 " Language : Prolog +" Last change by: Takuya Fujiwara, 2018 Sep 23 " TODO: " checking with respect to syntax highlighting @@ -37,10 +38,18 @@ function! GetPrologIndent() let ind = indent(pnum) " Previous line was comment -> use previous line's indent if pline =~ '^\s*%' - retu ind + return ind + endif + " Previous line was the start of block comment -> +1 after '/*' comment + if pline =~ '^\s*/\*' + return ind + 1 + endif + " Previous line was the end of block comment -> -1 after '*/' comment + if pline =~ '^\s*\*/' + return ind - 1 endif " Check for clause head on previous line - if pline =~ ':-\s*\(%.*\)\?$' + if pline =~ '\%(:-\|-->\)\s*\(%.*\)\?$' let ind = ind + shiftwidth() " Check for end of clause on previous line elseif pline =~ '\.\s*\(%.*\)\?$' diff --git a/runtime/syntax/c.vim b/runtime/syntax/c.vim --- a/runtime/syntax/c.vim +++ b/runtime/syntax/c.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: C " Maintainer: Bram Moolenaar -" Last Change: 2017 Apr 30 +" Last Change: 2018 Sep 21 " Quit when a (custom) syntax file was already loaded if exists("b:current_syntax") @@ -220,7 +220,7 @@ if exists("c_comment_strings") syn match cCommentSkip contained "^\s*\*\($\|\s\+\)" syn region cCommentString contained start=+L\=\\\@ " Previous Maintainer: Nima Talebi -" Current Maintainer: Hong Xu +" Current Maintainer: Hong Xu " Homepage: http://www.vim.org/scripts/script.php?script_id=3747 -" https://bitbucket.org/xuhdev/syntax-dosini.vim -" Last Change: 2011 Nov 8 +" Repository: https://github.com/xuhdev/syntax-dosini.vim +" Last Change: 2018 Sep 11 " quit when a syntax file was already loaded @@ -17,10 +17,11 @@ endif " shut case off syn case ignore -syn match dosiniNumber "\<\d\+\>" -syn match dosiniNumber "\<\d*\.\d\+\>" -syn match dosiniNumber "\<\d\+e[+-]\=\d\+\>" -syn match dosiniLabel "^.\{-}=" +syn match dosiniLabel "^.\{-}\ze\s*=" nextgroup=dosiniNumber,dosiniValue +syn match dosiniValue "=\zs.*" +syn match dosiniNumber "=\zs\s*\d\+\s*$" +syn match dosiniNumber "=\zs\s*\d*\.\d\+\s*$" +syn match dosiniNumber "=\zs\s*\d\+e[+-]\=\d\+\s*$" syn region dosiniHeader start="^\s*\[" end="\]" syn match dosiniComment "^[#;].*$" @@ -31,6 +32,7 @@ hi def link dosiniNumber Number hi def link dosiniHeader Special hi def link dosiniComment Comment hi def link dosiniLabel Type +hi def link dosiniValue String let b:current_syntax = "dosini" diff --git a/src/tools.bmp b/src/tools.bmp index 9a520cdcee8d2b0571457df98629824cf7b5457c..5b821d7a0c823651770a7e3bcb1a127e5a2b9ac5 GIT binary patch literal 4660 zc$|fpPiy4L6~*tUE+rvEV^7?6FptM0GdzYYfk#o;jMR~f~NfUQr5qV z{7!#g@%oC_SNZns8@_+X>pNcG<^TO@th@ijVyL^KXS?YA=2N5SfHpq$SA2H;U!q76 zYAM{mV%3T7;~-7D!yvAGn6@ zCp;xcFPIDWKBl!Sg{#o3>D2CWgm#U6*0Jc44NXi>tFgvDa9#Wj<6w(48Z?IJMe0Re z7^Lo`YWpy3u2*dz%c+m;GAVmvh{CGG0@n%GzQSChb^exr?a2X#OB51{WYE25Pj|Ej zJ;$9KE#gx~M=l)aV!$}AUC9?V*_CtE(#7DUrd2g|qASHO;-?-XBKvUXf-@@@Sc!RB zuDzm_xKqvD+4UONSS~J<%fvO6y2$R!;$U&WAkllXl&z`fQ=9c0DF>UcrQId&)>DvJ za-2s?tcOc>-`eg_7apG@=CQf(oO1#g@ytDN5xAvL4T-AqnXV^Ev2jq7>_T+W1=7^6 zC=&@zCt9Xn{e^KnGC_|E*eNh>-TO%@w6uHGx<)GoaKZi`*<2hFn=3wZ|2tz7InVXl z^4uk;#*~jWVKo)RmRi)1t%i2gMutk>b=)Y-dC`g+HIDS53bx>vinfvVRwpIK)`5^@ zLx}`zXV7z@8Zhd8W)#DTO9Qoc+n@h`kQ=y zT8Y7$Np{IQM=x(vYd6%S0vGO!FQ+c)HGiX~qzN6_CH)!QBRScUd!O`qF~u=LiSQAu zFU&%JJrLA+%cDgmNujjyr}ED+32T42!rOGk`87fVV~(kQ8fROh`Q8p&I>*-5x%=g2 z(Ky?V?Uu{bPEn)P#LXhQZ=Rrv*1yedv03U7p}?NHk~1#YZRJK08oY#pnoJ>KamI?F zGE5euoCQUWnv|?gdV{9RL;XT;U^|%>Vpf|6bZMYMAlqKGqdMwVxI&I75An;A=GsAN zc-dO6COSCLmGzR@#VtEG_pyIw-(s(qMe@n0m*V#~DaP~ZLB`qH9+O|u?w;gF_xT_F z(+Qp&>EZe#o`72+j<#)}p9nUii$j>{=gI+Uz6;;Rmu}^^1HYkjo%zB5+47hgN`}h0mXrrN zt|f+k_KF9g>8SLF;#j*#e9f08l+vbAJ#JNQ&Qh8bj7fCBGnkF(XXWNyj!X&4zoVv zat}_$MN;%$z*!$H8;})4+lkeOq$=+oKEKWeq=kt2N>ok2o)4pz*mp$VVnkVY*y(PwaD$Y%pRU61Rj(h8?r&M_%{YGP*5QEC?fNqAy{ z)}OU3?h+TB(#c)Z2_Ud7ku`2ZSM@wg`BZg;WO0SxYRiC|BbL2-(Tu;kY&YEuM2F)iW%gT05tFUz~=Er)QPMAAg zeXN*%1_!GT`n&!acPd-?PX5R^V5igD)k0&c*JgQ@ZPIDu0WTuS(IXP40_Qz@Bdezv zUFSBk0e#H+rBD9fLeS%fynmKYan{ePt%i8l|2yx%C#<&4`SX+waK^rD?7t_y{F?ow KQ2rlA-u(t!d1V6t