# HG changeset patch # User Christian Brabandt # Date 1514118605 -3600 # Node ID 656ab57d1ddc7b45e124329be87a09fdf6b6e2af # Parent d1fcf9d1be47b4b082e1671f55a77fc0b0f44ecb update a few runtime files commit https://github.com/vim/vim/commit/df980db69b831381c37c3e2973a6eefa10df305c Author: Bram Moolenaar Date: Sun Dec 24 13:22:00 2017 +0100 update a few runtime files diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 8.0. Last change: 2017 Dec 01 +*options.txt* For Vim version 8.0. Last change: 2017 Dec 21 VIM REFERENCE MANUAL by Bram Moolenaar @@ -5749,11 +5749,11 @@ A jump table for the options with a shor copy of the original file will be kept. The name of the copy is the name of the original file with the string in the 'patchmode' option appended. This option should start with a dot. Use a string like - ".org". 'backupdir' must not be empty for this to work (Detail: The - backup file is renamed to the patchmode file after the new file has - been successfully written, that's why it must be possible to write a - backup file). If there was no file to be backed up, an empty file is - created. + ".orig" or ".org". 'backupdir' must not be empty for this to work + (Detail: The backup file is renamed to the patchmode file after the + new file has been successfully written, that's why it must be possible + to write a backup file). If there was no file to be backed up, an + empty file is created. When the 'backupskip' pattern matches, a patchmode file is not made. Using 'patchmode' for compressed files appends the extension at the end (e.g., "file.gz.orig"), thus the resulting name isn't always diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 8.0. Last change: 2017 Sep 30 +*syntax.txt* For Vim version 8.0. Last change: 2017 Dec 22 VIM REFERENCE MANUAL by Bram Moolenaar @@ -5031,6 +5031,8 @@ TabLine tab pages line, not active tab TabLineFill tab pages line, where there are no labels *hl-TabLineSel* TabLineSel tab pages line, active tab page label + *hl-Terminal* +Terminal |terminal| window (see |terminal-size-color|) *hl-Title* Title titles for output from ":set all", ":autocmd" etc. *hl-Visual* diff --git a/runtime/doc/tags b/runtime/doc/tags --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -6828,6 +6828,7 @@ hl-StatusLineNC syntax.txt /*hl-StatusLi hl-TabLine syntax.txt /*hl-TabLine* hl-TabLineFill syntax.txt /*hl-TabLineFill* hl-TabLineSel syntax.txt /*hl-TabLineSel* +hl-Terminal syntax.txt /*hl-Terminal* hl-Title syntax.txt /*hl-Title* hl-Tooltip syntax.txt /*hl-Tooltip* hl-User1 syntax.txt /*hl-User1* @@ -8064,6 +8065,7 @@ quake.vim syntax.txt /*quake.vim* quickfix quickfix.txt /*quickfix* quickfix-6 version6.txt /*quickfix-6* quickfix-ID quickfix.txt /*quickfix-ID* +quickfix-changedtick quickfix.txt /*quickfix-changedtick* quickfix-context quickfix.txt /*quickfix-context* quickfix-directory-stack quickfix.txt /*quickfix-directory-stack* quickfix-error-lists quickfix.txt /*quickfix-error-lists* diff --git a/runtime/doc/terminal.txt b/runtime/doc/terminal.txt --- a/runtime/doc/terminal.txt +++ b/runtime/doc/terminal.txt @@ -1,4 +1,4 @@ -*terminal.txt* For Vim version 8.0. Last change: 2017 Dec 17 +*terminal.txt* For Vim version 8.0. Last change: 2017 Dec 22 VIM REFERENCE MANUAL by Bram Moolenaar @@ -122,7 +122,8 @@ and background colors are taken from Vim For a color terminal the 'background' option is used to decide whether the terminal window will start with a white or black background. -To use a different color the Terminal highlight group can be used: > +To use a different color the Terminal highlight group can be used, for +example: > hi Terminal ctermbg=lightgrey ctermfg=blue guibg=lightgrey guifg=blue diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 8.0. Last change: 2017 Dec 17 +*todo.txt* For Vim version 8.0. Last change: 2017 Dec 23 VIM REFERENCE MANUAL by Bram Moolenaar @@ -142,11 +142,19 @@ Suggested by Hiroki Kokubun: Include solarized color scheme?, it does not support termguicolors. - Sanitized version of pablo (Lifepillar, 2017 Nov 21) -heap use after free. (gy741, #2447) -heap use after free in set_bufref (gy741, #2448) - reproduces with valgrind (Dominique) -heap use after free in getout. (gy741, #2449) - reproduces with valgrind (Dominique) +Reproducible: + invalid memory access in regexp with zero-width. + reproduced by Dominique, 2017 Dec 23 + heap-use-after-free in win_equal_rec (#2467) + au* 0 vs¡ + ar0 + arga + al + al + +Errors found with random data: + heap-buffer-overflow in alist_add (#2472) + heap-buffer-overflow in del_bytes (#2466) Compiler warnings (geeknik, 2017 Oct 26): - signed integer overflow in do_sub() (#2249) @@ -155,20 +163,13 @@ Compiler warnings (geeknik, 2017 Oct 26) - signed integer overflow in nfa_regatom() (#2251) - undefined left shift in get_string_tv() (#2250) -Triggering CursorHoldI happens too often in the GUI. (#2451). -Should move code from os_unix.c mch_inchar() up into common use, it's not -really machine specific. Also the part of WaitForChar(), it deals with timers -and is also for all machines. - -When starting with --clean packages under "start" are not loaded. Make this -work: :packadd START {name} similar to :runtime START name +balloon_show() does not work properly in the terminal. (Ben Jackson, 2017 Dec +20, #2481) +Also see #2352, want better control over balloon, perhaps set the position. When using :packadd files under "later" are not used, which is inconsistent with packages under "start". (xtal8, #1994) -Patch to add changedtick var to quickfix list. (Yegappan Lakshmanan, 2017 Nov -18, #2391) - 7 Add a watchpoint in the debug mode: An expression that breaks execution when evaluating to non-zero. Add the "watchadd expr" command, stop when the value of the expression changes. ":watchdel" deletes an item, @@ -212,6 +213,9 @@ Error in emsg with buggy script. (Domini Patch to avoid clearing the intro message on Win32 console. (Ken Takata, 2017 Nov 14) +Patch to fix encoding in print document name (Yasuhiro Matsumoto, 2017 Dec 20, +#2478) + Patch to copy buffer-local options before buffer leaves the window. (Bjorn Linse, 2017 Nov 14, #2336) @@ -233,6 +237,9 @@ Ask whether to use Windows or Vim key be Patch for improving detecting Ruby on Mac in configure. (Ilya Mikhaltsou, 2017 Nov 21) +Add a ModeChanged autocommand that has an argument indicating the old and new +mode. Also used for switching Terminal mode. + When using command line window, CmdlineLeave is triggered without CmdlineEnter. (xtal8, 2017 Oct 30, #2263) Add some way to get the nested state. Although CmdwinEnter is obviously @@ -271,6 +278,7 @@ The ":move" command does not honor close Memory leaks in test_channel? (or is it because of fork()) Memory leak in test_arabic. Using uninitialized value in test_crypt. +Memory leaks in test_escaped_glob Patch to clear background when "guibg=NONE" is used and 'termguicolors' is set. @@ -1052,8 +1060,6 @@ Patch to open folds for 'incsearch'. (Ch Patch for building a 32bit Vim with 64bit MingW compiler. (Michael Soyka, 2014 Oct 15) -Delete old code in os_msdos.c, mch_FullName(). - Patch: On MS-Windows shellescape() may have to triple double quotes. (Ingo Karkat, 2015 Jan 16) diff --git a/runtime/ftplugin/cmake.vim b/runtime/ftplugin/cmake.vim new file mode 100644 --- /dev/null +++ b/runtime/ftplugin/cmake.vim @@ -0,0 +1,16 @@ +" Vim filetype plugin +" Language: CMake +" Maintainer: Keith Smiley +" Last Change: 2017 Dec 24 + +" Only do this when not done yet for this buffer +if exists("b:did_ftplugin") + finish +endif + +" Don't load another plugin for this buffer +let b:did_ftplugin = 1 + +let b:undo_ftplugin = "setl commentstring<" + +setlocal commentstring=#\ %s diff --git a/runtime/syntax/mix.vim b/runtime/syntax/mix.vim --- a/runtime/syntax/mix.vim +++ b/runtime/syntax/mix.vim @@ -2,7 +2,7 @@ " Language: MIX (Donald Knuth's assembly language used in TAOCP) " Maintainer: Wu Yongwei " Filenames: *.mixal *.mix -" Last Change: 2013 Nov 13 +" Last Change: 2017-11-26 15:21:36 +0800 " Quit when a syntax file was already loaded if exists("b:current_syntax") @@ -16,7 +16,7 @@ syn case ignore " Special processing of ALF directive: implementations vary whether quotation " marks are needed -syn match mixAlfParam #\s\{1,2\}"\?[^"]\{,5\}"\?# contains=mixAlfDirective,mixString nextgroup=mixEndComment contained +syn match mixAlfParam #\s\{1,2\}"\?[^"]\{,5\}"\?# contains=mixString nextgroup=mixEndComment contained " Region for parameters syn match mixParam #[-+*/:=0-9a-z,()"]\+# contains=mixIdentifier,mixSpecial,mixNumber,mixString,mixLabel nextgroup=mixEndComment contained @@ -46,6 +46,7 @@ syn keyword mixDirective ALF nextgroup= " Opcodes syn keyword mixOpcode NOP HLT NUM CHAR FLOT FIX nextgroup=mixEndComment contained syn keyword mixOpcode FADD FSUB FMUL FDIV FCMP MOVE ADD SUB MUL DIV IOC IN OUT JRED JBUS JMP JSJ JOV JNOV JL JE JG JLE JNE JGE SLA SRA SLAX SRAX SLC SRC nextgroup=mixParam contained skipwhite +syn keyword mixOpcode SLB SRB JAE JAO JXE JXO nextgroup=mixParam contained skipwhite syn match mixOpcode "LD[AX1-6]N\?\>" nextgroup=mixParam contained skipwhite syn match mixOpcode "ST[AX1-6JZ]\>" nextgroup=mixParam contained skipwhite @@ -58,7 +59,7 @@ syn match mixOpcode "J[AX1-6]N\?[NZP]\>" " Switch back to being case sensitive syn case match -" Registers (only to used in comments now) +" Registers (only to be used in comments now) syn keyword mixRegister rA rX rI1 rI2 rI3 rI4 rI5 rI6 rJ contained " The default highlighting