# HG changeset patch # User Bram Moolenaar # Date 1546353906 -3600 # Node ID 9d3d7b0f48616791de911d47035c4ed262e205f6 # Parent 37502e6312028786b3836e62e581e516a60b6c9a Update runtime files commit https://github.com/vim/vim/commit/4c05fa08c9739e307ddc88ac91ba6d208f1fd68e Author: Bram Moolenaar Date: Tue Jan 1 15:32:17 2019 +0100 Update runtime files diff --git a/runtime/autoload/RstFold.vim b/runtime/autoload/RstFold.vim --- a/runtime/autoload/RstFold.vim +++ b/runtime/autoload/RstFold.vim @@ -1,8 +1,12 @@ " Author: Antony Lee " Description: Helper functions for reStructuredText syntax folding -" Last Modified: 2018-01-07 +" Last Modified: 2018-12-29 function s:CacheRstFold() + if !g:rst_fold_enabled + return + endif + let closure = {'header_types': {}, 'max_level': 0, 'levels': {}} function closure.Process(match) dict let curline = getcurpos()[1] @@ -20,12 +24,18 @@ function s:CacheRstFold() let self.levels[curline] = self.header_types[key] endfunction let save_cursor = getcurpos() + let save_mark = getpos("'[") silent keeppatterns %s/\v^%(%(([=`:.'"~^_*+#-])\1+\n)?.{1,2}\n([=`:.'"~^_*+#-])\2+)|%(%(([=`:.''"~^_*+#-])\3{2,}\n)?.{3,}\n([=`:.''"~^_*+#-])\4{2,})$/\=closure.Process(submatch(0))/gn call setpos('.', save_cursor) + call setpos("'[", save_mark) let b:RstFoldCache = closure.levels endfunction function RstFold#GetRstFold() + if !g:rst_fold_enabled + return + endif + if !has_key(b:, 'RstFoldCache') call s:CacheRstFold() endif @@ -37,6 +47,10 @@ function RstFold#GetRstFold() endfunction function RstFold#GetRstFoldText() + if !g:rst_fold_enabled + return + endif + if !has_key(b:, 'RstFoldCache') call s:CacheRstFold() endif diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1,4 +1,4 @@ -*autocmd.txt* For Vim version 8.1. Last change: 2018 May 03 +*autocmd.txt* For Vim version 8.1. Last change: 2018 Dec 28 VIM REFERENCE MANUAL by Bram Moolenaar @@ -759,13 +759,14 @@ FilterReadPre Before reading a file fr Not triggered when 'shelltemp' is off. *FilterWritePost* FilterWritePost After writing a file for a filter command or - making a diff. + making a diff with an external diff (see + DiffUpdated for internal diff). Vim checks the pattern against the name of the current buffer as with FilterWritePre. Not triggered when 'shelltemp' is off. *FilterWritePre* FilterWritePre Before writing a file for a filter command or - making a diff. + making a diff with an external diff. Vim checks the pattern against the name of the current buffer, not the name of the temporary file that is the output of the 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.1. Last change: 2018 Dec 27 +*eval.txt* For Vim version 8.1. Last change: 2018 Dec 28 VIM REFERENCE MANUAL by Bram Moolenaar @@ -6773,7 +6773,8 @@ prop_list({lnum} [, {props}]) *prop_ The properties are ordered by starting column and priority. Each property is a Dict with these entries: col starting column - length length in bytes + length length in bytes, one more if line break is + included id property ID type name of the property type, omitted if the type was deleted diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt --- a/runtime/doc/help.txt +++ b/runtime/doc/help.txt @@ -1,4 +1,4 @@ -*help.txt* For Vim version 8.1. Last change: 2018 Dec 14 +*help.txt* For Vim version 8.1. Last change: 2019 Jan 01 VIM - main help file k @@ -10,7 +10,7 @@ Close this window: Use ":q". Jump to a subject: Position the cursor on a tag (e.g. |bars|) and hit CTRL-]. With the mouse: ":set mouse=a" to enable the mouse (in xterm or GUI). Double-click the left mouse button on a tag, e.g. |bars|. - Jump back: Type CTRL-T or CTRL-O. Repeat to go further back. + Jump back: Type CTRL-O. Repeat to go further back. Get specific help: It is possible to go directly to whatever you want help on, by giving an argument to the |:help| command. @@ -31,13 +31,17 @@ Get specific help: It is possible to go help entries for "word". Or use ":helpgrep word". |:helpgrep| + Getting started: Do the Vim tutor, a 20 minute interactive training for the + basic commands, see |vimtutor|. + Read the user manual from start to end: |usr_01.txt| + Vim stands for Vi IMproved. Most of Vim was made by Bram Moolenaar, but only through the help of many others. See |credits|. ------------------------------------------------------------------------------ *doc-file-list* *Q_ct* BASIC: |quickref| Overview of the most common commands you will use -|tutor| 30 minutes training course for beginners +|tutor| 20 minutes training course for beginners |copying| About copyrights |iccf| Helping poor children in Uganda |sponsor| Sponsor Vim development, become a registered Vim user diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -1,4 +1,4 @@ -*intro.txt* For Vim version 8.1. Last change: 2018 Jan 24 +*intro.txt* For Vim version 8.1. Last change: 2019 Jan 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -52,29 +52,11 @@ an introduction to the use of Vi or Vim, there. For beginners, there is a hands-on |tutor|. To learn using Vim, read the user manual |usr_toc.txt|. - *book* -There are many books on Vi that contain a section for beginners. There are -two books I can recommend: - - "Vim - Vi Improved" by Steve Oualline - -This is the very first book completely dedicated to Vim. It is very good for -beginners. The most often used commands are explained with pictures and -examples. The less often used commands are also explained, the more advanced -features are summarized. There is a comprehensive index and a quick -reference. Parts of this book have been included in the user manual -|frombook|. -Published by New Riders Publishing. ISBN: 0735710015 -For more information try one of these: - http://iccf-holland.org/click5.html - http://www.vim.org/iccf/click5.html - - "Learning the Vi editor" by Linda Lamb and Arnold Robbins - -This is a book about Vi that includes a chapter on Vim (in the sixth edition). -The first steps in Vi are explained very well. The commands that Vim adds are -only briefly mentioned. There is also a German translation. -Published by O'Reilly. ISBN: 1-56592-426-6. + *book* *books* +Most books on Vi and Vim contain a section for beginners. Others are spending +more words on specific functionality. You can find an overview of Vim books +here: + http://iccf-holland.org/vim_books.html ============================================================================== 2. Vim on the internet *internet* @@ -84,9 +66,9 @@ The Vim pages contain the most recent in contain links to the most recent version of Vim. The FAQ is a list of Frequently Asked Questions. Read this if you have problems. - Vim home page: http://www.vim.org/ - Vim FAQ: http://vimdoc.sf.net/ - Downloading: ftp://ftp.vim.org/pub/vim/MIRRORS + Vim home page: https://www.vim.org/ + Vim FAQ: https://vimhelp.appspot.com/vim_faq.txt.html + Downloading: https://www.vim.org/download.php Usenet News group where Vim is discussed: *news* *usenet* @@ -114,10 +96,12 @@ There are several mailing lists for Vim: See http://www.vim.org/maillist.php for the latest information. NOTE: +- Anyone can see the archive, e.g. on Google groups. Search this if you have + questions. - You can only send messages to these lists if you have subscribed! +- The first message is moderated, thus it may take a few hours to show up. - You need to send the messages from the same location as where you subscribed from (to avoid spam mail). -- Maximum message size is 40000 characters. *subscribe-maillist* If you want to join, send a message to @@ -150,7 +134,10 @@ Preferably start Vim with: > Where reproduce.vim is a script that reproduces the problem. Try different machines, if relevant (is this an MS-Windows specific bug perhaps?). -Send me patches if you can! +Send me patches if you can! If you create a pull request on +https://github.com/vim/vim then the automated checks will run and report any +obvious problems. But you can also send the patch by email (use an attachment +to avoid white space changes). It will help to include information about the version of Vim you are using and your setup. You can get the information with this command: > @@ -189,7 +176,7 @@ introduce Y2K problems, but those are no ============================================================================== 3. Credits *credits* *author* *Bram* *Moolenaar* -Most of Vim was written by Bram Moolenaar . +Most of Vim was created by Bram Moolenaar . Parts of the documentation come from several Vi manuals, written by: W.N. Joy @@ -268,6 +255,7 @@ Vim would never have become what it is n Ken Takata fixes and features Kazunobu Kuriyama GTK 3 Christian Brabandt many fixes, features, user support, etc. + Yegappan Lakshmanan many quickfix features I wish to thank all the people that sent me bug reports and suggestions. The list is too long to mention them all here. Vim would not be the same without @@ -300,6 +288,12 @@ Elvis Another Vi clone, made by Steve Ki as flexible as Vim. The version used is 2.1. It is still being developed. Source code is freely available. + *NeoVim* +NeoVim A Vim clone. Forked the Vim source in 2014 and went a different way. + Very much bound to github and has many more dependencies, making + development more complex and limiting portability. Code has been + refactored, resulting in patches not being exchangeable with Vim. + Supports a remote GUI and integration with scripting languages. ============================================================================== 4. Notation *notation* diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -1,4 +1,4 @@ -*message.txt* For Vim version 8.1. Last change: 2018 Feb 04 +*message.txt* For Vim version 8.1. Last change: 2018 Dec 30 VIM REFERENCE MANUAL by Bram Moolenaar @@ -557,14 +557,6 @@ This message is only given when Vim dete tag. Sometimes this message is not given, even though the tags file is not properly sorted. - *E460* > - The resource fork would be lost (add ! to override) - -On the Macintosh (classic), when writing a file, Vim attempts to preserve all -info about a file, including its resource fork. If this is not possible you -get this error message. Append "!" to the command name to write anyway (and -lose the info). - *E424* > Too many different highlighting attributes in use diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt --- a/runtime/doc/sign.txt +++ b/runtime/doc/sign.txt @@ -1,4 +1,4 @@ -*sign.txt* For Vim version 8.1. Last change: 2018 Dec 26 +*sign.txt* For Vim version 8.1. Last change: 2019 Jan 01 VIM REFERENCE MANUAL by Gordon Prieur @@ -88,7 +88,7 @@ See |sign_define()| for the equivalent V :sign define {name} {argument}... Define a new sign or set attributes for an existing sign. The {name} can either be a number (all digits) or a name - starting with a non-digit. Leading digits are ignored, thus + starting with a non-digit. Leading zeros are ignored, thus "0012", "012" and "12" are considered the same name. About 120 different signs can be defined. diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -2702,9 +2702,29 @@ later, and part earlier) adds. RESTRUCTURED TEXT *rst.vim* *ft-rst-syntax* -You may set what syntax definitions should be used for code blocks via > +Syntax highlighting is enabled for code blocks within the document for a +select number of file types. See $VIMRUNTIME/syntax/rst.vim for the default +syntax list. + +To set a user-defined list of code block syntax highlighting: > let rst_syntax_code_list = ['vim', 'lisp', ...] -< + +To assign multiple code block types to a single syntax, define +`rst_syntax_code_list` as a mapping: > + let rst_syntax_code_list = { + \ 'cpp' = ['cpp', 'c++'], + \ 'bash' = ['bash', 'sh'], + ... + } + +To use color highlighting for emphasis text: > + let rst_use_emphasis_colors = 1 + +To enable folding of sections: > + let rst_fold_enabled = 1 + +Note that folding can cause performance issues on some platforms. + REXX *rexx.vim* *ft-rexx-syntax* diff --git a/runtime/doc/tags b/runtime/doc/tags --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -4128,7 +4128,6 @@ E457 print.txt /*E457* E458 message.txt /*E458* E459 message.txt /*E459* E46 message.txt /*E46* -E460 message.txt /*E460* E461 eval.txt /*E461* E462 editing.txt /*E462* E463 netbeans.txt /*E463* @@ -4770,6 +4769,7 @@ N: cmdline.txt /*N:* N various.txt /*N* NFA pattern.txt /*NFA* NL-used-for-Nul pattern.txt /*NL-used-for-Nul* +NeoVim intro.txt /*NeoVim* NetBSD-backspace options.txt /*NetBSD-backspace* NetUserPass() pi_netrw.txt /*NetUserPass()* Normal intro.txt /*Normal* @@ -5291,6 +5291,7 @@ bold syntax.txt /*bold* bom-bytes mbyte.txt /*bom-bytes* book intro.txt /*book* bookmark usr_03.txt /*bookmark* +books intro.txt /*books* boolean options.txt /*boolean* break-finally eval.txt /*break-finally* browse() eval.txt /*browse()* diff --git a/runtime/doc/textprop.txt b/runtime/doc/textprop.txt --- a/runtime/doc/textprop.txt +++ b/runtime/doc/textprop.txt @@ -1,4 +1,4 @@ -*textprop.txt* For Vim version 8.1. Last change: 2018 Dec 27 +*textprop.txt* For Vim version 8.1. Last change: 2018 Dec 30 VIM REFERENCE MANUAL by Bram Moolenaar @@ -70,11 +70,14 @@ Suppose line 11 in a buffer has this tex The number 123 is smaller than 4567. -To highlight the numbers: > +To highlight the numbers in this text: > call prop_type_add('number', {'highlight': 'Constant'}) call prop_add(11, 12, {'length': 3, 'type': 'number'}) call prop_add(11, 32, {'length': 4, 'type': 'number'}) +Try inserting or deleting lines above the text, you will see that the text +properties stick to the text, thus the line number is adjusted as needed. + Setting "start_incl" and "end_incl" is useful when white space surrounds the text, e.g. for a function name. Using false is useful when the text starts and/or ends with a specific character, such as the quote surrounding a string. 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.1. Last change: 2018 Dec 27 +*todo.txt* For Vim version 8.1. Last change: 2019 Jan 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -38,6 +38,9 @@ browser use: https://github.com/vim/vim/ *known-bugs* -------------------- Known bugs and current work ----------------------- +Valgrind error in old regexp engine when using TOhtml. +(Dominique, 2018 Dec 31, #3749) + Possible errors reported from fuzzer. Shadowblade #3716 a) using get_regline() without checking for NULL b) using getcell() in libvterm without checking for NULL @@ -149,6 +152,9 @@ Improve fallback for menu translations, files that source the actual file. E.g. menu_da_de -> menu_da Include part of #3242? +Patch to add 'p' flag to 'formatoptions'. (Tom Ryder, 2018 Dec 28) +Wait a few days for feedback. + When a terminal exit_cb closes the window, a following typed key is lost, if it's in a mapping. (2018 Oct 6, #2302, #3522) @@ -223,6 +229,9 @@ When 'sidescrolloff' is set, using "zl" scrolls back. Should allow for this scrolling, like 'scrolloff' does when using CTRL-E. (Yee Cheng Chin, #3721) +We have a SourcePre autocommand event, but not SourcePost. Useful for doing +some thing after a plugin was loaded. (#3739) + Invalid memory access with old regexp engine. (Dominique Pelle, 2018 Sep 3, #3405) Introduced by 8.0.1517, which was fixing another memory access error. (Sep 8) diff --git a/runtime/ftplugin/help.vim b/runtime/ftplugin/help.vim --- a/runtime/ftplugin/help.vim +++ b/runtime/ftplugin/help.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: Vim help file " Previous Maintainer: Nikolai Weibull -" Latest Revision: 2008-07-09 +" Latest Revision: 2018-12-29 if exists("b:did_ftplugin") finish @@ -11,9 +11,9 @@ let b:did_ftplugin = 1 let s:cpo_save = &cpo set cpo&vim -let b:undo_ftplugin = "setl fo< tw< cole< cocu<" +let b:undo_ftplugin = "setl fo< tw< cole< cocu< keywordprg<" -setlocal formatoptions+=tcroql textwidth=78 +setlocal formatoptions+=tcroql textwidth=78 keywordprg=:help if has("conceal") setlocal cole=2 cocu=nc endif diff --git a/runtime/ftplugin/logcheck.vim b/runtime/ftplugin/logcheck.vim --- a/runtime/ftplugin/logcheck.vim +++ b/runtime/ftplugin/logcheck.vim @@ -1,16 +1,16 @@ " Vim filetype plugin file " Language: Logcheck -" Maintainer: Debian Vim Maintainers -" Last Change: 2012 Jan 15 +" Maintainer: Debian Vim Maintainers +" Last Change: 2018 Dec 27 " License: Vim License -" URL: http://hg.debian.org/hg/pkg-vim/vim/file/unstable/runtime/ftplugin/logcheck.vim +" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/ftplugin/logcheck.vim -if exists("b:did_ftplugin") +if exists('b:did_ftplugin') finish endif let b:did_ftplugin = 1 -let b:undo_ftplugin = "setl fo<" +let b:undo_ftplugin = 'setl fo<' " Do not hard-wrap non-comment lines since each line is a self-contained " regular expression diff --git a/runtime/ftplugin/rst.vim b/runtime/ftplugin/rst.vim --- a/runtime/ftplugin/rst.vim +++ b/runtime/ftplugin/rst.vim @@ -3,7 +3,7 @@ " Maintainer: Marshall Ward " Original Maintainer: Nikolai Weibull " Website: https://github.com/marshallward/vim-restructuredtext -" Latest Revision: 2018-01-07 +" Latest Revision: 2018-12-29 if exists("b:did_ftplugin") finish @@ -13,6 +13,11 @@ let b:did_ftplugin = 1 let s:cpo_save = &cpo set cpo&vim +"Disable folding +if !exists('g:rst_fold_enabled') + let g:rst_fold_enabled = 0 +endif + let b:undo_ftplugin = "setl com< cms< et< fo<" setlocal comments=fb:.. commentstring=..\ %s expandtab diff --git a/runtime/pack/dist/opt/matchit/doc/matchit.txt b/runtime/pack/dist/opt/matchit/doc/matchit.txt --- a/runtime/pack/dist/opt/matchit/doc/matchit.txt +++ b/runtime/pack/dist/opt/matchit/doc/matchit.txt @@ -4,7 +4,7 @@ For instructions on installing this file :help matchit-install inside Vim. -For Vim version 6.3. Last change: 2017 May 14 +For Vim version 6.3. Last change: 2018 Dec 31 VIM REFERENCE MANUAL by Benji Fisher @@ -19,9 +19,6 @@ 5. Known Bugs and Limitations |matchi The functionality mentioned here is a plugin, see |add-plugin|. This plugin is only available if 'compatible' is not set. -You can avoid loading this plugin by setting the "loaded_matchit" variable -in your |vimrc| file: > - :let loaded_matchit = 1 {Vi does not have any of this} diff --git a/runtime/pack/dist/opt/matchit/plugin/matchit.vim b/runtime/pack/dist/opt/matchit/plugin/matchit.vim --- a/runtime/pack/dist/opt/matchit/plugin/matchit.vim +++ b/runtime/pack/dist/opt/matchit/plugin/matchit.vim @@ -1,5 +1,5 @@ " matchit.vim: (global plugin) Extended "%" matching -" Last Change: 2018 Jul 3 by Christian Brabandt +" Last Change: 2018 Dec 31 " Maintainer: Benji Fisher PhD " Version: 1.13.3, for Vim 6.3+ " Fix from Fernando Torres included. @@ -37,8 +37,7 @@ " TODO: Add a level of indirection, so that custom % scripts can use my " work but extend it. -" allow user to prevent loading -" and prevent duplicate loading +" Allow user to prevent loading and prevent duplicate loading. if exists("loaded_matchit") || &cp finish endif diff --git a/runtime/syntax/automake.vim b/runtime/syntax/automake.vim --- a/runtime/syntax/automake.vim +++ b/runtime/syntax/automake.vim @@ -1,9 +1,9 @@ " Vim syntax file -" Language: automake Makefile.am -" Maintainer: Debian VIM Maintainers -" Former Maintainer: John Williams -" Last Change: 2011-06-13 -" URL: http://anonscm.debian.org/hg/pkg-vim/vim/raw-file/unstable/runtime/syntax/automake.vim +" Language: automake Makefile.am +" Maintainer: Debian Vim Maintainers +" Former Maintainer: John Williams +" Last Change: 2018 Dec 27 +" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/automake.vim " " XXX This file is in need of a new maintainer, Debian VIM Maintainers maintain " it only because patches have been submitted for it by Debian users and the @@ -18,7 +18,7 @@ " EXTRA_SOURCES. " Standard syntax initialization -if exists("b:current_syntax") +if exists('b:current_syntax') finish endif @@ -37,8 +37,8 @@ syn match automakeConditional "^\(if\s*! syn match automakeSubst "@\w\+@" syn match automakeSubst "^\s*@\w\+@" -syn match automakeComment1 "#.*$" contains=automakeSubst -syn match automakeComment2 "##.*$" +syn match automakeComment1 "#.*$" contains=automakeSubst,@Spell +syn match automakeComment2 "##.*$" contains=@Spell syn match automakeMakeError "$[{(][^})]*[^a-zA-Z0-9_})][^})]*[})]" " GNU make function call syn match automakeMakeError "^AM_LDADD\s*\ze+\==" " Common mistake @@ -72,6 +72,6 @@ hi def link automakeMakeSString makeSStr hi def link automakeMakeBString makeBString -let b:current_syntax = "automake" +let b:current_syntax = 'automake' " vi: ts=8 sw=4 sts=4 diff --git a/runtime/syntax/rst.vim b/runtime/syntax/rst.vim --- a/runtime/syntax/rst.vim +++ b/runtime/syntax/rst.vim @@ -3,7 +3,7 @@ " Maintainer: Marshall Ward " Previous Maintainer: Nikolai Weibull " Website: https://github.com/marshallward/vim-restructuredtext -" Latest Revision: 2018-07-23 +" Latest Revision: 2018-12-29 if exists("b:current_syntax") finish @@ -59,6 +59,7 @@ syn keyword rstTodo cont execute 'syn region rstComment contained' . \ ' start=/.*/' + \ ' skip=+^$+' . \ ' end=/^\s\@!/ contains=rstTodo' execute 'syn region rstFootnote contained matchgroup=rstDirective' . diff --git a/runtime/syntax/tpp.vim b/runtime/syntax/tpp.vim --- a/runtime/syntax/tpp.vim +++ b/runtime/syntax/tpp.vim @@ -1,11 +1,11 @@ " Vim syntax file -" Language: tpp - Text Presentation Program -" Maintainer: Debian Vim Maintainers -" Former Maintainer: Gerfried Fuchs -" Last Change: 2007-10-14 -" URL: http://git.debian.org/?p=pkg-vim/vim.git;a=blob_plain;f=runtime/syntax/tpp.vim;hb=debian -" Filenames: *.tpp -" License: BSD +" Language: tpp - Text Presentation Program +" Maintainer: Debian Vim Maintainers +" Former Maintainer: Gerfried Fuchs +" Last Change: 2018 Dec 27 +" URL: https://salsa.debian.org/vim-team/vim-debian/master/syntax/tpp.vim +" Filenames: *.tpp +" License: BSD " " XXX This file is in need of a new maintainer, Debian VIM Maintainers maintain " it only because patches have been submitted for it by Debian users and the @@ -18,11 +18,11 @@ " SPAM is _NOT_ welcome - be ready to be reported! " quit when a syntax file was already loaded -if exists("b:current_syntax") +if exists('b:current_syntax') finish endif -if !exists("main_syntax") +if !exists('main_syntax') let main_syntax = 'tpp' endif @@ -46,7 +46,7 @@ syn region tppNewPageOption start="^--ne syn region tppPageLocalOption start="^--\%(heading\|center\|right\|huge\|sethugefont\|exec\)" end="$" contains=tppPageLocalOptionKey oneline syn region tppAbstractOption start="^--\%(author\|title\|date\|footer\)" end="$" contains=tppAbstractOptionKey oneline -if main_syntax != 'sh' +if main_syntax !=# 'sh' " shell command syn include @tppShExec syntax/sh.vim unlet b:current_syntax @@ -78,6 +78,6 @@ hi def link tppNewPageOption Error hi def link tppTimeOption Error -let b:current_syntax = "tpp" +let b:current_syntax = 'tpp' " vim: ts=8 sw=2 diff --git a/runtime/tutor/tutor.es b/runtime/tutor/tutor.es --- a/runtime/tutor/tutor.es +++ b/runtime/tutor/tutor.es @@ -256,7 +256,7 @@ NOTE: Para los aventureros, pulsando sólo el objeto estando en modo Normal 2. Para borrar desde el cursor hasta el final de una línea pulse: d$ - 3. Para borrar una línea enter pulse: dd + 3. Para borrar una línea entera pulse: dd 4. El formato de un mandato en modo Normal es: 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 @@ -256,7 +256,7 @@ NOTE: Para los aventureros, pulsando sólo el objeto estando en modo Normal 2. Para borrar desde el cursor hasta el final de una línea pulse: d$ - 3. Para borrar una línea enter pulse: dd + 3. Para borrar una línea entera pulse: dd 4. El formato de un mandato en modo Normal es: