# HG changeset patch # User Bram Moolenaar # Date 1579643104 -3600 # Node ID 63beef1ca62c3cfa844b5e37ddffa2f719d75d33 # Parent d02825cf56e318a461c899018f172f7d5452654b Update runtime files. Commit: https://github.com/vim/vim/commit/ade0d39468014fd55d30f7647a1ac104baff4bc5 Author: Bram Moolenaar Date: Tue Jan 21 22:33:58 2020 +0100 Update runtime files. diff --git a/runtime/doc/debugger.txt b/runtime/doc/debugger.txt --- a/runtime/doc/debugger.txt +++ b/runtime/doc/debugger.txt @@ -114,7 +114,7 @@ 2. Vim Compile Options *debugger-com The debugger features were added for use with Sun's Visual WorkShop Integrated Programming Environment (ipe). However, they were done in as generic a manner -as possible so that integration with other debuggers could also these +as possible so that integration with other debuggers could also use these features. The following compile time preprocessor variables control the features: diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 8.2. Last change: 2020 Jan 06 +*eval.txt* For Vim version 8.2. Last change: 2020 Jan 19 VIM REFERENCE MANUAL by Bram Moolenaar @@ -10630,7 +10630,7 @@ xor({expr}, {expr}) *xor()* < *feature-list* -There are four types of features: +There are three types of features: 1. Features that are only supported when they have been enabled when Vim was compiled |+feature-list|. Example: > :if has("cindent") 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.2. Last change: 2020 Jan 01 +*options.txt* For Vim version 8.2. Last change: 2020 Jan 18 VIM REFERENCE MANUAL by Bram Moolenaar @@ -517,10 +517,11 @@ Examples: The second form (this is compatible with some versions of Vi): - [text]{white}{vi:|vim:|Vim:|ex:}[white]se[t] {options}:[text] - -[text] any text or empty -{white} at least one blank character ( or ) + [text{white}]{vi:|vim:|Vim:|ex:}[white]se[t] {options}:[text] + +[text{white}] empty or any text followed by at least one blank + character ( or ); "ex:" always requires at + least one blank character {vi:|vim:|Vim:|ex:} the string "vi:", "vim:", "Vim:" or "ex:" [white] optional white space se[t] the string "set " or "se " (note the space); When @@ -6752,8 +6753,7 @@ A jump table for the options with a shor option is on, dots in file names are replaced with underscores when adding an extension (".~" or ".swp"). This option is useful when editing files on an MS-DOS compatible filesystem, e.g., messydos - or crossdos. When running the Win32 GUI version under Win32s, this - option is always on by default. + or crossdos. *'showbreak'* *'sbr'* *E595* 'showbreak' 'sbr' string (default "") @@ -7288,8 +7288,8 @@ A jump table for the options with a shor < Beware that an expression is evaluated each and every time the status line is displayed. *stl-%{* *g:actual_curbuf* *g:actual_curwin* - While evaluationg %{} the current buffer and current window will be - set temporarily to that of the window (and buffer) whose statusline is + While evaluating %{} the current buffer and current window will be set + temporarily to that of the window (and buffer) whose statusline is currently being drawn. The expression will evaluate in this context. The variable "g:actual_curbuf" is set to the `bufnr()` number of the real current buffer and "g:actual_curwin" to the |window-ID| of the diff --git a/runtime/doc/os_dos.txt b/runtime/doc/os_dos.txt --- a/runtime/doc/os_dos.txt +++ b/runtime/doc/os_dos.txt @@ -52,12 +52,18 @@ Will find "c:\user\piet\_vimrc" and the See |$VIM| and |$VIMRUNTIME| for more information. -Under Windows 95, you can set $VIM in your C:\autoexec.bat file. For -example: > - set VIM=D:\vim -Under Windows NT, you can set environment variables for each user separately -under "Start/Settings/Control Panel->System", or through the properties in the -menu of "My Computer", under the Environment Tab. +You can set environment variables for each user separately through the +System Properties dialog box. The steps to do that: +1. Type Windows Key + R to open the "Run" dialog box. +2. Enter "sysdm.cpl" and press the "OK" button. The "System Properties" + dialog box will open. +3. Select the "Advanced" tab and press the "Environment Variables..." button. + The "Environment Variables" dialog box will open. +4. Select an existing variable in the "User variables" list and press the + "Edit..." button to edit it. Or press the "New..." button to add a new + variable. +5. After you finished editing variables, press the "OK" button to save the + changes. ============================================================================== 2. Using backslashes *dos-backslash* diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -236,8 +236,7 @@ processing a quickfix or location list c e.g., a compiler will not compile the same file again, `git commit` will abort the committing process, `fc` (built-in for shells like bash and zsh) will not - execute the command, etc. will not compile the same - file again. + execute the command, etc. {N} can also be zero, in which case Vim exits normally. WARNING: All changes in files are lost! Also when the @@ -1108,7 +1107,7 @@ id-utils) in a similar way to its compil allowed with |:bufdo|. An example that uses the argument list and avoids errors for files without matches: > - :silent argdo try + :silent argdo try \ | grepadd! something % \ | catch /E480:/ \ | endtry" @@ -1311,7 +1310,7 @@ You can force the compiler to ignore mak b:tex_ignore_makefile or g:tex_ignore_makefile variable (they are checked for existence only). -If the compiler chose not to use make, it need to choose a right program for +If the compiler chose not to use make, it needs to choose a right program for processing your input. If b:tex_flavor or g:tex_flavor (in this precedence) variable exists, it defines TeX flavor for :make (actually, this is the name of executed command), and if both variables do not exist, it defaults to diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1,4 +1,4 @@ -*quickref.txt* For Vim version 8.2. Last change: 2019 Dec 07 +*quickref.txt* For Vim version 8.2. Last change: 2020 Jan 17 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1057,8 +1057,7 @@ Short explanation of each option: *opti search || while entering a count: delete last character |:version| :ve[rsion] show version information -|:mode| :mode N MS-Windows: set screen mode to N (number, C80, - C4350, etc.) +|:mode| :mode N set screen mode to N (obsolete) |:normal| :norm[al][!] {commands} execute Normal mode commands |Q| Q switch to "Ex" mode diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1,4 +1,4 @@ -*starting.txt* For Vim version 8.2. Last change: 2019 Dec 11 +*starting.txt* For Vim version 8.2. Last change: 2020 Jan 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1570,8 +1570,8 @@ remembered. VIMINFO FILE NAME *viminfo-file-name* - The default name of the viminfo file is "$HOME/.viminfo" for Unix, - "s:.viminfo" for Amiga, "$HOME\_viminfo" for Win32. For the last two, when - $HOME is not set, "$VIM\_viminfo" is used. When $VIM is also not set, + "s:.viminfo" for Amiga, "$HOME\_viminfo" for Win32. For Win32, when $HOME + is not set, "$VIM\_viminfo" is used. When $VIM is also not set, "c:\_viminfo" is used. - The 'n' flag in the 'viminfo' option can be used to specify another viminfo file name |'viminfo'|. diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -2315,7 +2315,7 @@ contain very long structures that Vim do PAPP *papp.vim* *ft-papp-syntax* -The PApp syntax file handles .papp files and, to a lesser extend, .pxml +The PApp syntax file handles .papp files and, to a lesser extent, .pxml and .pxsl files which are all a mixture of perl/xml/html/other using xml as the top-level file format. By default everything inside phtml or pxml sections is treated as a string with embedded preprocessor commands. If @@ -2687,12 +2687,12 @@ Note: only existence of these options ma QUAKE *quake.vim* *ft-quake-syntax* -The Quake syntax definition should work for most any FPS (First Person -Shooter) based on one of the Quake engines. However, the command names vary -a bit between the three games (Quake, Quake 2, and Quake 3 Arena) so the -syntax definition checks for the existence of three global variables to allow -users to specify what commands are legal in their files. The three variables -can be set for the following effects: +The Quake syntax definition should work for most FPS (First Person Shooter) +based on one of the Quake engines. However, the command names vary a bit +between the three games (Quake, Quake 2, and Quake 3 Arena) so the syntax +definition checks for the existence of three global variables to allow users +to specify what commands are legal in their files. The three variables can +be set for the following effects: set to highlight commands only available in Quake: > :let quake_is_quake1 = 1 @@ -3028,7 +3028,7 @@ variables in your <.vimrc>: ksh: > let g:is_kornshell = 1 -< posix: (using this is the nearly the same as setting g:is_kornshell to 1) > +< posix: (using this is nearly the same as setting g:is_kornshell to 1) > let g:is_posix = 1 < bash: > let g:is_bash = 1 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.2. Last change: 2020 Jan 13 +*todo.txt* For Vim version 8.2. Last change: 2020 Jan 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -184,6 +184,8 @@ wrong. E.g. in vim.h "Error:", and blow goes to any buffer, and then :bnext skips help buffers, since they are unlisted. (#4478) +Patch to include reduce() function. (#5481) + Patch to provide search stats in a variable, so that it can be used in the statusline. (Fujiwara Takuya, #4446) @@ -192,6 +194,8 @@ Enable 'termbidi' if $VTE_VERSION >= 570 Universal solution to detect if t_RS is working, using cursor position. Koichi Iwamoto, #2126 +Python 3.8 doesn't work. (Antonios Hadjigeorgalis, #5509) + The :syntax cchar value can only be a single character. It would be useful to support combining characters. (Charles Campbell) Also #4687 @@ -204,6 +208,8 @@ Add "t" action to settagstack(): truncat Result of synID() sometimes wrong in help files. (#5252) +Status line is nut updated when splitting windows. (Marcin Szamotulski, #5496) + Problem showing a line if the number column width changes when using "o". (Mateusz Morusiewicz, #4245) @@ -1121,6 +1127,7 @@ Patch for 'cursorlinenr' option. (Ozaki When 'completeopt' has "noselect" does not insert a newline. (Lifepillar, 2017 Apr 23, #1653) +Can 'completeopt' be made buffer-local? (#5487) Window resizing with 'winfixheight': With a vertical split the height changes anyway. (Tommy allen, 2017 Feb 21, #1502) diff --git a/runtime/doc/usr_11.txt b/runtime/doc/usr_11.txt --- a/runtime/doc/usr_11.txt +++ b/runtime/doc/usr_11.txt @@ -1,4 +1,4 @@ -*usr_11.txt* For Vim version 8.2. Last change: 2019 Apr 28 +*usr_11.txt* For Vim version 8.2. Last change: 2020 Jan 17 VIM USER MANUAL - by Bram Moolenaar @@ -211,8 +211,11 @@ will automatically delete it: - The flag that the file was modified is not set. - The process is not running. +You can programatically deal with this situation with the |FileChangedShell| +autocommand event. -UNREADABLE SWAP FILE + +UNREADABLE SWAP FILE ~ Sometimes the line diff --git a/runtime/syntax/make.vim b/runtime/syntax/make.vim --- a/runtime/syntax/make.vim +++ b/runtime/syntax/make.vim @@ -1,9 +1,9 @@ " Vim syntax file " Language: Makefile -" Maintainer: Roland Hieber +" Maintainer: Roland Hieber , " Previous Maintainer: Claudio Fleiner -" URL: https://github.com/vim/vim/syntax/make.vim -" Last Change: 2019 Dec 04 +" URL: https://github.com/vim/vim/blob/master/runtime/syntax/make.vim +" Last Change: 2020 Jan 15 " quit when a syntax file was already loaded if exists("b:current_syntax") @@ -42,6 +42,7 @@ syn region makeIdent start="\${" skip="\ syn match makeIdent "\$\$\w*" syn match makeIdent "\$[^({]" syn match makeIdent "^ *[^:#= \t]*\s*[:+?!*]="me=e-2 +syn match makeIdent "^ *[^:#= \t]*\s*::="me=e-3 syn match makeIdent "^ *[^:#= \t]*\s*="me=e-1 syn match makeIdent "%" diff --git a/runtime/syntax/markdown.vim b/runtime/syntax/markdown.vim --- a/runtime/syntax/markdown.vim +++ b/runtime/syntax/markdown.vim @@ -2,7 +2,7 @@ " Language: Markdown " Maintainer: Tim Pope " Filenames: *.markdown -" Last Change: 2019 Dec 05 +" Last Change: 2020 Jan 14 if exists("b:current_syntax") finish @@ -88,11 +88,11 @@ let s:concealends = '' if has('conceal') && get(g:, 'markdown_syntax_conceal', 1) == 1 let s:concealends = ' concealends' endif -exe 'syn region markdownItalic matchgroup=markdownItalicDelimiter start="\S\@<=\*\|\*\S\@=" end="\S\@<=\*\|\*\S\@=" skip="\\*" contains=markdownLineStart,@Spell' . s:concealends +exe 'syn region markdownItalic matchgroup=markdownItalicDelimiter start="\S\@<=\*\|\*\S\@=" end="\S\@<=\*\|\*\S\@=" skip="\\\*" contains=markdownLineStart,@Spell' . s:concealends exe 'syn region markdownItalic matchgroup=markdownItalicDelimiter start="\w\@ -" Last Change: Sun, 28 Oct 2001 21:22:24 +0100 +" Maintainer: Bogdan Barbu +" Previous Maintainer: Johannes Zellner +" Last Change: Fri, 17 Jan 2020 07:15:37 +0200 " Filenames: *.xsl " $Id: xslt.vim,v 1.1 2004/06/13 15:52:10 vimboss Exp $ " REFERENCES: " [1] http://www.w3.org/TR/xslt -" +" [2] http://www.w3.org/TR/xslt20 " Quit when a syntax file was already loaded if exists("b:current_syntax") @@ -19,11 +20,13 @@ runtime syntax/xml.vim syn cluster xmlTagHook add=xslElement syn case match +syn match xslElement '\%(xsl:\)\@<=analyze-string' syn match xslElement '\%(xsl:\)\@<=apply-imports' syn match xslElement '\%(xsl:\)\@<=apply-templates' syn match xslElement '\%(xsl:\)\@<=attribute' syn match xslElement '\%(xsl:\)\@<=attribute-set' syn match xslElement '\%(xsl:\)\@<=call-template' +syn match xslElement '\%(xsl:\)\@<=character-map' syn match xslElement '\%(xsl:\)\@<=choose' syn match xslElement '\%(xsl:\)\@<=comment' syn match xslElement '\%(xsl:\)\@<=copy' @@ -33,19 +36,25 @@ syn match xslElement '\%(xsl:\)\@<=docum syn match xslElement '\%(xsl:\)\@<=element' syn match xslElement '\%(xsl:\)\@<=fallback' syn match xslElement '\%(xsl:\)\@<=for-each' +syn match xslElement '\%(xsl:\)\@<=for-each-group' +syn match xslElement '\%(xsl:\)\@<=function' syn match xslElement '\%(xsl:\)\@<=if' syn match xslElement '\%(xsl:\)\@<=include' syn match xslElement '\%(xsl:\)\@<=import' +syn match xslElement '\%(xsl:\)\@<=import-schema' syn match xslElement '\%(xsl:\)\@<=key' syn match xslElement '\%(xsl:\)\@<=message' +syn match xslElement '\%(xsl:\)\@<=namespace' syn match xslElement '\%(xsl:\)\@<=namespace-alias' syn match xslElement '\%(xsl:\)\@<=number' syn match xslElement '\%(xsl:\)\@<=otherwise' syn match xslElement '\%(xsl:\)\@<=output' syn match xslElement '\%(xsl:\)\@<=param' +syn match xslElement '\%(xsl:\)\@<=perform-sort' syn match xslElement '\%(xsl:\)\@<=processing-instruction' syn match xslElement '\%(xsl:\)\@<=preserve-space' syn match xslElement '\%(xsl:\)\@<=script' +syn match xslElement '\%(xsl:\)\@<=sequence' syn match xslElement '\%(xsl:\)\@<=sort' syn match xslElement '\%(xsl:\)\@<=strip-space' syn match xslElement '\%(xsl:\)\@<=stylesheet' diff --git a/runtime/tutor/tutor.es b/runtime/tutor/tutor.es --- a/runtime/tutor/tutor.es +++ b/runtime/tutor/tutor.es @@ -625,7 +625,7 @@ NOTA: El fichero recuperado se sit�a a partir de la posici�n del cursor. 4. Para abrir una l�nea por encima del cursor, simplemente pulse una O may�scula, en lugar de una o min�scula. Pruebe este en la l�nea siguiente. -Abra una l�nea sobre �sta pulsando Mayu-O cuando el curso est� en esta l�nea. +Abra una l�nea sobre �sta pulsando Mayu-O cuando el cursor est� en esta l�nea. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Lecci�n 6.2: EL MANDATO �APPEND� (a�adir) @@ -662,7 +662,7 @@ Nota: �Esto evita el pulsar i , el �ltimo car�cter, el texto a insertar, 3. Ahora pulse R y sustituya el resto del texto de la primera l�nea escribiendo sobre el viejo texto para que la primera l�nea sea igual - que la primera. + que la segunda. ---> Para hacer que esta l�nea sea igual que la anterior use las teclas. ---> Para hacer que esta l�nea sea igual que la siguiente escriba R y el texto. diff --git a/runtime/tutor/tutor.es.utf-8 b/runtime/tutor/tutor.es.utf-8 --- a/runtime/tutor/tutor.es.utf-8 +++ b/runtime/tutor/tutor.es.utf-8 @@ -625,7 +625,7 @@ NOTA: El fichero recuperado se sitúa a partir de la posición del cursor. 4. Para abrir una línea por encima del cursor, simplemente pulse una O mayúscula, en lugar de una o minúscula. Pruebe este en la línea siguiente. -Abra una línea sobre ésta pulsando Mayu-O cuando el curso está en esta línea. +Abra una línea sobre ésta pulsando Mayu-O cuando el cursor está en esta línea. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Lección 6.2: EL MANDATO «APPEND» (añadir) @@ -662,7 +662,7 @@ Nota: ¡Esto evita el pulsar i , el último carácter, el texto a insertar, 3. Ahora pulse R y sustituya el resto del texto de la primera línea escribiendo sobre el viejo texto para que la primera línea sea igual - que la primera. + que la segunda. ---> Para hacer que esta línea sea igual que la anterior use las teclas. ---> Para hacer que esta línea sea igual que la siguiente escriba R y el texto. diff --git a/src/INSTALLpc.txt b/src/INSTALLpc.txt --- a/src/INSTALLpc.txt +++ b/src/INSTALLpc.txt @@ -957,6 +957,7 @@ correct directory structure. Copy the "runtime" files into "vim82": copy runtime\* vim82 + xcopy /s runtime\* vim82 B. Copy the new binaries into the "vim82" directory ----------------------------------------------------