diff options
-rw-r--r-- | runtime/doc/eval.txt | 4 | ||||
-rw-r--r-- | runtime/doc/insert.txt | 10 | ||||
-rw-r--r-- | runtime/doc/motion.txt | 4 | ||||
-rw-r--r-- | runtime/doc/options.txt | 2 | ||||
-rw-r--r-- | runtime/doc/todo.txt | 129 | ||||
-rw-r--r-- | runtime/filetype.vim | 9 | ||||
-rw-r--r-- | runtime/ftplugin/kconfig.vim | 13 | ||||
-rw-r--r-- | runtime/ftplugin/spec.vim | 34 | ||||
-rw-r--r-- | runtime/ftplugin/zsh.vim | 9 | ||||
-rw-r--r-- | runtime/indent/javascript.vim | 6 | ||||
-rw-r--r-- | runtime/indent/zsh.vim | 9 | ||||
-rw-r--r-- | runtime/syntax/cpp.vim | 6 | ||||
-rw-r--r-- | runtime/syntax/css.vim | 127 | ||||
-rw-r--r-- | runtime/syntax/debchangelog.vim | 15 | ||||
-rw-r--r-- | runtime/syntax/debcontrol.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/debsources.vim | 34 | ||||
-rw-r--r-- | runtime/syntax/groovy.vim | 6 | ||||
-rw-r--r-- | runtime/syntax/kconfig.vim | 7 | ||||
-rw-r--r-- | runtime/syntax/po.vim | 8 | ||||
-rw-r--r-- | runtime/syntax/rc.vim | 9 | ||||
-rw-r--r-- | runtime/syntax/vhdl.vim | 49 | ||||
-rw-r--r-- | runtime/syntax/zsh.vim | 189 |
22 files changed, 506 insertions, 177 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 9015c8c843..dd679ccc2e 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.4. Last change: 2015 Apr 11 +*eval.txt* For Vim version 7.4. Last change: 2015 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2961,6 +2961,8 @@ extend({expr1}, {expr2} [, {expr3}]) *extend()* {expr1} is changed when {expr2} is not empty. If necessary make a copy of {expr1} first. {expr2} remains unchanged. + When {expr1} is locked and {expr2} is not empty the operation + fails. Returns {expr1}. diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index 2a114bc095..45dc58ef17 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1,4 +1,4 @@ -*insert.txt* For Vim version 7.4. Last change: 2014 Aug 04 +*insert.txt* For Vim version 7.4. Last change: 2015 May 22 VIM REFERENCE MANUAL by Bram Moolenaar @@ -81,9 +81,11 @@ CTRL-W Delete the word before the cursor (see |i_backspacing| about joining lines). See the section "word motions", |word-motions|, for the definition of a word. *i_CTRL-U* -CTRL-U Delete all entered characters in the current line (see - |i_backspacing| about joining lines). - +CTRL-U Delete all entered characters before the cursor in the current + line. If there are no newly entereed characters and + 'backspace'is not empty, delete all characters before the + cursor in the current line. + See |i_backspacing| about joining lines. *i_CTRL-I* *i_<Tab>* *i_Tab* <Tab> or CTRL-I Insert a tab. If the 'expandtab' option is on, the equivalent number of spaces is inserted (use CTRL-V <Tab> to diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt index eaa2d8df35..97160ad4d8 100644 --- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -1,4 +1,4 @@ -*motion.txt* For Vim version 7.4. Last change: 2014 Feb 11 +*motion.txt* For Vim version 7.4. Last change: 2015 Jun 06 VIM REFERENCE MANUAL by Bram Moolenaar @@ -172,6 +172,8 @@ CTRL-H or *CTRL-H* *<BS>* l or *l* <Right> or *<Right>* *<Space>* <Space> [count] characters to the right. |exclusive| motion. + See the 'whichwrap' option for adjusting the behavior + at end of line *0* 0 To the first character of the line. |exclusive| diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 21cf6503f9..31210393bb 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.4. Last change: 2015 Feb 17 +*options.txt* For Vim version 7.4. Last change: 2015 May 04 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 4a441d7894..afd737b5d8 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.4. Last change: 2015 Apr 15 +*todo.txt* For Vim version 7.4. Last change: 2015 Jun 09 VIM REFERENCE MANUAL by Bram Moolenaar @@ -78,45 +78,94 @@ Patch to make getregtype() return the right size for non-linux systems. (Yasuhiro Matsumoto, 2014 Jul 8) Breaks test_eval. Inefficient, can we only compute y_width when needed? -Show Vim icon in Windows context menu. Issue 249. (Mario Weber, 2015 Apr 11) +Patch to fix test (Christian, 2015 May 5) + +Patch to fix ml_get error. (Yukihiro Nakadaira, 2015 May 22) + +Patch for neovim. (Christian, 2015 May 5) Problem that a previous silent ":throw" causes a following try/catch not to work. (ZyX, 2013 Sep 28) Problem using ":try" inside ":execute". (ZyX, 2013 Sep 15) +Regression for v_b_A. (Ingo Karkat, 2015 May 18) + +Patch for memory access problem. (Dominique Pelle, 2015 May 5) + R indent files update. (Jakson Alves de Aquino, Mar 31) Updated Python syntax file. (Dmitry Vasiliev, Mar 30) +Discucussion about what version to use, Petkovic, 2015 May 19. +Patch for existing syntax file, Zvezdan Petkovic, 2015 May 17) ":cd C:\Windows\System32\drivers\etc*" does not work, even though the directory exists. (Sergio Gallelli, 2013 Dec 29) +Patch on issue 361 by James McCoy. + +Patch on issue 365. + +Patch to add "vsplit" to 'switchbuf'. (Brook Hong, 2015 Jun 4) + +patch to fix that "p" in Visual mode does not break line in expected place. +(Yukihiro Nakadaira, 2015 May 23) + +Patch to fix that wide characters do not work properly after exiting. +(Yasuhiro Matsumoto, 2015 May 24) Better patch to come. + +Patch to add grepfile(). (Scott Prager, 2015 May 26) + +keymap for Russian typewriter layout. (Danwerspb, 2015 May 15) + +Patch for man.vim. (SungHyun Nam, 2015 May 20) +Doesn't work completely (Dominique Orban) + +Invalid memory access in regexp.c. (Dominique Pelle, 2015 May 23) + Using ":windo" to set options in all windows has the side effect that it changes the window layout and the current window. Make a variant that saves and restores. Use in the matchparen plugin. Perhaps we can use ":silent window"? -Patch to make Ruby 2.2 work. (Andrei Olsen) +Patch for :[count]tag" not always working. (Hirohito Higashi, 2015 May 19) + +Include the LogiPat plugin in the distribution? + +Patch to fix that ":cnext" jumps to the wrong column. (Hirohito Higashi, 2015 +May 17, second patch) -Window drawn wrong with 'laststatus' zero and a command-line window. -(Yclept Nemo, 2015 Apr 7) -Patch by Christian, Apr 8. +Pull request for jcukenwintype.vim. (Denis Proskurin, 2015 May 15) -Patch to make undo files not executable. (Mikael Berthe, 2015 Apr 5) +Patch for appending in Visual mode with 'linebreak' set. +(Christian Brabandt, 2015 Jun 1) + +Patch to make CTRL-A in Visual mode increment all Visually selected numbers. +Same for decrement with CTRL-X. (Christian Brabandt, 2015 Jun 8) C indent: should recognize C11 raw strings. (Mark Lodato, 2015 Mar 1) -Need to recognize R"string". +Need to recognize R"string" for 'cindent'. + +Updated phpcomplete. (Mikolaj Machowski, 2015 May 6) + +Patch to detect background terminal color in xterm. (Lubomir Rintel, 2015 Jun +1) -Patch for :tabmove not working as documented. (Hirohito Higashi, 2015 Mar 10) -https://gist.github.com/h-east/ffabb0cdd589a5f9acd2 -Updated patch emailed. (Mar 17) Awaiting comments. +Patch to fix that in command-line window first character is erased +when conceallevel is set. (Hirohito Higashi, 2015 May 12) Crash when changing the 'tags' option from a remote command. -(Benjamin Fritz, 2015 Mar 18) +(Benjamin Fritz, 2015 Mar 18, stack trace Mar 20) + +Patch on issue 361. + +Patch on issue 362. Gvim: when both Tab and CTRL-I are mapped, use CTRL-I not for Tab. +Can src/GvimExt/Make_cyg.mak be removed? +Same for src/xxd/Make_cyg.mak + Python: ":py raw_input('prompt')" doesn't work. (Manu Hack) MS-Windows: When editing a file with a leading space, writing it uses the @@ -125,14 +174,22 @@ wrong name. (Aram, 2014 Nov 7) Vim 7.4. Can't recognize the $ProgramFiles(x86) environment variable. Recognize it specifically? First try with the parens, then without. +Patch to force redraw after ":syn spell" command. (Christian, 2015 May 8) + Value returned by virtcol() changes depending on how lines wrap. This is inconsistent with the documentation. Better greek spell checking. Issue 299. +Patch to add 'completeselect' option. Specifies how to select a candidate in +insert completion. (Shougo, 2013 May 29) +Update to add to existing 'completeopt'. 2013 May 30 + When complete() first argument is before where insert started and 'backspace' is Vi compatible, the completion fails. (Hirohito Higashi, 2015 Feb 19) +Patch to fix equivalence classes in regexp. (Dominique Pelle, 2015 Jun 2) + Weird encryption problems on Windows. (Ben Fritz, 2015 Feb 13) Goes away when disabling the swap file. (might1, Feb 16) @@ -148,16 +205,13 @@ Build with Python on Mac does not always use the right library. ml_updatechunk() is slow when retrying for another encoding. (John Little, 2014 Sep 11) -Patch to add 'space' argument to 'listchars'. (Issue 350) -Author: David Bürgin +Patch to use different terminal mode settings for system(). (Hayaki Saito) +Does this work for everybody? When a session file is created and there are "nofile" buffers, these are not filled. Need to trigger BufReadCmd autocommands. Also handle deleting the initial empty buffer better. (ZyX, 2015 March 8) -Calling setreg() with an empty list doesn't work. -Patch by Yasuhiro Matsumoto, 2014 Dec 14. - Extended file attributes lost on write (backupcopy=no). Issue 306. Patch to add an argument to ":ls" for specific kinds of buffers. @@ -170,8 +224,16 @@ from two windows? Stopped happening (Feb 5). Patch for an extra argument to matchadd() for conceal. (Christian Brabandt, 2015 Feb 17, update Feb 19) +Patch to add v:completed_item. (Shougo Matsu, 2013 Nov 29). +Update 2015 May 30. + +Patch to add :lockjumps. (Carlo Baldassi, 2015 May 25) +OK to not block marks? + Mixup of highlighting when there is a match and SpellBad. (ZyX, 2015 Jan 1) +Patch on issue 79: use 'path' option for filename completion. + Patch to add 'belloff' option. (Christian Brabandt, 2015 Jan 31) Update Feb 6. @@ -217,11 +279,24 @@ With test, Nov 23. Wrong scrolling when using incsearch. Patch by Christian Brabandt, 2014 Dec 4. Is this a good solution? +Patch to allow setting w:quickfix_title via setqflist() and setloclist() +functions. (Christian Brabandt, 2013 May 8, update May 21) +Patch to add getlocstack() / setlocstack(). (Christian Brabandt, 2013 May 14) +Second one. Update May 22. +Update by Daniel Hahler, 2014 Jul 4, Aug 14, Oct 14, Oct 15. + +Patch: Let rare word highlighting overrule good word highlighting. +(Jakson A. Aquino, 2010 Jul 30, again 2011 Jul 2) + +Patch to add digits argument to round(). (Yasuhiro Matsumoto, 2015 Apr 26) + Can assign to s:type when a function s:type has been defined. Also the other way around: define a function while a variable with that name was already defined. (Yasuhiro Matsumoto, 2014 Nov 3) +Patch for ordered dict. (Ozaki Kiichi, 2015 May 7) + Patch to make closed folds line up. (Charles Campbell, 2014 Sep 12) Remark from Roland Eggner: does it cause crashes? (2014 Dec 12) Updated patch by Roland Eggner, Dec 16 @@ -264,6 +339,11 @@ No error for missing endwhile. (ZyX, 2014 Mar 20) The entries added by matchaddpos() are returned by getmatches() but can't be set with setmatches(). (lcd47, 2014 Jun 29) +Patch to make extend() fail early when it might fail at some point. +(Olaf Dabrunz, 2015 May 2) Makes extend() slower, do we still want it? +Perhaps only the checks that can be done without looping over the dict or +arguments. + Patch to add :arglocal and :arglists. (Marcin Szamotulski, 2014 Aug 6) PHP syntax is extremely slow. (Anhad Jai Singh, 2014 Jan 19) @@ -382,8 +462,6 @@ Remark on the docs. Should not be a compile time feature. But then what? Completion of ":e" is ":earlier", should be ":edit". Complete to the matching command instead of doing this alphabetically. (Mikel Jorgensen) -Patch to add v:completed_item. (Shougo Matsu, 2013 Nov 29). - Patch to get MSVC version in a nicer way. (Ken Takata, 2014 Jul 24) Patch to define macros for hardcoded values. (Elias Diem, 2013 Dec 14) @@ -518,12 +596,6 @@ Dialog is too big on Linux too. (David Fishburn, 2013 Sep 2) Patch to check whether a buffer is quickfix or a location list. (Yasuhiro Matsumoto, 2014 Dec 9) -Patch to allow setting w:quickfix_title via setqflist() and setloclist() -functions. (Christian Brabandt, 2013 May 8, update May 21) -Patch to add getlocstack() / setlocstack(). (Christian Brabandt, 2013 May 14) -Second one. Update May 22. -Update by Daniel Hahler, 2014 Jul 4, Aug 14, Oct 14, Oct 15. - Patch to make fold updates much faster. (Christian Brabandt, 2012 Dec) Issue 54: document behavior of -complete, also expands arg. @@ -572,10 +644,6 @@ signs? Patch by Christian Brabandt, 2013 Aug 22. Patch to remove flicker from popup menu. (Yasuhiro Matsumoto, 2013 Aug 15) -Patch to add 'completeselect' option. Specifies how to select a candidate in -insert completion. (Shougo, 2013 May 29) -Update to add to existing 'completeopt'. 2013 May 30 - Problem with refresh:always in completion. (Tyler Wade, 2013 Mar 17) b:undo_ftplugin cannot call a script-local function. (Boris Danilov, 2013 Jan @@ -1002,9 +1070,6 @@ Patch for GVimExt to show an icon. (Dominik Riebeling, 2010 Nov 7) When writing a file > 2Gbyte, the reported number of bytes is negative. (Antonio Colombo, 2010 Dec 18) -Patch: Let rare word highlighting overrule good word highlighting. -(Jakson A. Aquino, 2010 Jul 30, again 2011 Jul 2) - When 'lines' is 25 and 'scrolloff' is 12, "j" scrolls zero or two lines instead of one. (Constantin Pan, 2010 Sep 10) diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 745503618c..7529a60cc3 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2015 Apr 06 +" Last Change: 2015 Jun 06 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -499,7 +499,7 @@ au BufNewFile,BufRead *.prg \ endif " Clojure -au BufNewFile,BufRead *.clj,*.cljs setf clojure +au BufNewFile,BufRead *.clj,*.cljs,*.cljx,*.cljc setf clojure " Cmake au BufNewFile,BufRead CMakeLists.txt,*.cmake,*.cmake.in setf cmake @@ -776,10 +776,9 @@ au BufNewFile,BufRead *.mo,*.gdmo setf gdmo au BufNewFile,BufRead *.ged,lltxxxxx.txt setf gedcom " Git -au BufNewFile,BufRead *.git/COMMIT_EDITMSG setf gitcommit -au BufNewFile,BufRead *.git/MERGE_MSG setf gitcommit +au BufNewFile,BufRead COMMIT_EDITMSG setf gitcommit +au BufNewFile,BufRead MERGE_MSG setf gitcommit au BufNewFile,BufRead *.git/config,.gitconfig,.gitmodules setf gitconfig -au BufNewFile,BufRead *.git/modules/*/COMMIT_EDITMSG setf gitcommit au BufNewFile,BufRead *.git/modules/*/config setf gitconfig au BufNewFile,BufRead */.config/git/config setf gitconfig if !empty($XDG_CONFIG_HOME) diff --git a/runtime/ftplugin/kconfig.vim b/runtime/ftplugin/kconfig.vim index 1b10c86ae3..940ba7427f 100644 --- a/runtime/ftplugin/kconfig.vim +++ b/runtime/ftplugin/kconfig.vim @@ -1,6 +1,10 @@ " Vim filetype plugin file -" Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2008-07-09 +" Vim syntax file +" Maintainer: Christian Brabandt <cb@256bit.org> +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2015-05-29 +" License: Vim (see :h license) +" Repository: https://github.com/chrisbra/vim-kconfig if exists("b:did_ftplugin") finish @@ -14,5 +18,10 @@ let b:undo_ftplugin = "setl com< cms< fo<" setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql +" For matchit.vim +if exists("loaded_matchit") + let b:match_words = '^\<menu\>:\<endmenu\>,^\<if\>:\<endif\>,^\<choice\>:\<endchoice\>' +endif + let &cpo = s:cpo_save unlet s:cpo_save diff --git a/runtime/ftplugin/spec.vim b/runtime/ftplugin/spec.vim index d4576598e0..6d5bf4b806 100644 --- a/runtime/ftplugin/spec.vim +++ b/runtime/ftplugin/spec.vim @@ -2,7 +2,7 @@ " Filename: spec.vim " Maintainer: Igor Gnatenko i.gnatenko.brain@gmail.com " Former Maintainer: Gustavo Niemeyer <niemeyer@conectiva.com> (until March 2014) -" Last Change: Fri Feb 20 16:01 MSK 2014 Igor Gnatenko +" Last Change: Mon Jun 01 21:15 MSK 2015 Igor Gnatenko if exists("b:did_ftplugin") finish @@ -22,11 +22,36 @@ if !hasmapto("call <SID>SpecChangelog(\"\")<CR>") noremap <buffer> <unique> <script> <Plug>SpecChangelog :call <SID>SpecChangelog("")<CR> endif +if !exists("*s:GetRelVer") + function! s:GetRelVer() + if has('python') +python << PYEND +import sys, datetime, shutil, tempfile +import vim + +try: + import rpm +except ImportError: + pass +else: + specfile = vim.current.buffer.name + if specfile: + spec = rpm.spec(specfile) + headers = spec.packages[0].header + version = headers['Version'] + release = ".".join(headers['Release'].split(".")[:-1]) + vim.command("let ver = " + version) + vim.command("let rel = " + release) +PYEND + endif + endfunction +endif + if !exists("*s:SpecChangelog") function s:SpecChangelog(format) if strlen(a:format) == 0 if !exists("g:spec_chglog_format") - let email = input("Email address: ") + let email = input("Name <email address>: ") let g:spec_chglog_format = "%a %b %d %Y " . l:email echo "\r" endif @@ -71,6 +96,9 @@ if !exists("*s:SpecChangelog") else let include_release_info = 0 endif + + call s:GetRelVer() + if (chgline == -1) let option = confirm("Can't find %changelog. Create one? ","&End of file\n&Here\n&Cancel",3) if (option == 1) @@ -85,7 +113,7 @@ if !exists("*s:SpecChangelog") endif endif if (chgline != -1) - let parsed_format = "* ".strftime(format) + let parsed_format = "* ".strftime(format)." - ".ver."-".rel let release_info = "+ ".name."-".ver."-".rel let wrong_format = 0 let wrong_release = 0 diff --git a/runtime/ftplugin/zsh.vim b/runtime/ftplugin/zsh.vim index 3970d65cc8..6cbc380dc3 100644 --- a/runtime/ftplugin/zsh.vim +++ b/runtime/ftplugin/zsh.vim @@ -1,7 +1,10 @@ " Vim filetype plugin file -" Language: Zsh shell script -" Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2011-01-23 +" Language: Zsh shell script +" Maintainer: Christian Brabandt <cb@256bit.org> +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2015-05-29 +" License: Vim (see :h license) +" Repository: https://github.com/chrisbra/vim-zsh if exists("b:did_ftplugin") finish diff --git a/runtime/indent/javascript.vim b/runtime/indent/javascript.vim index a83d34b110..21c8fff86c 100644 --- a/runtime/indent/javascript.vim +++ b/runtime/indent/javascript.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Javascript -" Maintainer: None! Wanna improve this? -" Last Change: 2007 Jan 22 +" Maintainer: Going to be Darrick Wiebe +" Last Change: 2015 Jun 09 " Only load this indent file when no other was loaded. if exists("b:did_indent") @@ -12,5 +12,7 @@ let b:did_indent = 1 " C indenting is not too bad. setlocal cindent setlocal cinoptions+=j1,J1 +setlocal cinkeys-=0# +setlocal cinkeys+=0] let b:undo_indent = "setl cin<" diff --git a/runtime/indent/zsh.vim b/runtime/indent/zsh.vim index c5580a10b1..8e30c65c18 100644 --- a/runtime/indent/zsh.vim +++ b/runtime/indent/zsh.vim @@ -1,7 +1,10 @@ " Vim indent file -" Language: Zsh Shell Script -" Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2006-04-19 +" Language: Zsh shell script +" Maintainer: Christian Brabandt <cb@256bit.org> +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2015-05-29 +" License: Vim (see :h license) +" Repository: https://github.com/chrisbra/vim-zsh if exists("b:did_indent") finish diff --git a/runtime/syntax/cpp.vim b/runtime/syntax/cpp.vim index 78731d758d..135b8c9244 100644 --- a/runtime/syntax/cpp.vim +++ b/runtime/syntax/cpp.vim @@ -2,7 +2,7 @@ " Language: C++ " Current Maintainer: vim-jp (https://github.com/vim-jp/vim-cpp) " Previous Maintainer: Ken Shan <ccshan@post.harvard.edu> -" Last Change: 2015 Mar 1 +" Last Change: 2015 May 04 " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -46,7 +46,7 @@ if !exists("cpp_no_cpp11") syn keyword cppConstant ATOMIC_WCHAR_T_LOCK_FREE ATOMIC_SHORT_LOCK_FREE syn keyword cppConstant ATOMIC_INT_LOCK_FREE ATOMIC_LONG_LOCK_FREE syn keyword cppConstant ATOMIC_LLONG_LOCK_FREE ATOMIC_POINTER_LOCK_FREE - syn region cppRawString matchgroup=cppRawDelimiter start=+\%(u8\|[uLU]\)\=R"\z([[:alnum:]_{}[\]#<>%:;.?*\+\-/\^&|~!=,"']\{,16}\)(+ end=+)\z1"+ contains=@Spell + syn region cppRawString matchgroup=cppRawStringDelimiter start=+\%(u8\|[uLU]\)\=R"\z([[:alnum:]_{}[\]#<>%:;.?*\+\-/\^&|~!=,"']\{,16}\)(+ end=+)\z1"+ contains=@Spell endif " The minimum and maximum operators in GNU C++ @@ -70,7 +70,7 @@ if version >= 508 || !exists("did_cpp_syntax_inits") HiLink cppStructure Structure HiLink cppBoolean Boolean HiLink cppConstant Constant - HiLink cppRawDelimiter Delimiter + HiLink cppRawStringDelimiter Delimiter HiLink cppRawString String delcommand HiLink endif diff --git a/runtime/syntax/css.vim b/runtime/syntax/css.vim index c6fc6a7ae2..51758ca98f 100644 --- a/runtime/syntax/css.vim +++ b/runtime/syntax/css.vim @@ -6,7 +6,7 @@ " Nikolai Weibull (Add CSS2 support) " Maintainer: Jules Wang <w.jq0722@gmail.com> " URL: https://github.com/JulesWang/css.vim -" Last Change: 2013 Nov.27 +" Last Change: 2015 Apr.17 " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -26,18 +26,19 @@ set cpo&vim syn case ignore -" All HTML4 tags -syn keyword cssTagName abbr acronym address applet area a b base -syn keyword cssTagName basefont bdo big blockquote body br button -syn keyword cssTagName caption center cite code col colgroup dd del -syn keyword cssTagName dfn dir div dl dt em fieldset font form frame -syn keyword cssTagName frameset h1 h2 h3 h4 h5 h6 head hr html img i -syn keyword cssTagName iframe img input ins isindex kbd label legend li -syn keyword cssTagName link map menu meta noframes noscript ol optgroup -syn keyword cssTagName option p param pre q s samp script select small -syn keyword cssTagName span strike strong style sub sup table tbody td -syn keyword cssTagName textarea tfoot th thead title tr tt ul u var +" HTML4 tags +syn keyword cssTagName abbr address area a b base +syn keyword cssTagName bdo blockquote body br button +syn keyword cssTagName caption cite code col colgroup dd del +syn keyword cssTagName dfn div dl dt em fieldset form +syn keyword cssTagName h1 h2 h3 h4 h5 h6 head hr html img i +syn keyword cssTagName iframe input ins isindex kbd label legend li +syn keyword cssTagName link map menu meta noscript ol optgroup +syn keyword cssTagName option p param pre q s samp script small +syn keyword cssTagName span strong sub sup tbody td +syn keyword cssTagName textarea tfoot th thead title tr ul u var syn keyword cssTagName object svg +syn match cssTagName /\<select\>\|\<style\>\|\<table\>/ " 34 HTML5 tags syn keyword cssTagName article aside audio bdi canvas command data @@ -47,8 +48,8 @@ syn keyword cssTagName output progress rt rp ruby section syn keyword cssTagName source summary time track video wbr " Tags not supported in HTML5 -syn keyword cssDeprecated acronym applet basefont big center dir -syn keyword cssDeprecated font frame frameset noframes strike tt +" acronym applet basefont big center dir +" font frame frameset noframes strike tt syn match cssTagName "\*" @@ -70,13 +71,13 @@ endtry " digits syn match cssValueInteger contained "[-+]\=\d\+" contains=cssUnitDecorators syn match cssValueNumber contained "[-+]\=\d\+\(\.\d*\)\=" contains=cssUnitDecorators -syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=\(%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\)" contains=cssUnitDecorators -syn match cssValueAngle contained "[-+]\=\d\+\(\.\d*\)\=\(deg\|grad\|rad\)" contains=cssUnitDecorators -syn match cssValueTime contained "+\=\d\+\(\.\d*\)\=\(ms\|s\)" contains=cssUnitDecorators -syn match cssValueFrequency contained "+\=\d\+\(\.\d*\)\=\(Hz\|kHz\)" contains=cssUnitDecorators +syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=\(%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\)\>" contains=cssUnitDecorators +syn match cssValueAngle contained "[-+]\=\d\+\(\.\d*\)\=\(deg\|grad\|rad\)\>" contains=cssUnitDecorators +syn match cssValueTime contained "+\=\d\+\(\.\d*\)\=\(ms\|s\)\>" contains=cssUnitDecorators +syn match cssValueFrequency contained "+\=\d\+\(\.\d*\)\=\(Hz\|kHz\)\>" contains=cssUnitDecorators -syn match cssIncludeKeyword /@\(-[a-z]+-\)\=\(media\|keyframes\|import\|charset\|namespace\|page\)/ contained +syn match cssIncludeKeyword /@\(-[a-z]\+-\)\=\(media\|keyframes\|import\|charset\|namespace\|page\)/ contained " @media syn region cssInclude start=/@media\>/ end=/\ze{/ skipwhite skipnl contains=cssMediaProp,cssValueLength,cssMediaKeyword,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType,cssIncludeKeyword,cssMediaComma,cssComment nextgroup=cssMediaBlock syn keyword cssMediaType contained screen print aural braille embossed handheld projection tty tv speech all contained skipwhite skipnl @@ -86,7 +87,7 @@ syn match cssMediaComma "," skipwhite skipnl contained " Reference: http://www.w3.org/TR/css3-mediaqueries/ syn keyword cssMediaProp contained width height orientation scan grid -syn match cssMediaProp contained /\(\(device\)-\)\=aspect-ratio/ +syn match cssMediaProp contained /\(\(max\|min\)-\)\=\(\(device\)-\)\=aspect-ratio/ syn match cssMediaProp contained /\(\(max\|min\)-\)\=device-pixel-ratio/ syn match cssMediaProp contained /\(\(max\|min\)-\)\=device-\(height\|width\)/ syn match cssMediaProp contained /\(\(max\|min\)-\)\=\(height\|width\|resolution\|monochrome\|color\(-index\)\=\)/ @@ -104,7 +105,7 @@ syn keyword cssPageProp contained orphans widows " @keyframe " http://www.w3.org/TR/css3-animations/#keyframes -syn match cssKeyFrame "@\(-[a-z]+-\)\=keyframes\>[^{]*{\@=" nextgroup=cssKeyFrameWrap contains=cssVendor,cssIncludeKeyword skipwhite skipnl transparent +syn match cssKeyFrame "@\(-[a-z]\+-\)\=keyframes\>[^{]*{\@=" nextgroup=cssKeyFrameWrap contains=cssVendor,cssIncludeKeyword skipwhite skipnl transparent syn region cssKeyFrameWrap contained transparent matchgroup=cssBraces start="{" end="}" contains=cssKeyFrameSelector syn match cssKeyFrameSelector /\(\d*%\|from\|to\)\=/ contained skipwhite skipnl nextgroup=cssDefinition @@ -116,15 +117,27 @@ syn region cssInclude start=/@namespace\>/ end=/\ze;/ transparent contains=cssSt " @font-face " http://www.w3.org/TR/css3-fonts/#at-font-face-rule syn match cssFontDescriptor "@font-face\>" nextgroup=cssFontDescriptorBlock skipwhite skipnl -syn region cssFontDescriptorBlock contained transparent matchgroup=cssBraces start="{" end="}" contains=cssComment,cssError,cssUnicodeEscape,cssFontProp,cssFontAttr,cssCommonAttr,cssStringQ,cssStringQQ,cssFontDescriptorProp,cssValue.*,cssFontDescriptorFunction,cssUnicodeRange,cssFontDescriptorAttr -"syn match cssFontDescriptorProp contained "\<\(unicode-range\|unit-per-em\|panose-1\|cap-height\|x-height\|definition-src\)\>" -"syn keyword cssFontDescriptorProp contained src stemv stemh slope ascent descent widths bbox baseline centerline mathline topline +syn region cssFontDescriptorBlock contained transparent matchgroup=cssBraces start="{" end="}" contains=cssComment,cssError,cssUnicodeEscape,cssCommonAttr,cssFontDescriptorProp,cssValue.*,cssFontDescriptorFunction,cssFontDescriptorAttr,cssNoise + +syn match cssFontDescriptorProp contained "\<font-family\>" syn keyword cssFontDescriptorProp contained src +syn match cssFontDescriptorProp contained "\<font-\(style\|weight\|stretch\)\>" syn match cssFontDescriptorProp contained "\<unicode-range\>" -syn keyword cssFontDescriptorAttr contained all +syn match cssFontDescriptorProp contained "\<font-\(variant\|feature-settings\)\>" + +" src functions syn region cssFontDescriptorFunction contained matchgroup=cssFunctionName start="\<\(uri\|url\|local\|format\)\s*(" end=")" contains=cssStringQ,cssStringQQ oneline keepend -syn match cssUnicodeRange contained "U+[0-9A-Fa-f?]\+" -syn match cssUnicodeRange contained "U+\x\+-\x\+" +" font-sytle and font-weight attributes +syn keyword cssFontDescriptorAttr contained normal italic oblique bold +" font-stretch attributes +syn match cssFontDescriptorAttr contained "\<\(\(ultra\|extra\|semi\)-\)\=\(condensed\|expanded\)\>" +" unicode-range attributes +syn match cssFontDescriptorAttr contained "U+[0-9A-Fa-f?]\+" +syn match cssFontDescriptorAttr contained "U+\x\+-\x\+" +" font-feature-settings attributes +syn keyword cssFontDescriptorAttr contained on off + + " The 16 basic color names syn keyword cssColor contained aqua black blue fuchsia gray green lime maroon navy olive purple red silver teal yellow @@ -133,23 +146,23 @@ syn keyword cssColor contained aqua black blue fuchsia gray green lime maroon na syn keyword cssColor contained aliceblue antiquewhite aquamarine azure syn keyword cssColor contained beige bisque blanchedalmond blueviolet brown burlywood syn keyword cssColor contained cadetblue chartreuse chocolate coral cornflowerblue cornsilk crimson cyan -syn match cssColor contained /dark\(blue\|cyan\|goldenrod\|gray\|green\|grey\|khaki\)/ -syn match cssColor contained /dark\(magenta\|olivegreen\|orange\|orchid\|red\|salmon\|seagreen\)/ -syn match cssColor contained /darkslate\(blue\|gray\|grey\)/ -syn match cssColor contained /dark\(turquoise\|violet\)/ +syn match cssColor contained /\<dark\(blue\|cyan\|goldenrod\|gray\|green\|grey\|khaki\)\>/ +syn match cssColor contained /\<dark\(magenta\|olivegreen\|orange\|orchid\|red\|salmon\|seagreen\)\>/ +syn match cssColor contained /\<darkslate\(blue\|gray\|grey\)\>/ +syn match cssColor contained /\<dark\(turquoise\|violet\)\>/ syn keyword cssColor contained deeppink deepskyblue dimgray dimgrey dodgerblue firebrick syn keyword cssColor contained floralwhite forestgreen gainsboro ghostwhite gold syn keyword cssColor contained goldenrod greenyellow grey honeydew hotpink syn keyword cssColor contained indianred indigo ivory khaki lavender lavenderblush lawngreen syn keyword cssColor contained lemonchiffon limegreen linen magenta -syn match cssColor contained /light\(blue\|coral\|cyan\|goldenrodyellow\|gray\|green\)/ -syn match cssColor contained /light\(grey\|pink\|salmon\|seagreen\|skyblue\|yellow\)/ -syn match cssColor contained /light\(slategray\|slategrey\|steelblue\)/ -syn match cssColor contained /medium\(aquamarine\|blue\|orchid\|purple\|seagreen\)/ -syn match cssColor contained /medium\(slateblue\|springgreen\|turquoise\|violetred\)/ +syn match cssColor contained /\<light\(blue\|coral\|cyan\|goldenrodyellow\|gray\|green\)\>/ +syn match cssColor contained /\<light\(grey\|pink\|salmon\|seagreen\|skyblue\|yellow\)\>/ +syn match cssColor contained /\<light\(slategray\|slategrey\|steelblue\)\>/ +syn match cssColor contained /\<medium\(aquamarine\|blue\|orchid\|purple\|seagreen\)\>/ +syn match cssColor contained /\<medium\(slateblue\|springgreen\|turquoise\|violetred\)\>/ syn keyword cssColor contained midnightblue mintcream mistyrose moccasin navajowhite syn keyword cssColor contained oldlace olivedrab orange orangered orchid -syn match cssColor contained /pale\(goldenrod\|green\|turquoise\|violetred\)/ +syn match cssColor contained /\<pale\(goldenrod\|green\|turquoise\|violetred\)\>/ syn keyword cssColor contained papayawhip peachpuff peru pink plum powderblue syn keyword cssColor contained rosybrown royalblue saddlebrown salmon sandybrown syn keyword cssColor contained seagreen seashell sienna skyblue slateblue @@ -167,11 +180,12 @@ syn case ignore syn match cssImportant contained "!\s*important\>" syn match cssColor contained "\<transparent\>" +syn match cssColor contained "\<currentColor\>" syn match cssColor contained "\<white\>" syn match cssColor contained "#[0-9A-Fa-f]\{3\}\>" contains=cssUnitDecorators syn match cssColor contained "#[0-9A-Fa-f]\{6\}\>" contains=cssUnitDecorators -syn region cssURL contained matchgroup=cssFunctionName start="\<url\s*(" end=")" oneline extend +syn region cssURL contained matchgroup=cssFunctionName start="\<url\s*(" end=")" contains=cssStringQ,cssStringQQ oneline syn region cssFunction contained matchgroup=cssFunctionName start="\<\(rgb\|clip\|attr\|counter\|rect\|cubic-bezier\|steps\)\s*(" end=")" oneline contains=cssValueInteger,cssValueNumber,cssValueLength,cssFunctionComma syn region cssFunction contained matchgroup=cssFunctionName start="\<\(rgba\|hsl\|hsla\|color-stop\|from\|to\)\s*(" end=")" oneline contains=cssColor,cssValueInteger,cssValueNumber,cssValueLength,cssFunctionComma,cssFunction syn region cssFunction contained matchgroup=cssFunctionName start="\<\(linear-\|radial-\)\=\gradient\s*(" end=")" oneline contains=cssColor,cssValueInteger,cssValueNumber,cssValueLength,cssFunction,cssGradientAttr,cssFunctionComma @@ -196,6 +210,9 @@ syn keyword cssAnimationAttr contained forwards backwards both " animation-play-state attributes syn keyword cssAnimationAttr contained running paused + +" animation-iteration-count attributes +syn keyword cssAnimationAttr contained infinite "------------------------------------------------ " CSS Backgrounds and Borders Module Level 3 " http://www.w3.org/TR/css3-background/ @@ -253,7 +270,7 @@ syn keyword cssDimensionProp contained width syn match cssFlexibleBoxProp contained "\<bo |