0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

patch 8.0.1845: various comment updates needed, missing white space

Problem:    Various comment updates needed, missing white space.
Solution:   Update comments, add white space.
This commit is contained in:
Bram Moolenaar 2018-05-15 22:25:40 +02:00
parent 78ddc06bdd
commit 259f26ac2d
11 changed files with 132 additions and 124 deletions

View File

@ -1,4 +1,4 @@
*cmdline.txt* For Vim version 8.0. Last change: 2018 May 10 *cmdline.txt* For Vim version 8.0. Last change: 2018 May 14
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -458,6 +458,10 @@ a previous version <Esc> was used). In the pattern standard wildcards '*' and
'?' are accepted when matching file names. '*' matches any string, '?' '?' are accepted when matching file names. '*' matches any string, '?'
matches exactly one character. matches exactly one character.
When repeating 'wildchar' or CTRL-N you cycle through the matches, eventually
ending up back to what was typed. If the first match is not what you wanted,
you can use <S-Tab> or CTRL-P to go straight back to what you typed.
The 'wildignorecase' option can be set to ignore case in filenames. The 'wildignorecase' option can be set to ignore case in filenames.
The 'wildmenu' option can be set to show the matches just above the command The 'wildmenu' option can be set to show the matches just above the command

View File

@ -1,4 +1,4 @@
*options.txt* For Vim version 8.0. Last change: 2018 Apr 22 *options.txt* For Vim version 8.0. Last change: 2018 May 15
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -2561,8 +2561,11 @@ A jump table for the options with a short description can be found at |Q_op|.
contain a list of words. This can be one word per line, or several contain a list of words. This can be one word per line, or several
words per line, separated by non-keyword characters (white space is words per line, separated by non-keyword characters (white space is
preferred). Maximum line length is 510 bytes. preferred). Maximum line length is 510 bytes.
When this option is empty, or an entry "spell" is present, spell
checking is enabled the currently active spelling is used. |spell| When this option is empty or an entry "spell" is present, and spell
checking is enabled, words in the word lists for the currently active
'spelllang' are used. See |spell|.
To include a comma in a file name precede it with a backslash. Spaces To include a comma in a file name precede it with a backslash. Spaces
after a comma are ignored, otherwise spaces are included in the file after a comma are ignored, otherwise spaces are included in the file
name. See |option-backslash| about using backslashes. name. See |option-backslash| about using backslashes.

View File

@ -1,4 +1,4 @@
*todo.txt* For Vim version 8.0. Last change: 2018 May 13 *todo.txt* For Vim version 8.0. Last change: 2018 May 15
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -47,7 +47,7 @@ On Win32 when not in the console and t_Co >= 256, allow using 'tgc'.
(Nobuhiro Takasaki, #2833) Also check t_Co. (Nobuhiro Takasaki, #2833) Also check t_Co.
Pop-up menu overlapping terminal is not cleared completely. (Lifepillar, 2018 Pop-up menu overlapping terminal is not cleared completely. (Lifepillar, 2018
May 13, #2908) May 13, #2908) Hint from Christian, May 14.
balloon_show() does not work properly in the terminal. (Ben Jackson, 2017 Dec balloon_show() does not work properly in the terminal. (Ben Jackson, 2017 Dec
20, #2481) 20, #2481)
@ -1330,7 +1330,7 @@ When evaluating expression in backticks, autoload doesn't work.
(Andy Wokula, 2013 Dec 14) (Andy Wokula, 2013 Dec 14)
Using <nr>ifoobar<esc> can slow down Vim. Patch by Christian Brabandt, 2013 Using <nr>ifoobar<esc> can slow down Vim. Patch by Christian Brabandt, 2013
Dec 13. Dec 13. Only helps a bit, 10000ii<Esc> is still too slow.
GTK: problem with 'L' in 'guioptions' changing the window width. GTK: problem with 'L' in 'guioptions' changing the window width.
(Aaron Cornelius, 2012 Feb 6) (Aaron Cornelius, 2012 Feb 6)
@ -4231,7 +4231,6 @@ Performance:
- Have a look at how pdksh does memory allocation (alloc.c). (Dalecki) - Have a look at how pdksh does memory allocation (alloc.c). (Dalecki)
- Do profiling on: - Do profiling on:
- :g/pat/normal cmd - :g/pat/normal cmd
- 1000ii<Esc>
- deleting 10Mbyte worth of lines (netscape binary) - deleting 10Mbyte worth of lines (netscape binary)
- "[i" and "[d" (Yegappan Lakshmanan) - "[i" and "[d" (Yegappan Lakshmanan)
- ":g/^/m0" on a 450Kbyte file. And the "u". - ":g/^/m0" on a 450Kbyte file. And the "u".
@ -4250,8 +4249,6 @@ Performance:
- Executing a register, e.g. "10000@@" is slow, because ins_typebuf has to - Executing a register, e.g. "10000@@" is slow, because ins_typebuf has to
move the previous commands forward each time. Pass count from move the previous commands forward each time. Pass count from
normal_cmd() down to do_execreg(). normal_cmd() down to do_execreg().
- Repeating insert "1000i-<Esc>" displays --INSERT-- all the time, because of
the <Esc> at the end. Make this work faster (disable redrawing).
- Avoid calls to plines() for cursor line, use w_cline_height. - Avoid calls to plines() for cursor line, use w_cline_height.
- After ":set nowrap" remove superfluous redraw with wrong hor. offset if - After ":set nowrap" remove superfluous redraw with wrong hor. offset if
cursor is right of the screen. cursor is right of the screen.

View File

@ -1410,7 +1410,7 @@ Files: src/os_win32.c
Patch 7.4.161 Patch 7.4.161
Problem: Crash in Python exception handling. Problem: Crash in Python exception handling.
Solution: Only use exception variables if did_throw is set. (ZyX) Solution: Only use exception variables if did_throw is set. (ZyX)
Files: if_py_both.h Files: src/if_py_both.h
Patch 7.4.162 Patch 7.4.162
Problem: Running tests in shadow dir doesn't work. Problem: Running tests in shadow dir doesn't work.
@ -4274,7 +4274,7 @@ Files: src/normal.c
Patch 7.4.642 Patch 7.4.642
Problem: When using "gf" escaped spaces are not handled. Problem: When using "gf" escaped spaces are not handled.
Solution: Recognize escaped spaces. Solution: Recognize escaped spaces.
Files: src/vim.h, src/normal.h, src/window.c, src/misc2.c Files: src/vim.h, src/window.c, src/misc2.c
Patch 7.4.643 Patch 7.4.643
Problem: Using the default file format for Mac files. (Issue 77) Problem: Using the default file format for Mac files. (Issue 77)
@ -6694,7 +6694,7 @@ Files: .travis.yml
Patch 7.4.1046 Patch 7.4.1046
Problem: No test coverage for menus. Problem: No test coverage for menus.
Solution: Load the standard menus and check there is no error. Solution: Load the standard menus and check there is no error.
Files: testdir/test_menu.vim, testdir/test_alot.vim Files: src/testdir/test_menu.vim, src/testdir/test_alot.vim
Patch 7.4.1047 (after patch 7.4.1042) Patch 7.4.1047 (after patch 7.4.1042)
Problem: Tests fail on MS-Windows. Problem: Tests fail on MS-Windows.
@ -7107,7 +7107,7 @@ Files: src/misc1.c, src/fileio.c, src/vim.h
Patch 7.4.1117 (after 7.4.1116) Patch 7.4.1117 (after 7.4.1116)
Problem: No longer get "." and ".." in directory list. Problem: No longer get "." and ".." in directory list.
Solution: Do not skip "." and ".." unless EW_DODOT is set. Solution: Do not skip "." and ".." unless EW_DODOT is set.
Files: src/mics1.c Files: src/misc1.c
Patch 7.4.1118 Patch 7.4.1118
Problem: Tests hang in 24 line terminal. Problem: Tests hang in 24 line terminal.
@ -15856,13 +15856,13 @@ Patch 8.0.0226
Problem: The test for patch 8.0.0224 misses the CR characters and passes Problem: The test for patch 8.0.0224 misses the CR characters and passes
even without the fix. (Christian Brabandt) even without the fix. (Christian Brabandt)
Solution: Use double quotes and \<CR>. Solution: Use double quotes and \<CR>.
Files: src/testidr/test_fileformat.vim Files: src/testdir/test_fileformat.vim
Patch 8.0.0227 Patch 8.0.0227
Problem: Crash when 'fileformat' is forced to "dos" and the first line in Problem: Crash when 'fileformat' is forced to "dos" and the first line in
the file is empty and does not have a CR character. the file is empty and does not have a CR character.
Solution: Don't check for CR before the start of the buffer. Solution: Don't check for CR before the start of the buffer.
Files: src/fileio.c, src/testidr/test_fileformat.vim Files: src/fileio.c, src/testdir/test_fileformat.vim
Patch 8.0.0228 (after 8.0.0210) Patch 8.0.0228 (after 8.0.0210)
Problem: When pasting test in an xterm on the command line it is surrounded Problem: When pasting test in an xterm on the command line it is surrounded
@ -18201,7 +18201,7 @@ Files: src/ex_docmd.c, runtime/filetype.vim, src/Makefile,
Patch 8.0.0614 Patch 8.0.0614
Problem: float2nr() is not exactly right. Problem: float2nr() is not exactly right.
Solution: Make float2nr() more accurate. Turn test64 into a new style test. Solution: Make float2nr() more accurate. Turn test65 into a new style test.
(Hirohito Higashi, closes #1688) (Hirohito Higashi, closes #1688)
Files: src/Makefile, src/evalfunc.c, src/testdir/Make_all.mak, Files: src/Makefile, src/evalfunc.c, src/testdir/Make_all.mak,
src/testdir/Make_vms.mms, src/testdir/test65.in, src/testdir/Make_vms.mms, src/testdir/test65.in,
@ -18238,7 +18238,7 @@ Solution: Check tb_change_cnt in one more place.
Files: src/gui.c Files: src/gui.c
Patch 8.0.0620 Patch 8.0.0620
Problem: Since we only support GTK versions that have it, the ckeck for Problem: Since we only support GTK versions that have it, the check for
HAVE_GTK_MULTIHEAD is no longer needed. HAVE_GTK_MULTIHEAD is no longer needed.
Solution: Remove HAVE_GTK_MULTIHEAD. (Kazunobu Kuriyama) Solution: Remove HAVE_GTK_MULTIHEAD. (Kazunobu Kuriyama)
Files: src/config.h.in, src/configure.ac, src/auto/configure, Files: src/config.h.in, src/configure.ac, src/auto/configure,
@ -18296,7 +18296,7 @@ Files: src/getchar.c
Patch 8.0.0629 (after 8.0.0611) Patch 8.0.0629 (after 8.0.0611)
Problem: Checking for ambigous width is not working. (Hirohito Higashi) Problem: Checking for ambiguous width is not working. (Hirohito Higashi)
Solution: Reset "starting" earlier. Solution: Reset "starting" earlier.
Files: src/main.c Files: src/main.c
@ -18464,7 +18464,7 @@ Files: src/userfunc.c, src/ex_cmds.h, src/testdir/test_vimscript.vim
Patch 8.0.0656 Patch 8.0.0656
Problem: Cannot use ! after some user commands. Problem: Cannot use ! after some user commands.
Solution: Properly check for existing command. (Higashi Higashi) Solution: Properly check for existing command. (Hirohito Higashi)
Files: src/ex_docmd.c, src/testdir/test_vimscript.vim Files: src/ex_docmd.c, src/testdir/test_vimscript.vim
Patch 8.0.0657 Patch 8.0.0657
@ -18977,7 +18977,7 @@ Files: src/configure.ac, src/auto/configure
Patch 8.0.0730 Patch 8.0.0730
Problem: Terminal feature only supports Unix-like systems. Problem: Terminal feature only supports Unix-like systems.
Solution: Prepare for adding an MS-Windows implementaiton. Solution: Prepare for adding an MS-Windows implementation.
Files: src/terminal.c Files: src/terminal.c
Patch 8.0.0731 Patch 8.0.0731
@ -19204,7 +19204,7 @@ Files: src/option.c
Patch 8.0.0767 Patch 8.0.0767
Problem: Build failure with Athena and Motif. Problem: Build failure with Athena and Motif.
Solution: Move local variable delcarations. (Kazunobu Kuriyama) Solution: Move local variable declarations. (Kazunobu Kuriyama)
Files: src/gui_x11.c Files: src/gui_x11.c
Patch 8.0.0768 Patch 8.0.0768
@ -19251,7 +19251,7 @@ Files: src/term.c
Patch 8.0.0775 Patch 8.0.0775
Problem: In a terminal the cursor is updated too often. Problem: In a terminal the cursor is updated too often.
Solution: Only flush when needed. (Yasuhiro Matsumoto). Remeber whether the Solution: Only flush when needed. (Yasuhiro Matsumoto). Remember whether the
cursor is visible. (closes #1873) cursor is visible. (closes #1873)
Files: src/terminal.c Files: src/terminal.c
@ -19275,7 +19275,7 @@ Files: src/terminal.c
Patch 8.0.0779 Patch 8.0.0779
Problem: :term without an argument uses empty buffer name but runs the Problem: :term without an argument uses empty buffer name but runs the
snell. shell.
Solution: Change the command to the shell earlier. Solution: Change the command to the shell earlier.
Files: src/terminal.c Files: src/terminal.c
@ -19314,12 +19314,12 @@ Files: src/ex_cmds.h, src/ex_docmd.c
Patch 8.0.0786 Patch 8.0.0786
Problem: Build failures on Travis. Problem: Build failures on Travis.
Solution: Go back to precise termporarily. Disable coverage with clang. Solution: Go back to precise temporarily. Disable coverage with clang.
Files: .travis.yml Files: .travis.yml
Patch 8.0.0787 Patch 8.0.0787
Problem: Cannot send CTRL-W command to terminal job. Problem: Cannot send CTRL-W command to terminal job.
Solution: Make CTRL-W . a prefex for sending a key to the job. Solution: Make CTRL-W . a prefix for sending a key to the job.
Files: src/terminal.c, runtime/doc/terminal.txt, src/option.c Files: src/terminal.c, runtime/doc/terminal.txt, src/option.c
Patch 8.0.0788 Patch 8.0.0788
@ -19604,7 +19604,7 @@ Solution: don't redraw at a prompt or when scrolled up. (Christian Brabandt,
Files: src/screen.c Files: src/screen.c
Patch 8.0.0838 Patch 8.0.0838
Problem: Buffer hangs around whem terminal window is closed. Problem: Buffer hangs around when terminal window is closed.
Solution: When the job has ended wipe out a terminal buffer when the window Solution: When the job has ended wipe out a terminal buffer when the window
is closed. is closed.
Files: src/buffer.c, src/terminal.c, src/proto/terminal.pro, Files: src/buffer.c, src/terminal.c, src/proto/terminal.pro,
@ -19812,7 +19812,7 @@ Files: src/screen.c
Patch 8.0.0872 Patch 8.0.0872
Problem: Using mouse scroll while a terminal window has focus and the mouse Problem: Using mouse scroll while a terminal window has focus and the mouse
pointer is on another window does not work. Same for focus in a pointer is on another window does not work. Same for focus in a
non-terminal window ahd the mouse pointer is over a terminal non-terminal window and the mouse pointer is over a terminal
window. window.
Solution: Send the scroll action to the right window. Solution: Send the scroll action to the right window.
Files: src/terminal.c, src/normal.c, src/proto/terminal.pro Files: src/terminal.c, src/normal.c, src/proto/terminal.pro
@ -19882,7 +19882,7 @@ Files: src/misc1.c
Patch 8.0.0884 Patch 8.0.0884
Problem: Can't specify the wait time for term_wait(). Problem: Can't specify the wait time for term_wait().
Solution: Add an otional second argument. Solution: Add an optional second argument.
Files: src/evalfunc.c, src/terminal.c, runtime/doc/eval.txt Files: src/evalfunc.c, src/terminal.c, runtime/doc/eval.txt
Patch 8.0.0885 Patch 8.0.0885
@ -19949,7 +19949,7 @@ Solution: Fix file names.
Files: src/testdir/test_filetype.vim Files: src/testdir/test_filetype.vim
Patch 8.0.0896 Patch 8.0.0896
Problem: Cannot automaticlaly close a terminal window when the job ends. Problem: Cannot automatically close a terminal window when the job ends.
Solution: Add the ++close argument to :term. Add the term_finish option to Solution: Add the ++close argument to :term. Add the term_finish option to
term_start(). (Yasuhiro Matsumoto, closes #1950) Also add term_start(). (Yasuhiro Matsumoto, closes #1950) Also add
++open. ++open.
@ -19963,7 +19963,7 @@ Files: src/channel.c
Patch 8.0.0898 Patch 8.0.0898
Problem: Can't use the alternate screen in a terminal window. Problem: Can't use the alternate screen in a terminal window.
Solution: Initialze the alternate screen. (Yasuhiro Matsumoto, closes Solution: Initialize the alternate screen. (Yasuhiro Matsumoto, closes
#1957) Add term_getaltscreen(). #1957) Add term_getaltscreen().
Files: src/libvterm/include/vterm.h, src/terminal.c, Files: src/libvterm/include/vterm.h, src/terminal.c,
src/proto/terminal.pro, src/evalfunc.c, runtime/doc/eval.txt src/proto/terminal.pro, src/evalfunc.c, runtime/doc/eval.txt
@ -20095,7 +20095,7 @@ Files: src/term.c
Patch 8.0.0920 Patch 8.0.0920
Problem: The cursor shape is wrong after switch back from an alternate Problem: The cursor shape is wrong after switch back from an alternate
screen in a terminal window. (arius Gedminas) screen in a terminal window. (Marius Gedminas)
Solution: Change bitfield to unsigned. Set flag that cursor shape was set. Solution: Change bitfield to unsigned. Set flag that cursor shape was set.
Files: src/terminal.c, src/libvterm/src/vterm_internal.h Files: src/terminal.c, src/libvterm/src/vterm_internal.h
@ -20242,7 +20242,7 @@ Files: src/main.c
Patch 8.0.0947 Patch 8.0.0947
Problem: When in Insert mode and using CTRL-O CTRL-W CTRL-W to move to a Problem: When in Insert mode and using CTRL-O CTRL-W CTRL-W to move to a
termainal window, get in a weird Insert mode. terminal window, get in a weird Insert mode.
Solution: Don't go to Insert mode in a terminal window. (closes #1977) Solution: Don't go to Insert mode in a terminal window. (closes #1977)
Files: src/normal.c Files: src/normal.c
@ -20440,7 +20440,7 @@ Files: src/terminal.c
Patch 8.0.0982 Patch 8.0.0982
Problem: When 'encoding' is set to a multi-byte encoding other than utf-8 Problem: When 'encoding' is set to a multi-byte encoding other than utf-8
the characters from ther terminal are messed up. the characters from their terminal are messed up.
Solution: Convert displayed text from utf-8 to 'encoding' for MS-Windows. Solution: Convert displayed text from utf-8 to 'encoding' for MS-Windows.
(Yasuhiro Matsumoto, close #2000) (Yasuhiro Matsumoto, close #2000)
Files: src/terminal.c Files: src/terminal.c
@ -20521,7 +20521,7 @@ Solution: Add workaround: sleep a moment in between sending keys.
Files: src/testdir/test_terminal.vim Files: src/testdir/test_terminal.vim
Patch 8.0.0996 Patch 8.0.0996
Problem: Mac: t_RS is echoed on the screne in Terminal.app. Even though Problem: Mac: t_RS is echoed on the screen in Terminal.app. Even though
$TERM is set to "xterm-256colors" it cannot handle this xterm $TERM is set to "xterm-256colors" it cannot handle this xterm
escape sequence. escape sequence.
Solution: Recognize Terminal.app from the termresponse and skip sending t_RS Solution: Recognize Terminal.app from the termresponse and skip sending t_RS
@ -20529,7 +20529,7 @@ Solution: Recognize Terminal.app from the termresponse and skip sending t_RS
Files: src/term.c Files: src/term.c
Patch 8.0.0997 (after 8.0.0996) Patch 8.0.0997 (after 8.0.0996)
Problem: Libvterm and Terminal.app not regognized from termresponse. Problem: Libvterm and Terminal.app not recognized from termresponse.
Solution: Adjust string compare. Solution: Adjust string compare.
Files: src/term.c Files: src/term.c
@ -20580,7 +20580,7 @@ Solution: Poll for input when a channel has the keep_open flag.
Files: src/channel.c, src/proto/channel.pro, src/gui_gtk_x11.c Files: src/channel.c, src/proto/channel.pro, src/gui_gtk_x11.c
Patch 8.0.1006 Patch 8.0.1006
Problem: Cannot parse text with 'erroformat' without changing a quickfix Problem: Cannot parse text with 'errorformat' without changing a quickfix
list. list.
Solution: Add the "text" argument to getqflist(). (Yegappan Lakshmanan) Solution: Add the "text" argument to getqflist(). (Yegappan Lakshmanan)
Files: runtime/doc/eval.txt, src/evalfunc.c, src/proto/quickfix.pro, Files: runtime/doc/eval.txt, src/evalfunc.c, src/proto/quickfix.pro,
@ -20614,7 +20614,7 @@ Solution: Ignore the error for the input context. (Kazunobu Kuriyama)
Files: src/testdir/test_terminal.vim Files: src/testdir/test_terminal.vim
Patch 8.0.1012 Patch 8.0.1012
Problem: MS-Windows: Problem with $HOME when is was set internally. Problem: MS-Windows: Problem with $HOME when it was set internally.
Solution: Only use the $HOME default internally. (Yasuhiro Matsumoto, closes Solution: Only use the $HOME default internally. (Yasuhiro Matsumoto, closes
#2013) #2013)
Files: src/misc1.c, src/testdir/Make_all.mak, src/Makefile, Files: src/misc1.c, src/testdir/Make_all.mak, src/Makefile,
@ -20665,7 +20665,7 @@ Solution: Increment tb_change_cnt in inchar(). (closes #1940)
Files: src/getchar.c Files: src/getchar.c
Patch 8.0.1021 Patch 8.0.1021
Problem: Older Gnome terminal still echoes t_RC. (Fracois Ingelrest) Problem: Older Gnome terminal still echoes t_RC. (Fraois Ingelrest)
Solution: Check for version > 3000 instead of 4000. Solution: Check for version > 3000 instead of 4000.
Files: src/term.c Files: src/term.c
@ -20695,7 +20695,7 @@ Files: src/testdir/test_mksession.vim
Patch 8.0.1026 Patch 8.0.1026
Problem: GTK on-the-spot input has problems. (Gerd Wachsmuth) Problem: GTK on-the-spot input has problems. (Gerd Wachsmuth)
Solution: Support over-the-spot. (Yukihiro Nakadaira, Ketn Takata, closes Solution: Support over-the-spot. (Yukihiro Nakadaira, Ken Takata, closes
#1215) #1215)
Files: runtime/doc/mbyte.txt, runtime/doc/options.txt, src/edit.c, Files: runtime/doc/mbyte.txt, runtime/doc/options.txt, src/edit.c,
src/ex_getln.c, src/mbyte.c, src/misc1.c, src/option.c, src/ex_getln.c, src/mbyte.c, src/misc1.c, src/option.c,
@ -20877,7 +20877,7 @@ Solution: Avoid message for writing file. Source shared.vim when running
Files: src/testdir/test_bufline.vim, src/testdir/test_timers.vim Files: src/testdir/test_bufline.vim, src/testdir/test_timers.vim
Patch 8.0.1056 Patch 8.0.1056
Problem: Cannot build with the diff feature but without the mutli-byte Problem: Cannot build with the diff feature but without the multi-byte
feature. feature.
Solution: Remove #ifdefs. (John Marriott) Solution: Remove #ifdefs. (John Marriott)
Files: src/diff.c Files: src/diff.c
@ -20899,7 +20899,7 @@ Solution: Lower version limit from 2800 to 2500. (#2032)
Files: src/term.c Files: src/term.c
Patch 8.0.1060 Patch 8.0.1060
Problem: When imstyle is one, mapping <Left> breaks preediting. Problem: When imstyle is zero, mapping <Left> breaks preediting.
Solution: Pass though preediting key-events. (Yasuhiro Matsumoto, closes Solution: Pass though preediting key-events. (Yasuhiro Matsumoto, closes
#2064, closes #2063) #2064, closes #2063)
Files: src/getchar.c, src/mbyte.c Files: src/getchar.c, src/mbyte.c
@ -21107,13 +21107,13 @@ Solution: Also detect Terminal.app on non-Mac systems.
Files: src/term.c Files: src/term.c
Patch 8.0.1095 Patch 8.0.1095
Problem: Terminal multibyte escrape test is flaky. Problem: Terminal multibyte scrape test is flaky.
Solution: Add another condition to wait for. Solution: Add another condition to wait for.
Files: src/testdir/test_terminal.vim Files: src/testdir/test_terminal.vim
Patch 8.0.1096 Patch 8.0.1096
Problem: Terminal window in Normal mode has wrong background. Problem: Terminal window in Normal mode has wrong background.
Solution: Store the default background and use it for clearning until the Solution: Store the default background and use it for clearing until the
end of the line. Not for below the last line, since there is no end of the line. Not for below the last line, since there is no
text there. text there.
Files: src/screen.c, src/terminal.c Files: src/screen.c, src/terminal.c
@ -21178,7 +21178,7 @@ Files: src/terminal.c
Patch 8.0.1107 Patch 8.0.1107
Problem: Terminal debugger jumps to non-existing file. Problem: Terminal debugger jumps to non-existing file.
Solution: Check that the file exists. Add an option to make the Vim wide Solution: Check that the file exists. Add an option to make the Vim width
wide. Fix removing highlight groups. wide. Fix removing highlight groups.
Files: runtime/pack/dist/opt/termdebug/plugin/termdebug.vim, Files: runtime/pack/dist/opt/termdebug/plugin/termdebug.vim,
runtime/doc/terminal.txt runtime/doc/terminal.txt
@ -21311,7 +21311,7 @@ Solution: Set a flag to prevent resizing the window.
Files: src/terminal.c Files: src/terminal.c
Patch 8.0.1127 Patch 8.0.1127
Problem: Test_peek_and_get_char fails on 32 bit system. (Eliminate Problem: Test_peek_and_get_char fails on 32 bit system. (Elimar
Riesebieter) Riesebieter)
Solution: Avoid an integer overflow. (James McCoy, closes #2116) Solution: Avoid an integer overflow. (James McCoy, closes #2116)
Files: src/ex_cmds2.c Files: src/ex_cmds2.c
@ -21415,12 +21415,12 @@ Files: src/vim.h, src/structs.h, src/gui.c, src/ex_getln.c, src/screen.c
Patch 8.0.1144 Patch 8.0.1144
Problem: Using wrong #ifdef for computing length. Problem: Using wrong #ifdef for computing length.
Solution: use BACKSLASH_IN_FILENAME instead of COLON_IN_FILENAME. (Yasuhiro Solution: use BACKSLASH_IN_FILENAME instead of COLON_IN_FILENAME. (Yasuhiro
Matsomoto, closes #2153) Matsumoto, closes #2153)
Files: src/quickfix.c Files: src/quickfix.c
Patch 8.0.1145 Patch 8.0.1145
Problem: Warning when compiling with Perl. Problem: Warning when compiling with Perl.
Solution: Remove unused variable. (Ken Takata0 Solution: Remove unused variable. (Ken Takata)
Files: src/if_perl.xs Files: src/if_perl.xs
Patch 8.0.1146 Patch 8.0.1146
@ -21447,7 +21447,7 @@ Files: src/terminal.c, src/libvterm/src/pen.c,
Patch 8.0.1150 Patch 8.0.1150
Problem: MS-Windows GUI: dialog font size is incorrect. Problem: MS-Windows GUI: dialog font size is incorrect.
Solution: Pass flag to indicate 'encoding' or active codepage. (Yasuhiro Solution: Pass flag to indicate 'encoding' or active codepage. (Yasuhiro
Matsomoto, closes #2160) Matsumoto, closes #2160)
Files: src/gui_w32.c Files: src/gui_w32.c
Patch 8.0.1151 Patch 8.0.1151
@ -21546,7 +21546,7 @@ Files: src/pty.c
Patch 8.0.1167 Patch 8.0.1167
Problem: Motif: typing in terminal window is slow. Problem: Motif: typing in terminal window is slow.
Solution: Do not redraw the whole terminal window but only was was changed. Solution: Do not redraw the whole terminal window but only what was changed.
Files: src/terminal.c Files: src/terminal.c
Patch 8.0.1168 Patch 8.0.1168
@ -21557,7 +21557,7 @@ Files: src/screen.c, src/testdir/test_highlight.vim,
src/testdir/view_util.vim src/testdir/view_util.vim
Patch 8.0.1169 Patch 8.0.1169
Problem: Highlignting one char too many with 'list' and 'cul'. Problem: Highlighting one char too many with 'list' and 'cul'.
Solution: Check for 'list' being active. (Ozaki Kiichi, closes #2177) Solution: Check for 'list' being active. (Ozaki Kiichi, closes #2177)
Files: src/screen.c, src/testdir/test_highlight.vim Files: src/screen.c, src/testdir/test_highlight.vim
@ -21717,7 +21717,7 @@ Files: src/term.c, src/terminal.c
Patch 8.0.1196 (after 8.0.1194) Patch 8.0.1196 (after 8.0.1194)
Problem: Crash when t_RF is not set. (Brian Pina) Problem: Crash when t_RF is not set. (Brian Pina)
Solution: Add t_RF to the list of terminal options. (Hirohito Higashi) Solution: Add t_RF to the list of terminal options. (Hirohito Higashi)
Files: src/options.c Files: src/option.c
Patch 8.0.1197 Patch 8.0.1197
Problem: MS-Windows build instructions are not up to date. Problem: MS-Windows build instructions are not up to date.
@ -21754,7 +21754,7 @@ Solution: Don't use 'scrolloff' when an operator is pending.
Files: src/normal.c, runtime/doc/motion.txt Files: src/normal.c, runtime/doc/motion.txt
Patch 8.0.1202 Patch 8.0.1202
Problem: :wall gives an errof for a terminal window. (Marius Gedminas) Problem: :wall gives an error for a terminal window. (Marius Gedminas)
Solution: Don't try writing a buffer that can't be written. (Yasuhiro Solution: Don't try writing a buffer that can't be written. (Yasuhiro
Matsumoto, closes #2190) Matsumoto, closes #2190)
Files: src/ex_cmds.c, src/testdir/test_terminal.vim Files: src/ex_cmds.c, src/testdir/test_terminal.vim
@ -22000,8 +22000,8 @@ Files: src/Makefile, src/option.c, src/testdir/test_alot.vim,
Patch 8.0.1238 Patch 8.0.1238
Problem: Incremental search only shows one match. Problem: Incremental search only shows one match.
Solution: When 'incsearch' and and 'hlsearch' are both set highlight all Solution: When 'incsearch' and 'hlsearch' are both set highlight all
matches. (haya14busa, closes #2198) matches. (haya14busa, itchyny closes #2198)
Files: runtime/doc/options.txt, src/ex_getln.c, src/proto/search.pro, Files: runtime/doc/options.txt, src/ex_getln.c, src/proto/search.pro,
src/search.c, src/testdir/test_search.vim src/search.c, src/testdir/test_search.vim
@ -22067,7 +22067,7 @@ Files: README.md
Patch 8.0.1249 Patch 8.0.1249
Problem: No error when WaitFor() gets an invalid wrong expression. Problem: No error when WaitFor() gets an invalid wrong expression.
Solution: Do not ignore errors in evaluationg the expression. Fix places Solution: Do not ignore errors in evaluation of the expression. Fix places
where the expression was wrong. where the expression was wrong.
Files: src/testdir/shared.vim, src/testdir/test_netbeans.vim Files: src/testdir/shared.vim, src/testdir/test_netbeans.vim
@ -22080,7 +22080,7 @@ Files: runtime/doc/options.txt, src/ex_getln.c,
src/testdir/test_search.vim src/testdir/test_search.vim
Patch 8.0.1251 (after 8.0.1249) Patch 8.0.1251 (after 8.0.1249)
Problem: Invalid expressin passed to WaitFor(). Problem: Invalid expression passed to WaitFor().
Solution: Check if the variable exists. Solution: Check if the variable exists.
Files: src/testdir/test_clientserver.vim Files: src/testdir/test_clientserver.vim
@ -22256,7 +22256,7 @@ Files: runtime/doc/options.txt, src/gui.c, src/gui_gtk_x11.c,
Patch 8.0.1279 Patch 8.0.1279
Problem: Initializing menus can be slow, especially when there are many Problem: Initializing menus can be slow, especially when there are many
keymaps, color schemes, etc. keymaps, color schemes, etc.
Solution: Do the globbing for runtime files lazlily. (Ken Takata) Solution: Do the globbing for runtime files lazily. (Ken Takata)
Files: runtime/doc/gui.txt, runtime/menu.vim Files: runtime/doc/gui.txt, runtime/menu.vim
Patch 8.0.1280 Patch 8.0.1280
@ -22271,7 +22271,7 @@ Solution: Move functions to an autoload script.
Files: runtime/filetype.vim, runtime/autoload/filetype.vim, Files: runtime/filetype.vim, runtime/autoload/filetype.vim,
runtime/scripts.vim runtime/scripts.vim
Patch 8.0.1282 (after 8.0.1282) Patch 8.0.1282 (after 8.0.1281)
Problem: script-local variable defined in the wrong script Problem: script-local variable defined in the wrong script
Solution: Move variable to autoload/filetype.vim. Solution: Move variable to autoload/filetype.vim.
Files: runtime/filetype.vim, runtime/autoload/filetype.vim Files: runtime/filetype.vim, runtime/autoload/filetype.vim
@ -22492,7 +22492,7 @@ Solution: Remove bogus typedef.
Files: src/os_macosx.m Files: src/os_macosx.m
Patch 8.0.1316 (after 8.0.1312) Patch 8.0.1316 (after 8.0.1312)
Problem: Build still still fails on Mac. (chdiza) Problem: Build still fails on Mac. (chdiza)
Solution: Remove another bogus typedef. Solution: Remove another bogus typedef.
Files: src/os_mac_conv.c Files: src/os_mac_conv.c
@ -22805,7 +22805,7 @@ Solution: Adjust mouse row and column computation. (Yasuhiro Matsumoto,
Files: src/terminal.c Files: src/terminal.c
Patch 8.0.1369 Patch 8.0.1369
Problem: MS-Windows: drawing underline, curl and strike-throw is slow, Problem: MS-Windows: drawing underline, curl and strikethrough is slow,
mFallbackDC not properly updated. mFallbackDC not properly updated.
Solution: Several performance improvements. (Ken Takata, Taro Muraoka, Solution: Several performance improvements. (Ken Takata, Taro Muraoka,
Yasuhiro Matsumoto, closes #2401) Yasuhiro Matsumoto, closes #2401)
@ -22814,7 +22814,7 @@ Files: runtime/doc/options.txt, src/gui_dwrite.cpp, src/gui_dwrite.h,
Patch 8.0.1370 Patch 8.0.1370
Problem: Channel test for callback is flaky. Problem: Channel test for callback is flaky.
Solution: Add the test to thelist of flaky tests. Solution: Add the test to the list of flaky tests.
Files: src/testdir/runtest.vim Files: src/testdir/runtest.vim
Patch 8.0.1371 Patch 8.0.1371
@ -22829,7 +22829,7 @@ Solution: Find the start of the character. (Ozaki Kiichi, closes #2385)
Files: src/ex_cmds2.c, src/testdir/test_profile.vim Files: src/ex_cmds2.c, src/testdir/test_profile.vim
Patch 8.0.1373 Patch 8.0.1373
Problem: No error when settting 'renderoptions' to an invalid value before Problem: No error when setting 'renderoptions' to an invalid value before
starting the GUI. starting the GUI.
Solution: Always check the value. (Ken Takata, closes #2413) Solution: Always check the value. (Ken Takata, closes #2413)
Files: src/gui_w32.c, src/option.c Files: src/gui_w32.c, src/option.c
@ -23258,7 +23258,7 @@ Files: runtime/doc/autocmd.txt, src/ex_getln.c, src/fileio.c,
src/testdir/test_autocmd.vim, src/vim.h src/testdir/test_autocmd.vim, src/vim.h
Patch 8.0.1446 Patch 8.0.1446
Problem: Acessing freed memory after window command in auto command. Problem: Accessing freed memory after window command in auto command.
(gy741) (gy741)
Solution: Adjust the pointer in the parent frame. (Christian Brabandt, Solution: Adjust the pointer in the parent frame. (Christian Brabandt,
closes #2467) closes #2467)
@ -23428,7 +23428,7 @@ Files: src/gui.c
Patch 8.0.1472 Patch 8.0.1472
Problem: MS-Windows: nsis installer is a bit slow. Problem: MS-Windows: nsis installer is a bit slow.
Solution: Use ReserveFile for vimrc.ini. (closes #2522) Solution: Use ReserveFile for vimrc.ini. (Ken Takata, closes #2522)
Files: nsis/gvim.nsi Files: nsis/gvim.nsi
Patch 8.0.1473 Patch 8.0.1473
@ -23496,7 +23496,7 @@ Solution: When the second search times out, do not accept a match from the
Files: src/search.c Files: src/search.c
Patch 8.0.1484 Patch 8.0.1484
Problem: Reduntant conditions. Problem: Redundant conditions.
Solution: Remove them. (Dominique Pelle) Solution: Remove them. (Dominique Pelle)
Files: src/terminal.c Files: src/terminal.c
@ -23693,7 +23693,7 @@ Files: runtime/doc/eval.txt, runtime/doc/usr_41.txt, src/evalfunc.c,
Patch 8.0.1515 Patch 8.0.1515
Problem: BufWinEnter event fired when opening hidden terminal. Problem: BufWinEnter event fired when opening hidden terminal.
Solution: Do not fire BufWinEnter when the terminal is midden and does not Solution: Do not fire BufWinEnter when the terminal is hidden and does not
open a window. (Kenta Sato, closes #2636) open a window. (Kenta Sato, closes #2636)
Files: src/terminal.c Files: src/terminal.c
@ -23703,7 +23703,7 @@ Solution: Add more specific error messages.
Files: src/channel.c, src/globals.h Files: src/channel.c, src/globals.h
Patch 8.0.1517 Patch 8.0.1517
Problem: Invalid memory acces with pattern using look-behind match. Problem: Invalid memory access with pattern using look-behind match.
(Dominique Pelle) (Dominique Pelle)
Solution: Get a pointer to the right line. Solution: Get a pointer to the right line.
Files: src/regexp.c Files: src/regexp.c
@ -23832,7 +23832,7 @@ Files: src/xxd/xxd.c
Patch 8.0.1538 Patch 8.0.1538
Problem: Popupmenu is too far left when completion is long. (Linwei) Problem: Popupmenu is too far left when completion is long. (Linwei)
Solution: Adjust column computations. (Hirohito Higashi, closes #2661) Solution: Adjust column computations. (Hirohito Higashi, closes #2661)
Files: src/popupmenu.c Files: src/popupmnu.c
Patch 8.0.1539 Patch 8.0.1539
Problem: No test for the popup menu positioning. Problem: No test for the popup menu positioning.
@ -23860,7 +23860,7 @@ Files: src/syntax.c
Patch 8.0.1542 Patch 8.0.1542
Problem: Terminal screen dump does not include cursor position. Problem: Terminal screen dump does not include cursor position.
Solution: Mark the cursor position in the cump. Solution: Mark the cursor position in the dump.
Files: src/terminal.c, Files: src/terminal.c,
src/testdir/dumps/Test_popup_position_01.dump, src/testdir/dumps/Test_popup_position_01.dump,
src/testdir/dumps/Test_popup_position_02.dump, src/testdir/dumps/Test_popup_position_02.dump,
@ -23892,7 +23892,7 @@ Files: src/getchar.c, src/terminal.c
Patch 8.0.1547 Patch 8.0.1547
Problem: Undo in the options window makes it empty. Problem: Undo in the options window makes it empty.
Solution: Set 'undolevels' while filling the buffer. (Yasuhiro Matthew, Solution: Set 'undolevels' while filling the buffer. (Yasuhiro Matsumoto,
closes #2645) closes #2645)
Files: runtime/optwin.vim Files: runtime/optwin.vim
@ -23925,7 +23925,7 @@ Files: src/os_unix.c
Patch 8.0.1552 Patch 8.0.1552
Problem: May leak file descriptors when executing job. Problem: May leak file descriptors when executing job.
Solution: Close more file descriptors. (Ozaki Kiichi, closes #2531) Solution: Close more file descriptors. (Ozaki Kiichi, closes #2651)
Files: src/os_unix.c, src/testdir/test_channel.vim Files: src/os_unix.c, src/testdir/test_channel.vim
Patch 8.0.1553 Patch 8.0.1553
@ -23978,7 +23978,7 @@ Solution: Adjust #ifdef for vcol2col().
Files: src/ui.c Files: src/ui.c
Patch 8.0.1561 Patch 8.0.1561
Problem: Crash with rust syntax highligting. (Edd Barrett) Problem: Crash with rust syntax highlighting. (Edd Barrett)
Solution: Avoid going past the end of an empty line. Solution: Avoid going past the end of an empty line.
Files: src/syntax.c Files: src/syntax.c
@ -24121,7 +24121,7 @@ Files: src/quickfix.c
Patch 8.0.1584 Patch 8.0.1584
Problem: Using C99 in Mac file gives compiler warning messages. Problem: Using C99 in Mac file gives compiler warning messages.
Solution: Add #prama's to avoid the warnings. (Kazunobu Kuriyama) Solution: Add #pragmas to avoid the warnings. (Kazunobu Kuriyama)
Files: src/os_macosx.m Files: src/os_macosx.m
Patch 8.0.1585 Patch 8.0.1585
@ -24191,7 +24191,7 @@ Files: src/ex_docmd.c, src/fileio.c, src/vim.h,
Patch 8.0.1596 Patch 8.0.1596
Problem: No autocommand specifically for opening a terminal window. Problem: No autocommand specifically for opening a terminal window.
Solution: Add TerminalOpen. (?, closes #2484) Solution: Add TerminalOpen. (Yasuhiro Matsumoto, closes #2484)
Files: runtime/doc/autocmd.txt, src/fileio.c, src/terminal.c, Files: runtime/doc/autocmd.txt, src/fileio.c, src/terminal.c,
src/testdir/test_terminal.vim, src/vim.h src/testdir/test_terminal.vim, src/vim.h
@ -24382,7 +24382,7 @@ Files: src/os_unix.c
Patch 8.0.1630 Patch 8.0.1630
Problem: Trimming white space is not that easy. Problem: Trimming white space is not that easy.
Solution: Add the trim() function. (Bukn, closes #1280) Solution: Add the trim() function. (Bukn, Yasuhiro Matsumoto, closes #1280)
Files: src/evalfunc.c, runtime/doc/eval.txt, Files: src/evalfunc.c, runtime/doc/eval.txt,
src/testdir/test_functions.vim src/testdir/test_functions.vim
@ -24400,7 +24400,7 @@ Files: src/terminal.c
Patch 8.0.1633 Patch 8.0.1633
Problem: A TextChanged autocmd triggers when it is defined after creating a Problem: A TextChanged autocmd triggers when it is defined after creating a
buffer. buffer.
Solution: Set b_last_changedtick when opening a buffer. (Hirohito Highlight, Solution: Set b_last_changedtick when opening a buffer. (Hirohito Higashi,
closes #2742) closes #2742)
Files: src/buffer.c, src/testdir/test_autocmd.vim Files: src/buffer.c, src/testdir/test_autocmd.vim
@ -24672,7 +24672,7 @@ Files: src/ops.c
Patch 8.0.1680 Patch 8.0.1680
Problem: Memory allocated by libvterm does not show up in profile. Problem: Memory allocated by libvterm does not show up in profile.
Solution: Pass allocater functions to vterm_new(). Solution: Pass allocator functions to vterm_new().
Files: src/terminal.c Files: src/terminal.c
Patch 8.0.1681 Patch 8.0.1681
@ -24743,7 +24743,7 @@ Solution: Wipe out the XXDfile buffer.
Files: src/testdir/test_xxd.vim Files: src/testdir/test_xxd.vim
Patch 8.0.1692 (after 8.0.1686) Patch 8.0.1692 (after 8.0.1686)
Problem: Python may not work when using statically linked library . Problem: Python may not work when using statically linked library.
Solution: Do not define PYTHON_HOME and PYTHON3_HOME in configure if the Solution: Do not define PYTHON_HOME and PYTHON3_HOME in configure if the
Python library is linked statically. Python library is linked statically.
Files: src/configure.ac, src/auto/configure Files: src/configure.ac, src/auto/configure
@ -24764,7 +24764,7 @@ Solution: Use xxd.exe if it exists.
Files: src/testdir/test_xxd.vim Files: src/testdir/test_xxd.vim
Patch 8.0.1696 Patch 8.0.1696
Problem: Coverate statistics don't work. Problem: Coverage statistics don't work.
Solution: Include the xxd directory. (Christian Brabandt) Solution: Include the xxd directory. (Christian Brabandt)
Files: .travis.yml Files: .travis.yml
@ -24776,7 +24776,7 @@ Files: src/testdir/shared.vim, src/testdir/screendump.vim,
src/testdir/test_quotestar.vim, src/testdir/test_terminal.vim src/testdir/test_quotestar.vim, src/testdir/test_terminal.vim
Patch 8.0.1698 Patch 8.0.1698
Problem: Coverate statistics don't work on coveralls. Problem: Coverage statistics don't work on coveralls.
Solution: Use curly braces for $SRCDIR. Solution: Use curly braces for $SRCDIR.
Files: .travis.yml Files: .travis.yml
@ -24787,7 +24787,7 @@ Files: src/Makefile, src/config.aap.in, src/config.mk.in,
src/configure.ac, src/auto/configure src/configure.ac, src/auto/configure
Patch 8.0.1700 Patch 8.0.1700
Problem: Coverate statistics still don't work on coveralls. Problem: Coverage statistics still don't work on coveralls.
Solution: Exclude the xxd directory again. Solution: Exclude the xxd directory again.
Files: .travis.yml Files: .travis.yml
@ -24820,7 +24820,7 @@ Solution: Only reset clear_cmdline when filling all columns of the last
Files: src/screen.c, src/testdir/test_window_cmd.vim Files: src/screen.c, src/testdir/test_window_cmd.vim
Patch 8.0.1706 Patch 8.0.1706
Problem: Cannot sent CTRL-\ to a terminal window. Problem: Cannot send CTRL-\ to a terminal window.
Solution: Make CTRL-W CTRL-\ send CTRL-\ to a terminal window. Solution: Make CTRL-W CTRL-\ send CTRL-\ to a terminal window.
Files: src/terminal.c, runtime/doc/terminal.txt Files: src/terminal.c, runtime/doc/terminal.txt

View File

@ -3,7 +3,7 @@
" Author: John Wellesz <John.wellesz (AT) teaser (DOT) fr> " Author: John Wellesz <John.wellesz (AT) teaser (DOT) fr>
" URL: http://www.2072productions.com/vim/indent/php.vim " URL: http://www.2072productions.com/vim/indent/php.vim
" Home: https://github.com/2072/PHP-Indenting-for-VIm " Home: https://github.com/2072/PHP-Indenting-for-VIm
" Last Change: 2017 Jun 13 " Last Change: 2018 May 14
" Version: 1.62 " Version: 1.62
" "
" "
@ -12,7 +12,7 @@
" A fully commented version of this file is available on github " A fully commented version of this file is available on github
" "
" "
" If you find a bug, please open a ticket on github.org " If you find a bug, please open a ticket on github.com
" ( https://github.com/2072/PHP-Indenting-for-VIm/issues ) with an example of " ( https://github.com/2072/PHP-Indenting-for-VIm/issues ) with an example of
" code that breaks the algorithm. " code that breaks the algorithm.
" "

View File

@ -1,7 +1,7 @@
" Vim syntax file " Vim syntax file
" Language: php PHP 3/4/5/7 " Language: php PHP 3/4/5/7
" Maintainer: Jason Woofenden <jason@jasonwoof.com> " Maintainer: Jason Woofenden <jason@jasonwoof.com>
" Last Change: Jul 14, 2017 " Last Change: May 12, 2018
" URL: https://jasonwoof.com/gitweb/?p=vim-syntax.git;a=blob;f=php.vim;hb=HEAD " URL: https://jasonwoof.com/gitweb/?p=vim-syntax.git;a=blob;f=php.vim;hb=HEAD
" Former Maintainers: Peter Hodge <toomuchphp-vim@yahoo.com> " Former Maintainers: Peter Hodge <toomuchphp-vim@yahoo.com>
" Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org> " Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
@ -261,7 +261,7 @@ syn keyword phpStatement return break continue exit goto yield contained
syn keyword phpKeyword var const contained syn keyword phpKeyword var const contained
" Type " Type
syn keyword phpType bool boolean int integer real double float string array object NULL callable iterable contained syn keyword phpType void bool boolean int integer real double float string array object NULL callable iterable contained
" Structure " Structure
syn keyword phpStructure namespace extends implements instanceof parent self contained syn keyword phpStructure namespace extends implements instanceof parent self contained

View File

@ -4399,7 +4399,9 @@ ExpandMappings(
/* /*
* Check for an abbreviation. * Check for an abbreviation.
* Cursor is at ptr[col]. When inserting, mincol is where insert started. * Cursor is at ptr[col].
* When inserting, mincol is where insert started.
* For the command line, mincol is what is to be skipped over.
* "c" is the character typed before check_abbr was called. It may have * "c" is the character typed before check_abbr was called. It may have
* ABBR_OFF added to avoid prepending a CTRL-V to it. * ABBR_OFF added to avoid prepending a CTRL-V to it.
* *

View File

@ -61,13 +61,13 @@ SInt32 gMacSystemVersion;
# define USE_CARBONKEYHANDLER # define USE_CARBONKEYHANDLER
static int im_is_active = FALSE; static int im_is_active = FALSE;
#if 0 # if 0
/* TODO: Implement me! */ /* TODO: Implement me! */
static int im_start_row = 0; static int im_start_row = 0;
static int im_start_col = 0; static int im_start_col = 0;
#endif # endif
#define NR_ELEMS(x) (sizeof(x) / sizeof(x[0])) # define NR_ELEMS(x) (sizeof(x) / sizeof(x[0]))
static TSMDocumentID gTSMDocument; static TSMDocumentID gTSMDocument;
@ -6243,11 +6243,11 @@ char_u *FullPathFromFSSpec_save(FSSpec file)
void void
im_set_position(int row, int col) im_set_position(int row, int col)
{ {
#if 0 # if 0
/* TODO: Implement me! */ /* TODO: Implement me! */
im_start_row = row; im_start_row = row;
im_start_col = col; im_start_col = col;
#endif # endif
} }
static ScriptLanguageRecord gTSLWindow; static ScriptLanguageRecord gTSLWindow;

View File

@ -14,15 +14,15 @@ msgstr ""
"Project-Id-Version: vim 8.1\n" "Project-Id-Version: vim 8.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-12 16:07+0200\n" "POT-Creation-Date: 2018-05-12 16:07+0200\n"
"PO-Revision-Date: 2018-05-13 21:50+0200\n" "PO-Revision-Date: 2018-05-13 22:32+0200\n"
"Last-Translator: Antonio Colombo <azc100@gmail.com>\n" "Last-Translator: Antonio Colombo <azc100@gmail.com>\n"
"Language-Team: Antonio Colombo <azc100@gmail.com>\n" "Language-Team: Antonio Colombo <azc100@gmail.com>\n"
" Vlad Sandrini <vlad.gently@gmail.com>\n"
" Luciano Montanaro <mikelima@cirulla.net>\n"
"Language: Italian\n" "Language: Italian\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO_8859-1\n" "Content-Type: text/plain; charset=ISO_8859-1\n"
"Content-Transfer-Encoding: 8-bit\n" "Content-Transfer-Encoding: 8-bit\n"
" Vlad Sandrini <vlad.gently@gmail.com>\n"
" Luciano Montanaro <mikelima@cirulla.net>\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
msgid "E831: bf_key_init() called with empty password" msgid "E831: bf_key_init() called with empty password"

View File

@ -36,7 +36,7 @@ func Test_cscopeWithCscopeConnections()
" Test 1: Find this C-Symbol " Test 1: Find this C-Symbol
for cmd in ['cs find s main', 'cs find 0 main'] for cmd in ['cs find s main', 'cs find 0 main']
let a=execute(cmd) let a = execute(cmd)
" Test 1.1 test where it moves the cursor " Test 1.1 test where it moves the cursor
call assert_equal('main(void)', getline('.')) call assert_equal('main(void)', getline('.'))
" Test 1.2 test the output of the :cs command " Test 1.2 test the output of the :cs command
@ -51,21 +51,21 @@ func Test_cscopeWithCscopeConnections()
" Test 3: Find functions called by this function " Test 3: Find functions called by this function
for cmd in ['cs find d test_mf_hash', 'cs find 2 test_mf_hash'] for cmd in ['cs find d test_mf_hash', 'cs find 2 test_mf_hash']
let a=execute(cmd) let a = execute(cmd)
call assert_match('\n(1 of 42): <<mf_hash_init>> mf_hash_init(&ht);', a) call assert_match('\n(1 of 42): <<mf_hash_init>> mf_hash_init(&ht);', a)
call assert_equal(' mf_hash_init(&ht);', getline('.')) call assert_equal(' mf_hash_init(&ht);', getline('.'))
endfor endfor
" Test 4: Find functions calling this function " Test 4: Find functions calling this function
for cmd in ['cs find c test_mf_hash', 'cs find 3 test_mf_hash'] for cmd in ['cs find c test_mf_hash', 'cs find 3 test_mf_hash']
let a=execute(cmd) let a = execute(cmd)
call assert_match('\n(1 of 1): <<main>> test_mf_hash();', a) call assert_match('\n(1 of 1): <<main>> test_mf_hash();', a)
call assert_equal(' test_mf_hash();', getline('.')) call assert_equal(' test_mf_hash();', getline('.'))
endfor endfor
" Test 5: Find this text string " Test 5: Find this text string
for cmd in ['cs find t Bram', 'cs find 4 Bram'] for cmd in ['cs find t Bram', 'cs find 4 Bram']
let a=execute(cmd) let a = execute(cmd)
call assert_match('(1 of 1): <<<unknown>>> \* VIM - Vi IMproved^Iby Bram Moolenaar', a) call assert_match('(1 of 1): <<<unknown>>> \* VIM - Vi IMproved^Iby Bram Moolenaar', a)
call assert_equal(' * VIM - Vi IMproved by Bram Moolenaar', getline('.')) call assert_equal(' * VIM - Vi IMproved by Bram Moolenaar', getline('.'))
endfor endfor
@ -73,7 +73,7 @@ func Test_cscopeWithCscopeConnections()
" Test 6: Find this egrep pattern " Test 6: Find this egrep pattern
" test all matches returned by cscope " test all matches returned by cscope
for cmd in ['cs find e ^\#includ.', 'cs find 6 ^\#includ.'] for cmd in ['cs find e ^\#includ.', 'cs find 6 ^\#includ.']
let a=execute(cmd) let a = execute(cmd)
call assert_match('\n(1 of 3): <<<unknown>>> #include <assert.h>', a) call assert_match('\n(1 of 3): <<<unknown>>> #include <assert.h>', a)
call assert_equal('#include <assert.h>', getline('.')) call assert_equal('#include <assert.h>', getline('.'))
cnext cnext
@ -84,7 +84,7 @@ func Test_cscopeWithCscopeConnections()
endfor endfor
" Test 7: Find the same egrep pattern using lcscope this time. " Test 7: Find the same egrep pattern using lcscope this time.
let a=execute('lcs find e ^\#includ.') let a = execute('lcs find e ^\#includ.')
call assert_match('\n(1 of 3): <<<unknown>>> #include <assert.h>', a) call assert_match('\n(1 of 3): <<<unknown>>> #include <assert.h>', a)
call assert_equal('#include <assert.h>', getline('.')) call assert_equal('#include <assert.h>', getline('.'))
lnext lnext
@ -96,7 +96,7 @@ func Test_cscopeWithCscopeConnections()
" Test 8: Find this file " Test 8: Find this file
for cmd in ['cs find f Xmemfile_test.c', 'cs find 7 Xmemfile_test.c'] for cmd in ['cs find f Xmemfile_test.c', 'cs find 7 Xmemfile_test.c']
enew enew
let a=execute(cmd) let a = execute(cmd)
call assert_true(a =~ '"Xmemfile_test.c" \d\+L, \d\+C') call assert_true(a =~ '"Xmemfile_test.c" \d\+L, \d\+C')
call assert_equal('Xmemfile_test.c', @%) call assert_equal('Xmemfile_test.c', @%)
endfor endfor
@ -104,7 +104,7 @@ func Test_cscopeWithCscopeConnections()
" Test 9: Find files #including this file " Test 9: Find files #including this file
for cmd in ['cs find i assert.h', 'cs find 8 assert.h'] for cmd in ['cs find i assert.h', 'cs find 8 assert.h']
enew enew
let a=execute(cmd) let a = execute(cmd)
let alines = split(a, '\n', 1) let alines = split(a, '\n', 1)
call assert_equal('', alines[0]) call assert_equal('', alines[0])
call assert_true(alines[1] =~ '"Xmemfile_test.c" \d\+L, \d\+C') call assert_true(alines[1] =~ '"Xmemfile_test.c" \d\+L, \d\+C')
@ -118,11 +118,11 @@ func Test_cscopeWithCscopeConnections()
" Test 11: Find places where this symbol is assigned a value " Test 11: Find places where this symbol is assigned a value
" this needs a cscope >= 15.8 " this needs a cscope >= 15.8
" unfortunately, Travis has cscope version 15.7 " unfortunately, Travis has cscope version 15.7
let cscope_version=systemlist('cscope --version')[0] let cscope_version = systemlist('cscope --version')[0]
let cs_version=str2float(matchstr(cscope_version, '\d\+\(\.\d\+\)\?')) let cs_version = str2float(matchstr(cscope_version, '\d\+\(\.\d\+\)\?'))
if cs_version >= 15.8 if cs_version >= 15.8
for cmd in ['cs find a item', 'cs find 9 item'] for cmd in ['cs find a item', 'cs find 9 item']
let a=execute(cmd) let a = execute(cmd)
call assert_equal(['', '(1 of 4): <<test_mf_hash>> item = (mf_hashitem_T *)lalloc_clear(sizeof(mf_hashtab_T), FALSE);'], split(a, '\n', 1)) call assert_equal(['', '(1 of 4): <<test_mf_hash>> item = (mf_hashitem_T *)lalloc_clear(sizeof(mf_hashtab_T), FALSE);'], split(a, '\n', 1))
call assert_equal(' item = (mf_hashitem_T *)lalloc_clear(sizeof(mf_hashtab_T), FALSE);', getline('.')) call assert_equal(' item = (mf_hashitem_T *)lalloc_clear(sizeof(mf_hashtab_T), FALSE);', getline('.'))
cnext cnext
@ -135,18 +135,18 @@ func Test_cscopeWithCscopeConnections()
endif endif
" Test 12: leading whitespace is not removed for cscope find text " Test 12: leading whitespace is not removed for cscope find text
let a=execute('cscope find t test_mf_hash') let a = execute('cscope find t test_mf_hash')
call assert_equal(['', '(1 of 1): <<<unknown>>> test_mf_hash();'], split(a, '\n', 1)) call assert_equal(['', '(1 of 1): <<<unknown>>> test_mf_hash();'], split(a, '\n', 1))
call assert_equal(' test_mf_hash();', getline('.')) call assert_equal(' test_mf_hash();', getline('.'))
" Test 13: test with scscope " Test 13: test with scscope
let a=execute('scs find t Bram') let a = execute('scs find t Bram')
call assert_match('(1 of 1): <<<unknown>>> \* VIM - Vi IMproved^Iby Bram Moolenaar', a) call assert_match('(1 of 1): <<<unknown>>> \* VIM - Vi IMproved^Iby Bram Moolenaar', a)
call assert_equal(' * VIM - Vi IMproved by Bram Moolenaar', getline('.')) call assert_equal(' * VIM - Vi IMproved by Bram Moolenaar', getline('.'))
" Test 14: cscope help " Test 14: cscope help
for cmd in ['cs', 'cs help', 'cs xxx'] for cmd in ['cs', 'cs help', 'cs xxx']
let a=execute(cmd) let a = execute(cmd)
call assert_match('^cscope commands:\n', a) call assert_match('^cscope commands:\n', a)
call assert_match('\nadd :', a) call assert_match('\nadd :', a)
call assert_match('\nfind :', a) call assert_match('\nfind :', a)
@ -155,25 +155,25 @@ func Test_cscopeWithCscopeConnections()
call assert_match('\nreset: Reinit all connections', a) call assert_match('\nreset: Reinit all connections', a)
call assert_match('\nshow : Show connections', a) call assert_match('\nshow : Show connections', a)
endfor endfor
let a=execute('scscope help') let a = execute('scscope help')
call assert_match('This cscope command does not support splitting the window\.', a) call assert_match('This cscope command does not support splitting the window\.', a)
" Test 15: reset connections " Test 15: reset connections
let a=execute('cscope reset') let a = execute('cscope reset')
call assert_match('\nAdded cscope database.*Xcscope.out (#0)', a) call assert_match('\nAdded cscope database.*Xcscope.out (#0)', a)
call assert_match('\nAll cscope databases reset', a) call assert_match('\nAll cscope databases reset', a)
" Test 16: cscope show " Test 16: cscope show
let a=execute('cscope show') let a = execute('cscope show')
call assert_match('\n 0 \d\+.*Xcscope.out\s*<none>', a) call assert_match('\n 0 \d\+.*Xcscope.out\s*<none>', a)
" Test 17: cstag and 'csto' option " Test 17: cstag and 'csto' option
set csto=0 set csto=0
let a=execute('cstag TEST_COUNT') let a = execute('cstag TEST_COUNT')
call assert_match('(1 of 1): <<TEST_COUNT>> #define TEST_COUNT 50000', a) call assert_match('(1 of 1): <<TEST_COUNT>> #define TEST_COUNT 50000', a)
call assert_equal('#define TEST_COUNT 50000', getline('.')) call assert_equal('#define TEST_COUNT 50000', getline('.'))
set csto=1 set csto=1
let a=execute('cstag index_to_key') let a = execute('cstag index_to_key')
call assert_match('(1 of 1): <<index_to_key>> #define index_to_key(i) ((i) ^ 15167)', a) call assert_match('(1 of 1): <<index_to_key>> #define index_to_key(i) ((i) ^ 15167)', a)
call assert_equal('#define index_to_key(i) ((i) ^ 15167)', getline('.')) call assert_equal('#define index_to_key(i) ((i) ^ 15167)', getline('.'))
call assert_fails('cstag xxx', 'E257:') call assert_fails('cstag xxx', 'E257:')
@ -183,10 +183,10 @@ func Test_cscopeWithCscopeConnections()
set nocst set nocst
call assert_fails('tag TEST_COUNT', 'E426:') call assert_fails('tag TEST_COUNT', 'E426:')
set cst set cst
let a=execute('tag TEST_COUNT') let a = execute('tag TEST_COUNT')
call assert_match('(1 of 1): <<TEST_COUNT>> #define TEST_COUNT 50000', a) call assert_match('(1 of 1): <<TEST_COUNT>> #define TEST_COUNT 50000', a)
call assert_equal('#define TEST_COUNT 50000', getline('.')) call assert_equal('#define TEST_COUNT 50000', getline('.'))
let a=execute('tags') let a = execute('tags')
call assert_match('1 1 TEST_COUNT\s\+\d\+\s\+#define index_to_key', a) call assert_match('1 1 TEST_COUNT\s\+\d\+\s\+#define index_to_key', a)
" Test 19: this should trigger call to cs_print_tags() " Test 19: this should trigger call to cs_print_tags()
@ -198,17 +198,17 @@ func Test_cscopeWithCscopeConnections()
call assert_fails('cscope kill 2', 'E261:') call assert_fails('cscope kill 2', 'E261:')
call assert_fails('cscope kill xxx', 'E261:') call assert_fails('cscope kill xxx', 'E261:')
let a=execute('cscope kill 0') let a = execute('cscope kill 0')
call assert_match('cscope connection 0 closed', a) call assert_match('cscope connection 0 closed', a)
cscope add Xcscope.out cscope add Xcscope.out
let a=execute('cscope kill Xcscope.out') let a = execute('cscope kill Xcscope.out')
call assert_match('cscope connection Xcscope.out closed', a) call assert_match('cscope connection Xcscope.out closed', a)
cscope add Xcscope.out . cscope add Xcscope.out .
let a=execute('cscope kill -1') let a = execute('cscope kill -1')
call assert_match('cscope connection .*Xcscope.out closed', a) call assert_match('cscope connection .*Xcscope.out closed', a)
let a=execute('cscope kill -1') let a = execute('cscope kill -1')
call assert_equal('', a) call assert_equal('', a)
" Test 21: 'csprg' option " Test 21: 'csprg' option
@ -220,7 +220,7 @@ func Test_cscopeWithCscopeConnections()
" Test 22: multiple cscope connections " Test 22: multiple cscope connections
cscope add Xcscope.out cscope add Xcscope.out
cscope add Xcscope2.out . -C cscope add Xcscope2.out . -C
let a=execute('cscope show') let a = execute('cscope show')
call assert_match('\n 0 \d\+.*Xcscope.out\s*<none>', a) call assert_match('\n 0 \d\+.*Xcscope.out\s*<none>', a)
call assert_match('\n 1 \d\+.*Xcscope2.out\s*\.', a) call assert_match('\n 1 \d\+.*Xcscope2.out\s*\.', a)
@ -271,7 +271,7 @@ func Test_withoutCscopeConnection()
call assert_equal(cscope_connection(), 0) call assert_equal(cscope_connection(), 0)
call assert_fails('cscope find s main', 'E567:') call assert_fails('cscope find s main', 'E567:')
let a=execute('cscope show') let a = execute('cscope show')
call assert_match('no cscope connections', a) call assert_match('no cscope connections', a)
endfunc endfunc

View File

@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1845,
/**/ /**/
1844, 1844,
/**/ /**/