aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-04-11 13:02:04 -0400
committerJustin M. Keyes <justinkz@gmail.com>2016-04-11 13:02:04 -0400
commitf47a20a266f89be31e20f727de59708759795345 (patch)
tree7097b4207b7b828cfaf63a7809316646ed90f179
parentfe4d814c0ffcf6016ea02ee31f7e924b37c5ef2d (diff)
parentcf32ca5137f13e764487d9321711d4b97179872b (diff)
downloadrneovim-f47a20a266f89be31e20f727de59708759795345.tar.gz
rneovim-f47a20a266f89be31e20f727de59708759795345.tar.bz2
rneovim-f47a20a266f89be31e20f727de59708759795345.zip
Merge pull request #4562 from dbarnett/vim-f2571c
vim-patch:f2571c
-rw-r--r--runtime/filetype.vim2
-rw-r--r--runtime/ftplugin/spec.vim2
-rw-r--r--runtime/syntax/cpp.vim4
-rw-r--r--runtime/syntax/groovy.vim4
4 files changed, 6 insertions, 6 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 15928d6722..9b3666b9c1 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")
diff --git a/runtime/ftplugin/spec.vim b/runtime/ftplugin/spec.vim
index f972753533..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
diff --git a/runtime/syntax/cpp.vim b/runtime/syntax/cpp.vim
index 526ecbcd53..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++
diff --git a/runtime/syntax/groovy.vim b/runtime/syntax/groovy.vim
index 65dbf17728..42fcf4abac 100644
--- a/runtime/syntax/groovy.vim
+++ b/runtime/syntax/groovy.vim
@@ -2,9 +2,9 @@
" Language: Groovy
" Original Author: Alessio Pace <billy.corgan@tiscali.it>
" Maintainer: Tobias Rapp <yahuxo@gmx.de>
-" Version: 0.1.13
+" Version: 0.1.14
" URL: http://www.vim.org/scripts/script.php?script_id=945
-" Last Change: 2015 Apr 13
+" Last Change: 2015 Apr 21
" THE ORIGINAL AUTHOR'S NOTES:
"