Skip to content

Commit 9592d73

Browse files
committed
A few updated runtime files.
1 parent 2b2c17e commit 9592d73

File tree

6 files changed

+124
-75
lines changed

6 files changed

+124
-75
lines changed

runtime/doc/syntax.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*syntax.txt* For Vim version 7.3. Last change: 2013 Jun 28
1+
*syntax.txt* For Vim version 7.3. Last change: 2013 Jul 05
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -4384,7 +4384,7 @@ in their own color.
43844384
feature it will output "unknown".
43854385

43864386
:colo[rscheme] {name} Load color scheme {name}. This searches 'runtimepath'
4387-
for the file "colors/{name}.vim. The first one that
4387+
for the file "colors/{name}.vim". The first one that
43884388
is found is loaded.
43894389
To see the name of the currently active color scheme: >
43904390
:colo

runtime/doc/todo.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 7.3. Last change: 2013 Jul 04
1+
*todo.txt* For Vim version 7.3. Last change: 2013 Jul 05
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -325,9 +325,11 @@ Jan 19)
325325
Win32: default for 'backupcopy' is wrong for a symbolic link. (mklink one
326326
two). (Benjamin Fritz, 2012 Mar 15)
327327

328-
Need to escape $HOME on Windows? (ZyX, 2011 Jul 21)
328+
Need to escape $HOME on Windows? (ZyX, 2011 Jul 21, discussion 2013 Jul 4)
329+
Can't simply use a backslash, \$HOME has a different meaning already.
330+
Would be possible to use $$HOME where $HOME is to be used.
329331

330-
"2" in 'formatopions' not working in comments. (Christian Corneliussen, 2011
332+
"2" in 'formatoptions' not working in comments. (Christian Corneliussen, 2011
331333
Oct 26)
332334

333335
Bug in repeating Visual "u". (Lawrence Kesteloot, 2010 Dec 20)

runtime/syntax/c.vim

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim syntax file
22
" Language: C
33
" Maintainer: Bram Moolenaar <[email protected]>
4-
" Last Change: 2013 Jun 06
4+
" Last Change: 2013 Jul 05
55

66
" Quit when a (custom) syntax file was already loaded
77
if exists("b:current_syntax")
@@ -11,6 +11,8 @@ endif
1111
let s:cpo_save = &cpo
1212
set cpo&vim
1313

14+
let s:ft = matchstr(&ft, '^\([^.]\)\+')
15+
1416
" A bunch of useful C keywords
1517
syn keyword cStatement goto break return continue asm
1618
syn keyword cLabel case default
@@ -110,7 +112,7 @@ endif
110112
" But avoid matching <::.
111113
syn cluster cParenGroup contains=cParenError,cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserLabel,cBitField,cOctalZero,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom
112114
if exists("c_no_curly_error")
113-
if &filetype ==# 'cpp' && !exists("cpp_no_cpp11")
115+
if s:ft ==# 'cpp' && !exists("cpp_no_cpp11")
114116
syn region cParen transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,cCppString,@Spell
115117
" cCppParen: same as cParen but ends at end-of-line; used in cDefine
116118
syn region cCppParen transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cParen,cString,@Spell
@@ -124,7 +126,7 @@ if exists("c_no_curly_error")
124126
syn match cErrInParen display contained "^[{}]\|^<%\|^%>"
125127
endif
126128
elseif exists("c_no_bracket_error")
127-
if &filetype ==# 'cpp' && !exists("cpp_no_cpp11")
129+
if s:ft ==# 'cpp' && !exists("cpp_no_cpp11")
128130
syn region cParen transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,cCppString,@Spell
129131
" cCppParen: same as cParen but ends at end-of-line; used in cDefine
130132
syn region cCppParen transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cParen,cString,@Spell
@@ -138,7 +140,7 @@ elseif exists("c_no_bracket_error")
138140
syn match cErrInParen display contained "[{}]\|<%\|%>"
139141
endif
140142
else
141-
if &filetype ==# 'cpp' && !exists("cpp_no_cpp11")
143+
if s:ft ==# 'cpp' && !exists("cpp_no_cpp11")
142144
syn region cParen transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,cErrInBracket,cCppBracket,cCppString,@Spell
143145
" cCppParen: same as cParen but ends at end-of-line; used in cDefine
144146
syn region cCppParen transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cErrInBracket,cParen,cBracket,cString,@Spell
@@ -158,7 +160,7 @@ else
158160
syn match cErrInBracket display contained "[);{}]\|<%\|%>"
159161
endif
160162

161-
if &filetype ==# 'c' || exists("cpp_no_cpp11")
163+
if s:ft ==# 'c' || exists("cpp_no_cpp11")
162164
syn region cBadBlock keepend start="{" end="}" contained containedin=cParen,cBracket,cBadBlock transparent fold
163165
endif
164166

@@ -370,7 +372,7 @@ syn region cPreProc start="^\s*\(%:\|#\)\s*\(pragma\>\|line\>\|warning\>\|warn\>
370372

371373
" Highlight User Labels
372374
syn cluster cMultiGroup contains=cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserCont,cUserLabel,cBitField,cOctalZero,cCppOutWrapper,cCppInWrapper,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cCppParen,cCppBracket,cCppString
373-
if &filetype ==# 'c' || exists("cpp_no_cpp11")
375+
if s:ft ==# 'c' || exists("cpp_no_cpp11")
374376
syn region cMulti transparent start='?' skip='::' end=':' contains=ALLBUT,@cMultiGroup,@Spell
375377
endif
376378
" Avoid matching foo::bar() in C++ by requiring that the next char is not ':'
@@ -457,6 +459,8 @@ hi def link cCppOut Comment
457459

458460
let b:current_syntax = "c"
459461

462+
unlet s:ft
463+
460464
let &cpo = s:cpo_save
461465
unlet s:cpo_save
462466
" vim: ts=8

0 commit comments

Comments
 (0)