diff options
| -rw-r--r-- | runtime/colors/koehler.vim | 3 | ||||
| -rw-r--r-- | runtime/doc/autocmd.txt | 16 | ||||
| -rw-r--r-- | runtime/doc/eval.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/if_pyth.txt | 10 | ||||
| -rw-r--r-- | runtime/doc/message.txt | 1 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 9 | ||||
| -rw-r--r-- | runtime/doc/various.txt | 2 | ||||
| -rw-r--r-- | runtime/ftplugin/scala.vim | 2 | ||||
| -rw-r--r-- | runtime/syntax/awk.vim | 12 | ||||
| -rw-r--r-- | runtime/syntax/help.vim | 4 | ||||
| -rw-r--r-- | runtime/syntax/prolog.vim | 6 | ||||
| -rw-r--r-- | runtime/syntax/uil.vim | 4 |
12 files changed, 45 insertions, 26 deletions
diff --git a/runtime/colors/koehler.vim b/runtime/colors/koehler.vim index a36f9f6972..250472a162 100644 --- a/runtime/colors/koehler.vim +++ b/runtime/colors/koehler.vim @@ -2,7 +2,7 @@ " vim: tw=0 ts=4 sw=4 " Vim color file " Maintainer: Ron Aaron <ron@ronware.org> -" Last Change: 2013 May 23 +" Last Change: 2016 Sep 04 hi clear set background=dark @@ -45,6 +45,7 @@ hi TabLineFill term=bold,reverse cterm=bold ctermfg=lightblue ctermbg=white g hi TabLineSel term=reverse ctermfg=white ctermbg=lightblue guifg=white guibg=blue hi Underlined term=underline cterm=bold,underline ctermfg=lightblue guifg=lightblue gui=bold,underline hi Ignore ctermfg=black ctermbg=black guifg=black guibg=black +hi EndOfBuffer term=bold cterm=bold ctermfg=darkred guifg=#cc0000 gui=bold hi link IncSearch Visual hi link String Constant hi link Character Constant diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index e7c7b0d71a..77015d35ee 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -422,8 +422,8 @@ BufUnload Before unloading a buffer. This is when the NOTE: When this autocommand is executed, the current buffer "%" may be different from the buffer being unloaded "<afile>". - Don't change to another buffer, it will cause - problems. + Don't change to another buffer or window, it + will cause problems! When exiting and v:dying is 2 or more this event is not triggered. *BufWinEnter* @@ -794,7 +794,9 @@ QuickFixCmdPre Before a quickfix command is run (|:make|, |:vimgrepadd|, |:lvimgrepadd|, |:cscope|, |:cfile|, |:cgetfile|, |:caddfile|, |:lfile|, |:lgetfile|, |:laddfile|, |:helpgrep|, - |:lhelpgrep|). + |:lhelpgrep|, |:cexpr|, |:cgetexpr|, + |:caddexpr|, |:cbuffer|, |:cgetbuffer|, + |:caddbuffer|). The pattern is matched against the command being run. When |:grep| is used but 'grepprg' is set to "internal" it still matches "grep". @@ -1086,6 +1088,9 @@ Note that for all systems the '/' character is used for path separator (even Windows). This was done because the backslash is difficult to use in a pattern and to make the autocommands portable across different systems. +It is possible to use |pattern| items, but they may not work as expected, +because of the translation done for the above. + *autocmd-changes* Matching with the pattern is done when an event is triggered. Changing the buffer name in one of the autocommands, or even deleting the buffer, does not @@ -1184,11 +1189,12 @@ name! different from existing {event} names, as this most likely will not do what you intended. - *:augroup-delete* *E367* *W19* + *:augroup-delete* *E367* *W19* *E936* :aug[roup]! {name} Delete the autocmd group {name}. Don't use this if there is still an autocommand using this group! You will get a warning if doing - it anyway. + it anyway. when the group is the current group + you will get error E936. To enter autocommands for a specific group, use this method: 1. Select the group with ":augroup {name}". diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index f35754e979..d65783cea0 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -107,7 +107,7 @@ To test for a non-empty string, use empty(): > *non-zero-arg* Function arguments often behave slightly different from |TRUE|: If the argument is present and it evaluates to a non-zero Number, |v:true| or a -non-empty String, then the value is considere to be TRUE. +non-empty String, then the value is considered to be TRUE. Note that " " and "0" are also non-empty strings, thus cause the mode to be cleared. A List, Dictionary or Float is not a Number or String, thus evaluates to FALSE. diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt index 6321175420..8d6a3e1cfa 100644 --- a/runtime/doc/if_pyth.txt +++ b/runtime/doc/if_pyth.txt @@ -48,7 +48,11 @@ Example: > print 'EAT ME' EOF endfunction -< + +To see what version of Python you have: > + :python import sys + :python print(sys.version) + Note: Python is very sensitive to the indenting. Make sure the "class" line and "EOF" do not have any indent. @@ -693,6 +697,10 @@ The `:py3` and `:python3` commands work similar to `:python`. A simple check if the `:py3` command is working: > :py3 print("Hello") < *:py3file* +To see what version of Python you have: > + :py3 import sys + :py3 print(sys.version) + The `:py3file` command works similar to `:pyfile`. *:py3do* The `:py3do` command works similar to `:pydo`. diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt index 5c2dddc8b3..e619cfde30 100644 --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -39,6 +39,7 @@ back. Note: If the output has been stopped with "q" at the more prompt, it will only be displayed up to this point. The previous command output is cleared when another command produces output. +The "g<" output is not redirected. If you want to find help on a specific (error) message, use the ID at the start of the message. For example, to get help on the message: > diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 266ceb9136..7ca6612225 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -3920,10 +3920,11 @@ A jump table for the options with a short description can be found at |Q_op|. global Changes the special characters that can be used in search patterns. See |pattern|. - NOTE: To avoid portability problems with using patterns, always keep - this option at the default "on". Only switch it off when working with - old Vi scripts. In any other situation write patterns that work when - 'magic' is on. Include "\M" when you want to |/\M|. + WARNING: Switching this option off most likely breaks plugins! That + is because many patterns assume it's on and will fail when it's off. + Only switch it off when working with old Vi scripts. In any other + situation write patterns that work when 'magic' is on. Include "\M" + when you want to |/\M|. *'makeef'* *'mef'* 'makeef' 'mef' string (default: "") diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index cee13c9ee8..1a93a4504f 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -369,7 +369,7 @@ N *+statusline* Options 'statusline', 'rulerformat' and special formats of 'titlestring' and 'iconstring' N *+syntax* Syntax highlighting |syntax| N *+tablineat* 'tabline' option recognizing %@Func@ items. -N *+tag_binary* binary searching in tags file |tag-binary-search| +T *+tag_binary* binary searching in tags file |tag-binary-search| N *+tag_old_static* old method for static tags |tag-old-static| m *+tag_any_white* any white space allowed in tags file |tag-any-white| B *+termguicolors* 24-bit color in xterm-compatible terminals support diff --git a/runtime/ftplugin/scala.vim b/runtime/ftplugin/scala.vim index e409950107..18e16f1d5b 100644 --- a/runtime/ftplugin/scala.vim +++ b/runtime/ftplugin/scala.vim @@ -32,6 +32,4 @@ setlocal includeexpr='substitute(v:fname,"\\.","/","g")' setlocal path+=src/main/scala,src/test/scala setlocal suffixesadd=.scala -compiler sbt - " vim:set sw=2 sts=2 ts=8 et: diff --git a/runtime/syntax/awk.vim b/runtime/syntax/awk.vim index ae0f217580..7c0682ce9f 100644 --- a/runtime/syntax/awk.vim +++ b/runtime/syntax/awk.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: awk, nawk, gawk, mawk " Maintainer: Antonio Colombo <azc100@gmail.com> -" Last Change: 2016 Jul 15 +" Last Change: 2016 Sep 05 " AWK ref. is: Alfred V. Aho, Brian W. Kernighan, Peter J. Weinberger " The AWK Programming Language, Addison-Wesley, 1988 @@ -71,6 +71,10 @@ syn keyword awkVariables ARGC ARGV ARGIND ENVIRON ERRNO FILENAME syn keyword awkVariables FNR NF FUNCTAB NR PROCINFO RLENGTH RSTART syn keyword awkVariables RT SYMTAB +" Arithmetic operators: +, and - take care of ++, and -- +syn match awkOperator "+\|-\|\*\|/\|%\|=" +syn match awkOperator "+=\|-=\|\*=\|/=\|%=" +syn match awkOperator "\^\|\^=" " Octal format character. syn match awkSpecialCharacter display contained "\\[0-7]\{1,3\}" @@ -124,11 +128,6 @@ syn case match "syn match awkIdentifier "\<[a-zA-Z_][a-zA-Z0-9_]*\>" -" Arithmetic operators: +, and - take care of ++, and -- -syn match awkOperator "+\|-\|\*\|/\|%\|=" -syn match awkOperator "+=\|-=\|\*=\|/=\|%=" -syn match awkOperator "^\|^=" - " Comparison expressions. syn match awkExpression "==\|>=\|=>\|<=\|=<\|\!=" syn match awkExpression "\~\|\!\~" @@ -167,7 +166,6 @@ syn region awkArray transparent start="\[" end="\]" contains=awkArray,awkArrayE syn sync ccomment awkArray maxlines=10 " Define the default highlighting. -" Only used when an item doesn't have highlighting yet hi def link awkConditional Conditional hi def link awkFunction Function hi def link awkRepeat Repeat diff --git a/runtime/syntax/help.vim b/runtime/syntax/help.vim index 41bb0b1938..d23aab9f7f 100644 --- a/runtime/syntax/help.vim +++ b/runtime/syntax/help.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Vim help file " Maintainer: Bram Moolenaar (Bram@vim.org) -" Last Change: 2016 Apr 01 +" Last Change: 2016 Sep 02 " Quit when a (custom) syntax file was already loaded if exists("b:current_syntax") @@ -50,6 +50,7 @@ else syn match helpIgnore "." contained endif syn keyword helpNote note Note NOTE note: Note: NOTE: Notes Notes: +syn keyword helpWarning WARNING: Warning: syn match helpSpecial "\<N\>" syn match helpSpecial "\<N\.$"me=e-1 syn match helpSpecial "\<N\.\s"me=e-2 @@ -161,6 +162,7 @@ hi def link helpExample Comment hi def link helpOption Type hi def link helpSpecial Special hi def link helpNote Todo +hi def link helpWarning Todo hi def link helpComment Comment hi def link helpConstant Constant diff --git a/runtime/syntax/prolog.vim b/runtime/syntax/prolog.vim index f8fb966b66..3b09bb3548 100644 --- a/runtime/syntax/prolog.vim +++ b/runtime/syntax/prolog.vim @@ -1,7 +1,9 @@ " Vim syntax file " Language: PROLOG -" Maintainers: Thomas Koehler <jean-luc@picard.franken.de> -" Last Change: 2013 May 23 +" Maintainer: Thomas Koehler <jean-luc@picard.franken.de> +" Please be aware: I'm often slow to answer email due to a high +" non-computer related workload (sometimes 4-8 weeks) +" Last Change: 2016 September 6 " URL: http://gott-gehabt.de/800_wer_wir_sind/thomas/Homepage/Computer/vim/syntax/prolog.vim " There are two sets of highlighting in here: diff --git a/runtime/syntax/uil.vim b/runtime/syntax/uil.vim index ccf07d5a24..088a0f6c86 100644 --- a/runtime/syntax/uil.vim +++ b/runtime/syntax/uil.vim @@ -1,7 +1,9 @@ " Vim syntax file " Language: Motif UIL (User Interface Language) " Maintainer: Thomas Koehler <jean-luc@picard.franken.de> -" Last Change: 2013 May 23 +" Please be aware: I'm often slow to answer email due to a high +" non-computer related workload (sometimes 4-8 weeks) +" Last Change: 2016 September 6 " URL: http://gott-gehabt.de/800_wer_wir_sind/thomas/Homepage/Computer/vim/syntax/uil.vim " quit when a syntax file was already loaded |