Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

updated for version 7.1b

  • Loading branch information...
commit 6ce2c134ac8aa8fbac9d24e6d4a445d31af85dfc 1 parent bc17643
authored May 10, 2007
8  runtime/doc/eval.txt
... ...
@@ -1,4 +1,4 @@
1  
-*eval.txt*      For Vim version 7.1a.  Last change: 2007 May 03
  1
+*eval.txt*      For Vim version 7.1b.  Last change: 2007 May 07
2 2
 
3 3
 
4 4
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1684,7 +1684,7 @@ matchlist( {expr}, {pat}[, {start}[, {count}]])
1684 1684
 matchstr( {expr}, {pat}[, {start}[, {count}]])
1685 1685
 				String	{count}'th match of {pat} in {expr}
1686 1686
 max({list})			Number	maximum value of items in {list}
1687  
-min({list})			Number	minumum value of items in {list}
  1687
+min({list})			Number	minimum value of items in {list}
1688 1688
 mkdir({name} [, {path} [, {prot}]])
1689 1689
 				Number	create directory {name}
1690 1690
 mode()				String	current editing mode
@@ -2511,7 +2511,7 @@ feedkeys({string} [, {mode}])				*feedkeys()*
2511 2511
 		{string}.
2512 2512
 		To include special keys into {string}, use double-quotes
2513 2513
 		and "\..." notation |expr-quote|. For example,
2514  
-		feedkeys("\<CR>") simulates pressing of the Enter key. But
  2514
+		feedkeys("\<CR>") simulates pressing of the <Enter> key. But
2515 2515
 		feedkeys('\<CR>') pushes 5 characters.
2516 2516
 		If {mode} is absent, keys are remapped.
2517 2517
 		{mode} is a String, which can contain these character flags:
@@ -3677,7 +3677,7 @@ max({list})	Return the maximum value of all items in {list}.
3677 3677
 		An empty |List| results in zero.
3678 3678
 
3679 3679
 							*min()*
3680  
-min({list})	Return the minumum value of all items in {list}.
  3680
+min({list})	Return the minimum value of all items in {list}.
3681 3681
 		If {list} is not a list or one of the items in {list} cannot
3682 3682
 		be used as a Number this results in an error.
3683 3683
 		An empty |List| results in zero.
4  runtime/doc/usr_31.txt
... ...
@@ -1,4 +1,4 @@
1  
-*usr_31.txt*	For Vim version 7.1a.  Last change: 2006 Apr 24
  1
+*usr_31.txt*	For Vim version 7.1b.  Last change: 2007 May 08
2 2
 
3 3
 		     VIM USER MANUAL - by Bram Moolenaar
4 4
 
@@ -248,7 +248,7 @@ you can set the 'lines' option to set a different window size: >
248 248
 You don't want to do this in a terminal, since it's size is fixed (except for
249 249
 an xterm that supports resizing).
250 250
    The gvimrc file is searched for in the same locations as the vimrc file.
251  
-Normally it's name is "~/.gvimrc" for Unix and "$VIM/_gvimrc" for MS-Windows.
  251
+Normally its name is "~/.gvimrc" for Unix and "$VIM/_gvimrc" for MS-Windows.
252 252
 The $MYGVIMRC environment variable is set to it, thus you can use this command
253 253
 to edit the file, if you have one: >
254 254
 
70  runtime/ftplugin/ruby.vim
@@ -30,28 +30,21 @@ endif
30 30
 if exists("loaded_matchit") && !exists("b:match_words")
31 31
   let b:match_ignorecase = 0
32 32
 
33  
- " TODO: improve optional do loops
34 33
   let b:match_words =
35  
-	\ '\%(' .
36  
-	\     '\%(\%(\.\|\:\:\)\s*\|\:\)\@<!\<\%(class\|module\|begin\|def\|case\|for\|do\)\>' .
37  
-	\   '\|' .
38  
-	\     '\%(\%(^\|\.\.\.\=\|[{\:\,;([<>~\*/%&^|+-]\|\%(\<[_[\:lower\:]][_[\:alnum\:]]*\)\@<![!=?]\)\s*\)\@<=\%(if\|unless\|while\|until\)\>' .
39  
-	\ '\)' .
  34
+	\ '\<\%(if\|unless\|case\|while\|until\|for\|do\|class\|module\|def\|begin\)\>=\@!' .
40 35
 	\ ':' .
41  
-	\ '\%(' .
42  
-	\     '\%(\%(\.\|\:\:\)\s*\|\:\)\@<!\<\%(else\|elsif\|ensure\|when\)\>' .
43  
-	\   '\|' .
44  
-	\     '\%(\%(^\|;\)\s*\)\@<=\<rescue\>' .
45  
-	\ '\)' .
  36
+	\ '\<\%(else\|elsif\|ensure\|when\|rescue\|break\|redo\|next\|retry\)\>' .
46 37
 	\ ':' .
47  
-	\ '\%(\%(\.\|\:\:\)\s*\|\:\)\@<!\<end\>' .
  38
+	\ '\<end\>' .
48 39
 	\ ',{:},\[:\],(:)'
49 40
 
50 41
   let b:match_skip =
51 42
 	\ "synIDattr(synID(line('.'),col('.'),0),'name') =~ '" .
52  
-	\ "\\<ruby\\%(String\\|StringDelimiter\\|ASCIICode\\|Interpolation\\|" .
53  
-	\ "NoInterpolation\\|Escape\\|Comment\\|Documentation\\)\\>'"
54  
-
  43
+	\ "\\<ruby\\%(String\\|StringDelimiter\\|ASCIICode\\|Escape\\|" .
  44
+	\ "Interpolation\\|NoInterpolation\\|Comment\\|Documentation\\|" .
  45
+	\ "ConditionalModifier\\|RepeatModifier\\|OptionalDo\\|" .
  46
+	\ "Function\\|BlockArgument\\|KeywordAsMethod\\|ClassVariable\\|" .
  47
+	\ "InstanceVariable\\|GlobalVariable\\|Symbol\\)\\>'"
55 48
 endif
56 49
 
57 50
 setlocal formatoptions-=t formatoptions+=croql
@@ -103,9 +96,26 @@ if has("gui_win32") && !exists("b:browsefilter")
103 96
 endif
104 97
 
105 98
 let b:undo_ftplugin = "setl fo< inc< inex< sua< def< com< cms< path< kp<"
106  
-      \ "| unlet! b:browsefilter b:match_ignorecase b:match_words b:match_skip"
107  
-      \ "| if exists('&ofu') && has('ruby') | setl ofu< | endif"
108  
-      \ "| if has('balloon_eval') && exists('+bexpr') | setl bexpr< | endif"
  99
+      \."| unlet! b:browsefilter b:match_ignorecase b:match_words b:match_skip"
  100
+      \."| if exists('&ofu') && has('ruby') | setl ofu< | endif"
  101
+      \."| if has('balloon_eval') && exists('+bexpr') | setl bexpr< | endif"
  102
+
  103
+if !exists("g:no_plugin_maps") && !exists("g:no_ruby_maps")
  104
+
  105
+  noremap <silent> <buffer> [m :<C-U>call <SID>searchsyn('\<def\>','rubyDefine','b')<CR>
  106
+  noremap <silent> <buffer> ]m :<C-U>call <SID>searchsyn('\<def\>','rubyDefine','')<CR>
  107
+  noremap <silent> <buffer> [M :<C-U>call <SID>searchsyn('\<end\>','rubyDefine','b')<CR>
  108
+  noremap <silent> <buffer> ]M :<C-U>call <SID>searchsyn('\<end\>','rubyDefine','')<CR>
  109
+
  110
+  noremap <silent> <buffer> [[ :<C-U>call <SID>searchsyn('\<\%(class\<Bar>module\)\>','rubyModule\<Bar>rubyClass','b')<CR>
  111
+  noremap <silent> <buffer> ]] :<C-U>call <SID>searchsyn('\<\%(class\<Bar>module\)\>','rubyModule\<Bar>rubyClass','')<CR>
  112
+  noremap <silent> <buffer> [] :<C-U>call <SID>searchsyn('\<end\>','rubyModule\<Bar>rubyClass','b')<CR>
  113
+  noremap <silent> <buffer> ][ :<C-U>call <SID>searchsyn('\<end\>','rubyModule\<Bar>rubyClass','')<CR>
  114
+
  115
+  let b:undo_ftplugin = b:undo_ftplugin
  116
+        \."| sil! exe 'unmap <buffer> [[' | sil! exe 'unmap <buffer> ]]' | sil! exe 'unmap <buffer> []' | sil! exe 'unmap <buffer> ]['"
  117
+        \."| sil! exe 'unmap <buffer> [m' | sil! exe 'unmap <buffer> ]m' | sil! exe 'unmap <buffer> [M' | sil! exe 'unmap <buffer> ]M'"
  118
+endif
109 119
 
110 120
 let &cpo = s:cpo_save
111 121
 unlet s:cpo_save
@@ -155,7 +165,7 @@ function! RubyBalloonexpr()
155 165
       return ''
156 166
     endif
157 167
     silent! let res = substitute(system("ri -f simple -T \"".str.'"'),'\n$','','')
158  
-    if res =~ '^Nothing known about' || res =~ '^Bad argument:'
  168
+    if res =~ '^Nothing known about' || res =~ '^Bad argument:' || res =~ '^More than one method'
159 169
       return ''
160 170
     endif
161 171
     return res
@@ -164,6 +174,28 @@ function! RubyBalloonexpr()
164 174
   endif
165 175
 endfunction
166 176
 
  177
+function! s:searchsyn(pattern,syn,flags)
  178
+    norm! m'
  179
+    let i = 0
  180
+    let cnt = v:count ? v:count : 1
  181
+    while i < cnt
  182
+        let i = i + 1
  183
+        let line = line('.')
  184
+        let col  = col('.')
  185
+        let pos = search(a:pattern,'W'.a:flags)
  186
+        while pos != 0 && s:synname() !~# a:syn
  187
+            let pos = search(a:pattern,'W'.a:flags)
  188
+        endwhile
  189
+        if pos == 0
  190
+            call cursor(line,col)
  191
+            return
  192
+        endif
  193
+    endwhile
  194
+endfunction
  195
+
  196
+function! s:synname()
  197
+    return synIDattr(synID(line('.'),col('.'),0),'name')
  198
+endfunction
167 199
 
168 200
 "
169 201
 " Instructions for enabling "matchit" support:
537  runtime/syntax/cdrtoc.vim
... ...
@@ -0,0 +1,537 @@
  1
+" Vim syntax file
  2
+" Language:         cdrdao(1) TOC file
  3
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
  4
+" Latest Revision:  2007-05-10
  5
+
  6
+if exists("b:current_syntax")
  7
+  finish
  8
+endif
  9
+
  10
+let s:cpo_save = &cpo
  11
+set cpo&vim
  12
+
  13
+syn keyword cdrtocTodo
  14
+      \ contained
  15
+      \ TODO
  16
+      \ FIXME
  17
+      \ XXX
  18
+      \ NOTE
  19
+
  20
+syn cluster cdrtocCommentContents
  21
+      \ contains=
  22
+      \   cdrtocTodo,
  23
+      \   @Spell
  24
+
  25
+syn cluster cdrtocHeaderFollowsInitial
  26
+      \ contains=
  27
+      \   cdrtocHeaderCommentInitial,
  28
+      \   cdrtocHeaderCatalog,
  29
+      \   cdrtocHeaderTOCType,
  30
+      \   cdrtocHeaderCDText,
  31
+      \   cdrtocTrack
  32
+
  33
+syn match   cdrtocHeaderBegin
  34
+      \ nextgroup=@cdrtocHeaderFollowsInitial
  35
+      \ skipwhite skipempty
  36
+      \ '\%^'
  37
+
  38
+let s:mmssff_pattern = '\%([0-5]\d\|\d\):\%([0-5]\d\|\d\):\%([0-6]\d\|7[0-5]\|\d\)\>'
  39
+let s:byte_pattern = '\<\%([01]\=\d\{1,2}\|2\%([0-4]\d\|5[0-5]\)\)\>'
  40
+let s:length_pattern = '\%(\%([0-5]\d\|\d\):\%([0-5]\d\|\d\):\%([0-6]\d\|7[0-5]\|\d\)\|\d\+\)\>'
  41
+
  42
+function s:def_comment(name, nextgroup)
  43
+  execute 'syn match' a:name
  44
+        \ 'nextgroup=' . a:nextgroup . ',' . a:name
  45
+        \ 'skipwhite skipempty'
  46
+        \ 'contains=@cdrtocCommentContents'
  47
+        \ 'contained'
  48
+        \ "'//.*$'"
  49
+  execute 'hi def link' a:name 'cdrtocComment'
  50
+endfunction
  51
+
  52
+function s:def_keywords(name, nextgroup, keywords)
  53
+  let comment_group = a:name . 'FollowComment'
  54
+  execute 'syn keyword' a:name
  55
+        \ 'nextgroup=' . a:nextgroup . ',' . comment_group
  56
+        \ 'skipwhite skipempty'
  57
+        \ 'contained'
  58
+        \ join(a:keywords)
  59
+
  60
+  call s:def_comment(comment_group, a:nextgroup)
  61
+endfunction
  62
+
  63
+function s:def_keyword(name, nextgroup, keyword)
  64
+  call s:def_keywords(a:name, a:nextgroup, [a:keyword])
  65
+endfunction
  66
+
  67
+" NOTE: Pattern needs to escape any “@”s.
  68
+function s:def_match(name, nextgroup, pattern)
  69
+  let comment_group = a:name . 'FollowComment'
  70
+  execute 'syn match' a:name
  71
+        \ 'nextgroup=' . a:nextgroup . ',' . comment_group
  72
+        \ 'skipwhite skipempty'
  73
+        \ 'contained'
  74
+        \ '@' . a:pattern . '@'
  75
+
  76
+  call s:def_comment(comment_group, a:nextgroup)
  77
+endfunction
  78
+
  79
+function s:def_region(name, nextgroup, start, skip, end, matchgroup, contains)
  80
+  let comment_group = a:name . 'FollowComment'
  81
+  execute 'syn region' a:name
  82
+        \ 'nextgroup=' . a:nextgroup . ',' . comment_group
  83
+        \ 'skipwhite skipempty'
  84
+        \ 'contained'
  85
+        \ 'matchgroup=' . a:matchgroup
  86
+        \ 'contains=' . a:contains
  87
+        \ 'start=@' . a:start . '@'
  88
+        \ (a:skip != "" ? ('skip=@' . a:skip . '@') : "")
  89
+        \ 'end=@' . a:end . '@'
  90
+
  91
+  call s:def_comment(comment_group, a:nextgroup)
  92
+endfunction
  93
+
  94
+call s:def_comment('cdrtocHeaderCommentInitial', '@cdrtocHeaderFollowsInitial')
  95
+
  96
+call s:def_keyword('cdrtocHeaderCatalog', 'cdrtocHeaderCatalogNumber', 'CATALOG')
  97
+
  98
+call s:def_match('cdrtocHeaderCatalogNumber', '@cdrtocHeaderFollowsInitial', '"\d\{13\}"')
  99
+
  100
+call s:def_keywords('cdrtocHeaderTOCType', '@cdrtocHeaderFollowsInitial', ['CD_DA', 'CD_ROM', 'CD_ROM_XA'])
  101
+
  102
+call s:def_keyword('cdrtocHeaderCDText', 'cdrtocHeaderCDTextStart', 'CD_TEXT')
  103
+
  104
+" TODO: Actually, language maps aren’t required by TocParser.g, but let’s keep
  105
+" things simple (and in agreement with what the manual page says).
  106
+call s:def_match('cdrtocHeaderCDTextStart', 'cdrtocHeaderCDTextLanguageMap', '{')
  107
+
  108
+call s:def_keyword('cdrtocHeaderCDTextLanguageMap', 'cdrtocHeaderLanguageMapStart', 'LANGUAGE_MAP')
  109
+
  110
+call s:def_match('cdrtocHeaderLanguageMapStart', 'cdrtocHeaderLanguageMapLanguageNumber', '{')
  111
+
  112
+call s:def_match('cdrtocHeaderLanguageMapLanguageNumber', 'cdrtocHeaderLanguageMapColon', '\<[0-7]\>')
  113
+
  114
+call s:def_match('cdrtocHeaderLanguageMapColon', 'cdrtocHeaderLanguageMapCountryCode,cdrtocHeaderLanguageMapCountryCodeName', ':')
  115
+
  116
+syn cluster cdrtocHeaderLanguageMapCountryCodeFollow
  117
+      \ contains=
  118
+      \   cdrtocHeaderLanguageMapLanguageNumber,
  119
+      \   cdrtocHeaderLanguageMapEnd
  120
+
  121
+call s:def_match('cdrtocHeaderLanguageMapCountryCode',
  122
+               \ '@cdrtocHeaderLanguageMapCountryCodeFollow',
  123
+               \ s:byte_pattern)
  124
+
  125
+call s:def_keyword('cdrtocHeaderLanguageMapCountryCodeName',
  126
+                 \ '@cdrtocHeaderLanguageMapCountryCodeFollow',
  127
+                 \ 'EN')
  128
+
  129
+call s:def_match('cdrtocHeaderLanguageMapEnd',
  130
+               \ 'cdrtocHeaderLanguage,cdrtocHeaderCDTextEnd',
  131
+               \ '}')
  132
+
  133
+call s:def_keyword('cdrtocHeaderLanguage', 'cdrtocHeaderLanguageNumber', 'LANGUAGE')
  134
+
  135
+call s:def_match('cdrtocHeaderLanguageNumber', 'cdrtocHeaderLanguageStart', '\<[0-7]\>')
  136
+
  137
+call s:def_match('cdrtocHeaderLanguageStart',
  138
+               \ 'cdrtocHeaderCDTextItem,cdrtocHeaderLanguageEnd',
  139
+               \ '{')
  140
+
  141
+syn cluster cdrtocHeaderCDTextData
  142
+      \ contains=
  143
+      \   cdrtocHeaderCDTextDataString,
  144
+      \   cdrtocHeaderCDTextDataBinaryStart
  145
+
  146
+call s:def_keywords('cdrtocHeaderCDTextItem',
  147
+                  \ '@cdrtocHeaderCDTextData',
  148
+                  \ ['TITLE', 'PERFORMER', 'SONGWRITER', 'COMPOSER',
  149
+                  \  'ARRANGER', 'MESSAGE', 'DISC_ID', 'GENRE', 'TOC_INFO1',
  150
+                  \  'TOC_INFO2', 'UPC_EAN', 'ISRC', 'SIZE_INFO'])
  151
+
  152
+call s:def_region('cdrtocHeaderCDTextDataString',
  153
+                \ 'cdrtocHeaderCDTextItem,cdrtocHeaderLanguageEnd',
  154
+                \ '"',
  155
+                \ '\\\\\|\\"',
  156
+                \ '"',
  157
+                \ 'cdrtocHeaderCDTextDataStringDelimiters',
  158
+                \ 'cdrtocHeaderCDTextDataStringSpecialChar')
  159
+
  160
+syn match   cdrtocHeaderCDTextDataStringSpecialChar
  161
+      \ contained
  162
+      \ display
  163
+      \ '\\\%(\o\o\o\|["\\]\)'
  164
+
  165
+call s:def_match('cdrtocHeaderCDTextDataBinaryStart',
  166
+               \ 'cdrtocHeaderCDTextDataBinaryInteger',
  167
+               \ '{')
  168
+
  169
+call s:def_match('cdrtocHeaderCDTextDataBinaryInteger',
  170
+               \ 'cdrtocHeaderCDTextDataBinarySeparator,cdrtocHeaderCDTextDataBinaryEnd',
  171
+               \ s:byte_pattern)
  172
+
  173
+call s:def_match('cdrtocHeaderCDTextDataBinarySeparator',
  174
+               \ 'cdrtocHeaderCDTextDataBinaryInteger',
  175
+               \ ',')
  176
+
  177
+call s:def_match('cdrtocHeaderCDTextDataBinaryEnd',
  178
+               \ 'cdrtocHeaderCDTextItem,cdrtocHeaderLanguageEnd',
  179
+               \ '}')
  180
+
  181
+call s:def_match('cdrtocHeaderLanguageEnd',
  182
+               \ 'cdrtocHeaderLanguage,cdrtocHeaderCDTextEnd',
  183
+               \ '}')
  184
+
  185
+call s:def_match('cdrtocHeaderCDTextEnd',
  186
+               \ 'cdrtocTrack',
  187
+               \ '}')
  188
+
  189
+syn cluster cdrtocTrackFollow
  190
+      \ contains=
  191
+      \   @cdrtocTrackFlags,
  192
+      \   cdrtocTrackCDText,
  193
+      \   cdrtocTrackPregap,
  194
+      \   @cdrtocTrackContents
  195
+
  196
+call s:def_keyword('cdrtocTrack', 'cdrtocTrackMode', 'TRACK')
  197
+
  198
+call s:def_keywords('cdrtocTrackMode',
  199
+                  \ 'cdrtocTrackSubChannelMode,@cdrtocTrackFollow',
  200
+                  \ ['AUDIO', 'MODE1', 'MODE1_RAW', 'MODE2', 'MODE2_FORM1',
  201
+                  \  'MODE2_FORM2', 'MODE2_FORM_MIX', 'MODE2_RAW'])
  202
+
  203
+call s:def_keywords('cdrtocTrackSubChannelMode',
  204
+                  \ '@cdrtocTrackFollow',
  205
+                  \ ['RW', 'RW_RAW'])
  206
+
  207
+syn cluster cdrtocTrackFlags
  208
+      \ contains=
  209
+      \   cdrtocTrackFlagNo,
  210
+      \   cdrtocTrackFlagCopy,
  211
+      \   cdrtocTrackFlagPreEmphasis,
  212
+      \   cdrtocTrackFlag
  213
+
  214
+call s:def_keyword('cdrtocTrackFlagNo',
  215
+                 \ 'cdrtocTrackFlagCopy,cdrtocTrackFlagPreEmphasis',
  216
+                 \ 'NO')
  217
+
  218
+call s:def_keyword('cdrtocTrackFlagCopy', '@cdrtocTrackFollow', 'COPY')
  219
+
  220
+call s:def_keyword('cdrtocTrackFlagPreEmphasis', '@cdrtocTrackFollow', 'PRE_EMPHASIS')
  221
+
  222
+call s:def_keywords('cdrtocTrackFlag',
  223
+                  \ '@cdrtocTrackFollow',
  224
+                  \ ['TWO_CHANNEL_AUDIO', 'FOUR_CHANNEL_AUDIO'])
  225
+
  226
+call s:def_keyword('cdrtocTrackFlag', 'cdrtocTrackISRC', 'ISRC')
  227
+
  228
+call s:def_match('cdrtocTrackISRC',
  229
+               \ '@cdrtocTrackFollow',
  230
+               \ '"[[:upper:][:digit:]]\{5}\d\{7}"')
  231
+
  232
+call s:def_keyword('cdrtocTrackCDText', 'cdrtocTrackCDTextStart', 'CD_TEXT')
  233
+
  234
+call s:def_match('cdrtocTrackCDTextStart', 'cdrtocTrackCDTextLanguage', '{')
  235
+
  236
+call s:def_keyword('cdrtocTrackCDTextLanguage', 'cdrtocTrackCDTextLanguageNumber', 'LANGUAGE')
  237
+
  238
+call s:def_match('cdrtocTrackCDTextLanguageNumber', 'cdrtocTrackCDTextLanguageStart', '\<[0-7]\>')
  239
+
  240
+call s:def_match('cdrtocTrackCDTextLanguageStart',
  241
+               \ 'cdrtocTrackCDTextItem,cdrtocTrackCDTextLanguageEnd',
  242
+               \ '{')
  243
+
  244
+syn cluster cdrtocTrackCDTextData
  245
+      \ contains=
  246
+      \   cdrtocTrackCDTextDataString,
  247
+      \   cdrtocTrackCDTextDataBinaryStart
  248
+
  249
+call s:def_keywords('cdrtocTrackCDTextItem',
  250
+                  \ '@cdrtocTrackCDTextData',
  251
+                  \ ['TITLE', 'PERFORMER', 'SONGWRITER', 'COMPOSER', 'ARRANGER',
  252
+                  \  'MESSAGE', 'ISRC'])
  253
+
  254
+call s:def_region('cdrtocTrackCDTextDataString',
  255
+                \ 'cdrtocTrackCDTextItem,cdrtocTrackCDTextLanguageEnd',
  256
+                \ '"',
  257
+                \ '\\\\\|\\"',
  258
+                \ '"',
  259
+                \ 'cdrtocTrackCDTextDataStringDelimiters',
  260
+                \ 'cdrtocTrackCDTextDataStringSpecialChar')
  261
+
  262
+syn match   cdrtocTrackCDTextDataStringSpecialChar
  263
+      \ contained
  264
+      \ display
  265
+      \ '\\\%(\o\o\o\|["\\]\)'
  266
+
  267
+call s:def_match('cdrtocTrackCDTextDataBinaryStart',
  268
+               \ 'cdrtocTrackCDTextDataBinaryInteger',
  269
+               \ '{')
  270
+
  271
+call s:def_match('cdrtocTrackCDTextDataBinaryInteger',
  272
+               \ 'cdrtocTrackCDTextDataBinarySeparator,cdrtocTrackCDTextDataBinaryEnd',
  273
+               \ s:byte_pattern)
  274
+
  275
+call s:def_match('cdrtocTrackCDTextDataBinarySeparator',
  276
+               \ 'cdrtocTrackCDTextDataBinaryInteger',
  277
+               \ ',')
  278
+
  279
+call s:def_match('cdrtocTrackCDTextDataBinaryEnd',
  280
+               \ 'cdrtocTrackCDTextItem,cdrtocTrackCDTextLanguageEnd',
  281
+               \ '}')
  282
+
  283
+call s:def_match('cdrtocTrackCDTextLanguageEnd',
  284
+               \ 'cdrtocTrackCDTextLanguage,cdrtocTrackCDTextEnd',
  285
+               \ '}')
  286
+
  287
+call s:def_match('cdrtocTrackCDTextEnd',
  288
+               \ 'cdrtocTrackPregap,@cdrtocTrackContents',
  289
+               \ '}')
  290
+
  291
+call s:def_keyword('cdrtocTrackPregap', 'cdrtocTrackPregapMMSSFF', 'PREGAP')
  292
+
  293
+call s:def_match('cdrtocTrackPregapMMSSFF',
  294
+               \ '@cdrtocTrackContents',
  295
+               \ s:mmssff_pattern)
  296
+
  297
+syn cluster cdrtocTrackContents
  298
+      \ contains=
  299
+      \   cdrtocTrackSubTrack,
  300
+      \   cdrtocTrackMarker
  301
+
  302
+syn cluster cdrtocTrackContentsFollow
  303
+      \ contains=
  304
+      \   @cdrtocTrackContents,
  305
+      \   cdrtocTrackIndex,
  306
+      \   cdrtocTrack
  307
+
  308
+call s:def_keywords('cdrtocTrackSubTrack',
  309
+                  \ 'cdrtocTrackSubTrackFileFilename',
  310
+                  \ ['FILE', 'AUDIOFILE'])
  311
+
  312
+call s:def_region('cdrtocTrackSubTrackFileFilename',
  313
+                \ 'cdrtocTrackSubTrackFileStart',
  314
+                \ '"',
  315
+                \ '\\\\\|\\"',
  316
+                \ '"',
  317
+                \ 'cdrtocTrackSubTrackFileFilenameDelimiters',
  318
+                \ 'cdrtocTrackSubTrackFileFilenameSpecialChar')
  319
+
  320
+syn match   cdrtocTrackSubTrackFileFilenameSpecialChar
  321
+      \ contained
  322
+      \ display
  323
+      \ '\\\%(\o\o\o\|["\\]\)'
  324
+
  325
+call s:def_match('cdrtocTrackSubTrackFileStart',
  326
+               \ 'cdrtocTrackSubTrackFileLength,@cdrtocTrackContentsFollow',
  327
+               \ s:length_pattern)
  328
+
  329
+call s:def_match('cdrtocTrackSubTrackFileLength',
  330
+               \ '@cdrtocTrackContentsFollow',
  331
+               \ s:length_pattern)
  332
+
  333
+call s:def_keyword('cdrtocTrackSubTrack', 'cdrtocTrackContentDatafileFilename', 'DATAFILE')
  334
+
  335
+call s:def_region('cdrtocTrackSubTrackDatafileFilename',
  336
+                \ 'cdrtocTrackSubTrackDatafileLength',
  337
+                \ '"',
  338
+                \ '\\\\\|\\"',
  339
+                \ '"',
  340
+                \ 'cdrtocTrackSubTrackDatafileFilenameDelimiters',
  341
+                \ 'cdrtocTrackSubTrackDatafileFilenameSpecialChar')
  342
+
  343
+syn match   cdrtocTrackSubTrackdatafileFilenameSpecialChar
  344
+      \ contained
  345
+      \ display
  346
+      \ '\\\%(\o\o\o\|["\\]\)'
  347
+
  348
+call s:def_match('cdrtocTrackDatafileLength',
  349
+               \ '@cdrtocTrackContentsFollow',
  350
+               \ s:length_pattern)
  351
+
  352
+call s:def_keyword('cdrtocTrackSubTrack', 'cdrtocTrackContentFifoFilename', 'DATAFILE')
  353
+
  354
+call s:def_region('cdrtocTrackSubTrackFifoFilename',
  355
+                \ 'cdrtocTrackSubTrackFifoLength',
  356
+                \ '"',
  357
+                \ '\\\\\|\\"',
  358
+                \ '"',
  359
+                \ 'cdrtocTrackSubTrackFifoFilenameDelimiters',
  360
+                \ 'cdrtocTrackSubTrackFifoFilenameSpecialChar')
  361
+
  362
+syn match   cdrtocTrackSubTrackdatafileFilenameSpecialChar
  363
+      \ contained
  364
+      \ display
  365
+      \ '\\\%(\o\o\o\|["\\]\)'
  366
+
  367
+call s:def_match('cdrtocTrackFifoLength',
  368
+               \ '@cdrtocTrackContentsFollow',
  369
+               \ s:length_pattern)
  370
+
  371
+call s:def_keyword('cdrtocTrackSubTrack', 'cdrtocTrackSilenceLength', 'SILENCE')
  372
+
  373
+call s:def_match('cdrtocTrackSilenceLength',
  374
+               \ '@cdrtocTrackContentsFollow',
  375
+               \ s:length_pattern)
  376
+
  377
+call s:def_keyword('cdrtocTrackSubTrack',
  378
+                 \ 'cdrtocTrackSubTrackZeroDataMode,' .
  379
+                 \ 'cdrtocTrackSubTrackZeroDataSubChannelMode,' .
  380
+                 \ 'cdrtocTrackSubTrackZeroDataLength',
  381
+                 \ 'ZERO')
  382
+
  383
+call s:def_keywords('cdrtocTrackSubTrackZeroDataMode',
  384
+                  \ 'cdrtocTrackSubTrackZeroSubChannelMode,cdrtocTrackSubTrackZeroDataLength',
  385
+                  \ ['AUDIO', 'MODE1', 'MODE1_RAW', 'MODE2', 'MODE2_FORM1',
  386
+                  \  'MODE2_FORM2', 'MODE2_FORM_MIX', 'MODE2_RAW'])
  387
+
  388
+call s:def_keywords('cdrtocTrackSubTrackZeroDataSubChannelMode',
  389
+                  \ 'cdrtocTrackSubTrackZeroDataLength',
  390
+                  \ ['RW', 'RW_RAW'])
  391
+
  392
+call s:def_match('cdrtocTrackSubTrackZeroDataLength',
  393
+               \ '@cdrtocTrackContentsFollow',
  394
+               \ s:length_pattern)
  395
+
  396
+call s:def_keyword('cdrtocTrackMarker',
  397
+                 \ '@cdrtocTrackContentsFollow,cdrtocTrackMarkerStartMMSSFF',
  398
+                 \ 'START')
  399
+
  400
+call s:def_match('cdrtocTrackMarkerStartMMSSFF',
  401
+               \ '@cdrtocTrackContentsFollow',
  402
+               \ s:mmssff_pattern)
  403
+
  404
+call s:def_keyword('cdrtocTrackMarker',
  405
+                 \ '@cdrtocTrackContentsFollow,cdrtocTrackMarkerEndMMSSFF',
  406
+                 \ 'END')
  407
+
  408
+call s:def_match('cdrtocTrackMarkerEndMMSSFF',
  409
+               \ '@cdrtocTrackContentsFollow',
  410
+               \ s:mmssff_pattern)
  411
+
  412
+call s:def_keyword('cdrtocTrackIndex', 'cdrtocTrackIndexMMSSFF', 'INDEX')
  413
+
  414
+call s:def_match('cdrtocTrackIndexMMSSFF',
  415
+               \ 'cdrtocTrackIndex,cdrtocTrack',
  416
+               \ s:mmssff_pattern)
  417
+
  418
+delfunction s:def_region
  419
+delfunction s:def_match
  420
+delfunction s:def_keyword
  421
+delfunction s:def_keywords
  422
+delfunction s:def_comment
  423
+
  424
+syn sync fromstart
  425
+
  426
+hi def link cdrtocKeyword                                  Keyword
  427
+hi def link cdrtocHeaderKeyword                            cdrtocKeyword
  428
+hi def link cdrtocHeaderCDText                             cdrtocHeaderKeyword
  429
+hi def link cdrtocDelimiter                                Delimiter
  430
+hi def link cdrtocCDTextDataBinaryEnd                      cdrtocDelimiter
  431
+hi def link cdrtocHeaderCDTextDataBinaryEnd                cdrtocHeaderCDTextDataBinaryEnd
  432
+hi def link cdrtocNumber                                   Number
  433
+hi def link cdrtocCDTextDataBinaryInteger                  cdrtocNumber
  434
+hi def link cdrtocHeaderCDTextDataBinaryInteger            cdrtocCDTextDataBinaryInteger
  435
+hi def link cdrtocCDTextDataBinarySeparator                cdrtocDelimiter
  436
+hi def link cdrtocHeaderCDTextDataBinarySeparator          cdrtocCDTextDataBinarySeparator
  437
+hi def link cdrtocCDTextDataBinaryStart                    cdrtocDelimiter
  438
+hi def link cdrtocHeaderCDTextDataBinaryStart              cdrtocCDTextDataBinaryStart
  439
+hi def link cdrtocString                                   String
  440
+hi def link cdrtocCDTextDataString                         cdrtocString
  441
+hi def link cdrtocHeaderCDTextDataString                   cdrtocCDTextDataString
  442
+hi def link cdrtocCDTextDataStringDelimiters               cdrtocDelimiter
  443
+hi def link cdrtocHeaderCDTextDataStringDelimiters         cdrtocCDTextDataStringDelimiters
  444
+hi def link cdrtocCDTextDataStringSpecialChar              SpecialChar
  445
+hi def link cdrtocHeaderCDTextDataStringSpecialChar        cdrtocCDTextDataStringSpecialChar
  446
+hi def link cdrtocCDTextEnd                                cdrtocDelimiter
  447
+hi def link cdrtocHeaderCDTextEnd                          cdrtocCDTextEnd
  448
+hi def link cdrtocType                                     Type
  449
+hi def link cdrtocCDTextItem                               cdrtocType
  450
+hi def link cdrtocHeaderCDTextItem                         cdrtocCDTextItem
  451
+hi def link cdrtocHeaderCDTextLanguageMap                  cdrtocHeaderKeyword
  452
+hi def link cdrtocCDTextStart                              cdrtocDelimiter
  453
+hi def link cdrtocHeaderCDTextStart                        cdrtocCDTextStart
  454
+hi def link cdrtocHeaderCatalog                            cdrtocHeaderKeyword
  455
+hi def link cdrtocHeaderCatalogNumber                      cdrtocString
  456
+hi def link cdrtocComment                                  Comment
  457
+hi def link cdrtocHeaderCommentInitial                     cdrtocComment
  458
+hi def link cdrtocHeaderLanguage                           cdrtocKeyword
  459
+hi def link cdrtocLanguageEnd                              cdrtocDelimiter
  460
+hi def link cdrtocHeaderLanguageEnd                        cdrtocLanguageEnd
  461
+hi def link cdrtocHeaderLanguageMapColon                   cdrtocDelimiter
  462
+hi def link cdrtocIdentifier                               Identifier
  463
+hi def link cdrtocHeaderLanguageMapCountryCode             cdrtocNumber
  464
+hi def link cdrtocHeaderLanguageMapCountryCodeName         cdrtocIdentifier
  465
+hi def link cdrtocHeaderLanguageMapEnd                     cdrtocDelimiter
  466
+hi def link cdrtocHeaderLanguageMapLanguageNumber          cdrtocNumber
  467
+hi def link cdrtocHeaderLanguageMapStart                   cdrtocDelimiter
  468
+hi def link cdrtocLanguageNumber                           cdrtocNumber
  469
+hi def link cdrtocHeaderLanguageNumber                     cdrtocLanguageNumber
  470
+hi def link cdrtocLanguageStart                            cdrtocDelimiter
  471
+hi def link cdrtocHeaderLanguageStart                      cdrtocLanguageStart
  472
+hi def link cdrtocHeaderTOCType                            cdrtocType
  473
+hi def link cdrtocTodo                                     Todo
  474
+hi def link cdrtocTrackKeyword                             cdrtocKeyword
  475
+hi def link cdrtocTrack                                    cdrtocTrackKeyword
  476
+hi def link cdrtocTrackCDText                              cdrtocTrackKeyword
  477
+hi def link cdrtocTrackCDTextDataBinaryEnd                 cdrtocHeaderCDTextDataBinaryEnd
  478
+hi def link cdrtocTrackCDTextDataBinaryInteger             cdrtocHeaderCDTextDataBinaryInteger
  479
+hi def link cdrtocTrackCDTextDataBinarySeparator           cdrtocHeaderCDTextDataBinarySeparator
  480
+hi def link cdrtocTrackCDTextDataBinaryStart               cdrtocHeaderCDTextDataBinaryStart
  481
+hi def link cdrtocTrackCDTextDataString                    cdrtocHeaderCDTextDataString
  482
+hi def link cdrtocTrackCDTextDataStringDelimiters          cdrtocCDTextDataStringDelimiters
  483
+hi def link cdrtocTrackCDTextDataStringSpecialChar         cdrtocCDTextDataStringSpecialChar
  484
+hi def link cdrtocTrackCDTextEnd                           cdrtocCDTextEnd
  485
+hi def link cdrtocTrackCDTextItem                          cdrtocCDTextItem
  486
+hi def link cdrtocTrackCDTextStart                         cdrtocCDTextStart
  487
+hi def link cdrtocLength                                   cdrtocNumber
  488
+hi def link cdrtocTrackDatafileLength                      cdrtocLength
  489
+hi def link cdrtocTrackFifoLength                          cdrtocLength
  490
+hi def link cdrtocPreProc                                  PreProc
  491
+hi def link cdrtocTrackFlag                                cdrtocPreProc
  492
+hi def link cdrtocTrackFlagCopy                            cdrtocTrackFlag
  493
+hi def link cdrtocSpecial                                  Special
  494
+hi def link cdrtocTrackFlagNo                              cdrtocSpecial
  495
+hi def link cdrtocTrackFlagPreEmphasis                     cdrtocTrackFlag
  496
+hi def link cdrtocTrackISRC                                cdrtocTrackFlag
  497
+hi def link cdrtocTrackIndex                               cdrtocTrackKeyword
  498
+hi def link cdrtocMMSSFF                                   cdrtocLength
  499
+hi def link cdrtocTrackIndexMMSSFF                         cdrtocMMSSFF
  500
+hi def link cdrtocTrackCDTextLanguage                      cdrtocTrackKeyword
  501
+hi def link cdrtocTrackCDTextLanguageEnd                   cdrtocLanguageEnd
  502
+hi def link cdrtocTrackCDTextLanguageNumber                cdrtocLanguageNumber
  503
+hi def link cdrtocTrackCDTextLanguageStart                 cdrtocLanguageStart
  504
+hi def link cdrtocTrackContents                            StorageClass
  505
+hi def link cdrtocTrackMarker                              cdrtocTrackContents
  506
+hi def link cdrtocTrackMarkerEndMMSSFF                     cdrtocMMSSFF
  507
+hi def link cdrtocTrackMarkerStartMMSSFF                   cdrtocMMSSFF
  508
+hi def link cdrtocTrackMode                                Type
  509
+hi def link cdrtocTrackPregap                              cdrtocTrackContents
  510
+hi def link cdrtocTrackPregapMMSSFF                        cdrtocMMSSFF
  511
+hi def link cdrtocTrackSilenceLength                       cdrtocLength
  512
+hi def link cdrtocTrackSubChannelMode                      cdrtocPreProc
  513
+hi def link cdrtocTrackSubTrack                            cdrtocTrackContents
  514
+hi def link cdrtocFilename                                 cdrtocString
  515
+hi def link cdrtocTrackSubTrackDatafileFilename            cdrtocFilename
  516
+hi def link cdrtocTrackSubTrackDatafileFilenameDelimiters  cdrtocTrackSubTrackDatafileFilename
  517
+hi def link cdrtocSpecialChar                              SpecialChar
  518
+hi def link cdrtocTrackSubTrackDatafileFilenameSpecialChar cdrtocSpecialChar
  519
+hi def link cdrtocTrackSubTrackDatafileLength              cdrtocLength
  520
+hi def link cdrtocTrackSubTrackFifoFilename                cdrtocFilename
  521
+hi def link cdrtocTrackSubTrackFifoFilenameDelimiters      cdrtocTrackSubTrackFifoFilename
  522
+hi def link cdrtocTrackSubTrackFifoFilenameSpecialChar     cdrtocSpecialChar
  523
+hi def link cdrtocTrackSubTrackFifoLength                  cdrtocLength
  524
+hi def link cdrtocTrackSubTrackFileFilename                cdrtocFilename
  525
+hi def link cdrtocTrackSubTrackFileFilenameDelimiters      cdrtocTrackSubTrackFileFilename
  526
+hi def link cdrtocTrackSubTrackFileFilenameSpecialChar     cdrtocSpecialChar
  527
+hi def link cdrtocTrackSubTrackFileLength                  cdrtocLength
  528
+hi def link cdrtocTrackSubTrackFileStart                   cdrtocLength
  529
+hi def link cdrtocTrackSubTrackZeroDataLength              cdrtocLength
  530
+hi def link cdrtocTrackSubTrackZeroDataMode                Type
  531
+hi def link cdrtocTrackSubTrackZeroDataSubChannelMode      cdrtocPreProc
  532
+hi def link cdrtocTrackSubTrackdatafileFilenameSpecialChar cdrtocSpecialChar
  533
+
  534
+let b:current_syntax = "cdrtoc"
  535
+
  536
+let &cpo = s:cpo_save
  537
+unlet s:cpo_save
8  runtime/syntax/django.vim
... ...
@@ -1,7 +1,7 @@
1 1
 " Vim syntax file
2 2
 " Language:	Django template
3 3
 " Maintainer:	Dave Hodder <dmh@dmh.org.uk>
4  
-" Last Change:	2007 Jan 26
  4
+" Last Change:	2007 Apr 21
5 5
 
6 6
 " For version 5.x: Clear all syntax items
7 7
 " For version 6.x: Quit when a syntax file was already loaded
@@ -27,7 +27,7 @@ syn keyword djangoStatement contained parsed regroup reversed spaceless
27 27
 syn keyword djangoStatement contained endspaceless ssi templatetag openblock
28 28
 syn keyword djangoStatement contained closeblock openvariable closevariable
29 29
 syn keyword djangoStatement contained openbrace closebrace opencomment
30  
-syn keyword djangoStatement contained closecomment widthratio with
  30
+syn keyword djangoStatement contained closecomment widthratio url with endwith
31 31
 syn keyword djangoStatement contained get_current_language trans noop blocktrans
32 32
 syn keyword djangoStatement contained endblocktrans get_available_languages
33 33
 syn keyword djangoStatement contained get_current_language_bidi plural
@@ -53,8 +53,8 @@ syn keyword djangoTodo contained TODO FIXME XXX
53 53
 syn region djangoArgument contained start=/"/ skip=/\\"/ end=/"/
54 54
 
55 55
 " Mark illegal characters within tag and variables blocks
56  
-syn match djangoTagError contained "#}\|{{\|[^%]}}\|[<>!=&#]"
57  
-syn match djangoVarError contained "#}\|{%\|%}\|[<>!=&#%]"
  56
+syn match djangoTagError contained "#}\|{{\|[^%]}}\|[<>!&#]"
  57
+syn match djangoVarError contained "#}\|{%\|%}\|[<>!&#%]"
58 58
 
59 59
 " Django template tag and variable blocks
60 60
 syn region djangoTagBlock start="{%" end="%}" contains=djangoStatement,djangoFilter,djangoArgument,djangoTagError display
2  src/arabic.h
@@ -7,7 +7,7 @@
7 7
  */
8 8
 
9 9
 /*
10  
- * Arabic characters are catagorized into following types:
  10
+ * Arabic characters are categorized into following types:
11 11
  *
12 12
  * Isolated	- iso-8859-6 form	  char denoted with	a_*
13 13
  * Initial	- unicode form-B start	  char denoted with	a_i_*
11  src/gui_gtk.c
@@ -53,6 +53,9 @@
53 53
 # ifdef bindtextdomain
54 54
 #  undef bindtextdomain
55 55
 # endif
  56
+# ifdef bindtextdomain_codeset
  57
+#  undef bindtextdomain_codeset
  58
+# endif
56 59
 # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS)
57 60
 #  define ENABLE_NLS	/* so the texts in the dialog boxes are translated */
58 61
 # endif
@@ -449,8 +452,8 @@ menu_item_new(vimmenu_T *menu, GtkWidget *parent_widget)
449 452
  *
450 453
  * gtk_menu_item_new_with_label(menu->dname);
451 454
  *
452  
- * This is neccessary, since there is no other way in GTK+ 1 to get the
453  
- * not automatically parsed accellerator stuff right.
  455
+ * This is necessary, since there is no other way in GTK+ 1 to get the
  456
+ * not automatically parsed accelerator stuff right.
454 457
  */
455 458
     static void
456 459
 menu_item_new(vimmenu_T *menu, GtkWidget *parent_widget)
@@ -828,7 +831,7 @@ gui_mch_set_text_area_pos(int x, int y, int w, int h)
828 831
 
829 832
 #if defined(FEAT_MENU) || defined(PROTO)
830 833
 /*
831  
- * Enable or disable accelators for the toplevel menus.
  834
+ * Enable or disable accelerators for the toplevel menus.
832 835
  */
833 836
     void
834 837
 gui_gtk_set_mnemonics(int enable)
@@ -2493,7 +2496,7 @@ find_key_press_event(
2493 2496
 	return TRUE;
2494 2497
 #endif
2495 2498
 
2496  
-    /* It would be delightfull if it where possible to do search history
  2499
+    /* It would be delightful if it where possible to do search history
2497 2500
      * operations on the K_UP and K_DOWN keys here.
2498 2501
      */
2499 2502
 

0 notes on commit 6ce2c13

Please sign in to comment.
Something went wrong with that request. Please try again.