Skip to content

Commit fc87ff4

Browse files
brammoolbrammool
committed
Update runtime files. Add vroom file support.
1 parent 3ea8d84 commit fc87ff4

File tree

10 files changed

+189
-33
lines changed

10 files changed

+189
-33
lines changed

‎runtime/doc/if_pyth.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*if_pyth.txt* For Vim version 7.4. Last change: 2013 Jul 10
1+
*if_pyth.txt* For Vim version 7.4. Last change: 2014 Jul 23
22

33

44
VIM REFERENCE MANUAL by Paul Moore
@@ -28,7 +28,7 @@ Both can be available at the same time, but read |python-2-and-3|.
2828
==============================================================================
2929
1. Commands *python-commands*
3030

31-
*:python* *:py* *E205* *E263* *E264*
31+
*:python* *:py* *E263* *E264* *E887*
3232
:[range]py[thon] {stmt}
3333
Execute Python statement {stmt}. A simple check if
3434
the `:python` command is working: >

‎runtime/doc/options.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 7.4. Last change: 2014 Jun 26
1+
*options.txt* For Vim version 7.4. Last change: 2014 Jul 23
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -5369,7 +5369,7 @@ A jump table for the options with a short description can be found at |Q_op|.
53695369
Expression which is evaluated to apply a patch to a file and generate
53705370
the resulting new version of the file. See |diff-patchexpr|.
53715371

5372-
*'patchmode'* *'pm'* *E206*
5372+
*'patchmode'* *'pm'* *E205* *E206*
53735373
'patchmode' 'pm' string (default "")
53745374
global
53755375
{not in Vi}

‎runtime/doc/tags‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3592,7 +3592,7 @@ E201 autocmd.txt /*E201*
35923592
E202 options.txt /*E202*
35933593
E203 autocmd.txt /*E203*
35943594
E204 autocmd.txt /*E204*
3595-
E205 if_pyth.txt /*E205*
3595+
E205 options.txt /*E205*
35963596
E206 options.txt /*E206*
35973597
E207 editing.txt /*E207*
35983598
E208 message.txt /*E208*
@@ -4324,6 +4324,7 @@ E883 eval.txt /*E883*
43244324
E884 eval.txt /*E884*
43254325
E885 sign.txt /*E885*
43264326
E886 starting.txt /*E886*
4327+
E887 if_pyth.txt /*E887*
43274328
E89 message.txt /*E89*
43284329
E90 message.txt /*E90*
43294330
E91 options.txt /*E91*

‎runtime/doc/todo.txt‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 7.4. Last change: 2014 Jul 19
1+
*todo.txt* For Vim version 7.4. Last change: 2014 Jul 26
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -34,8 +34,6 @@ not be repeated below, unless there is extra information.
3434
*known-bugs*
3535
-------------------- Known bugs and current work -----------------------
3636

37-
Completion menu: remove redraw (Hirohito Higashi)
38-
3937
Regexp problems:
4038
- Bug with pattern: '\vblock (\d+)\.\n.*\d+%(\1)@<!\.$'
4139
(Lech Lorens, 2014 Feb 3)
@@ -48,28 +46,13 @@ Regexp problems:
4846
- NFA regexp doesn't handle \%<v correctly. (Ingo Karkat, 2014 May 12)
4947
- Does not work with NFA regexp engine:
5048
\%u, \%x, \%o, \%d followed by a composing character
49+
- Bug relating to back references. (Ingo Karkat, 2014 Jul 24)
5150

52-
Crash when splitting the window when the size is tiny.
53-
(Yukihiro Nakadaira, 2014 Jul 15-16)
54-
55-
Another problem with splitting window. (Yukihiro Nakadaira, 2014 Jul 17)
56-
Patch Jul 17.
57-
58-
Using freed memory when jumping from a quickfix list. (lcd47, 2014 Jul 17)
59-
60-
Patch to fix valgrind error. (Dominique Pelle, 2014 Jul 9)
61-
62-
Vroom filetype support. (David Barnett, 2014 Jul 10)
63-
64-
u_undo error. Reproduce with description from Ayberk Ozgur, 2014 Jul 17.
65-
66-
Updated Django files. (Dave Hodder, 2014 Jul 13)
67-
68-
Title of quickfist list is not kept for setqflist(list 'r').
69-
(Lcd, 2014 Jul 17) With test Jul 18.
51+
Still using freed memory after using setloclist(). (lcd, 2014 Jul 23)
7052

71-
Patch to fix noremap flags not cleared after typing Esc. (Jacob Niehus, 2014
72-
Jul 9)
53+
Patch to make getregtype() return the right size for non-linux systems.
54+
(Yasuhiro Matsumoto, 2014 Jul 8)
55+
Breaks test_eval. Inefficient, can we only compute y_width when needed?
7356

7457
Problem that a previous silent ":throw" causes a following try/catch not to
7558
work. (ZyX, 2013 Sep 28)

‎runtime/filetype.vim‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim support file to detect file types
22
"
33
" Maintainer: Bram Moolenaar <[email protected]>
4-
" Last Change: 2014 Jul 16
4+
" Last Change: 2014 Jul 23
55

66
" Listen very carefully, I will say this only once
77
if exists("did_load_filetypes")
@@ -2314,6 +2314,9 @@ au BufNewFile,BufRead vgrindefs setf vgrindefs
23142314
" VRML V1.0c
23152315
au BufNewFile,BufRead *.wrl setf vrml
23162316

2317+
" Vroom (vim testing and executable documentation)
2318+
au BufNewFile,BufRead *.vroom setf vroom
2319+
23172320
" Webmacro
23182321
au BufNewFile,BufRead *.wm setf webmacro
23192322

‎runtime/ftplugin/vroom.vim‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
" Vim filetype plugin file
2+
" Language: Vroom (vim testing and executable documentation)
3+
" Maintainer: David Barnett (https://github.com/google/vim-ft.vroom)
4+
" Last Change: 2014 Jul 23
5+
6+
if exists('b:did_ftplugin')
7+
finish
8+
endif
9+
let b:did_ftplugin = 1
10+
11+
let s:cpo_save = &cpo
12+
set cpo-=C
13+
14+
15+
let b:undo_ftplugin = 'setlocal formatoptions< shiftwidth< softtabstop<' .
16+
\ ' expandtab< iskeyword< comments< commentstring<'
17+
18+
setlocal formatoptions-=t
19+
20+
" The vroom interpreter doesn't accept anything but 2-space indent.
21+
setlocal shiftwidth=2
22+
setlocal softtabstop=2
23+
setlocal expandtab
24+
25+
" To allow tag lookup and autocomplete for whole autoload functions, '#' must be
26+
" a keyword character. This also conforms to the behavior of ftplugin/vim.vim.
27+
setlocal iskeyword+=#
28+
29+
" Vroom files have no comments (text is inert documentation unless indented).
30+
setlocal comments=
31+
setlocal commentstring=
32+
33+
34+
let &cpo = s:cpo_save
35+
unlet s:cpo_save

‎runtime/indent/vroom.vim‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
" Vim indent file
2+
" Language: Vroom (vim testing and executable documentation)
3+
" Maintainer: David Barnett (https://github.com/google/vim-ft.vroom)
4+
" Last Change: 2014 Jul 23
5+
6+
if exists('b:did_indent')
7+
finish
8+
endif
9+
let b:did_indent = 1
10+
11+
let s:cpo_save = &cpo
12+
set cpo-=C
13+
14+
15+
let b:undo_indent = 'setlocal autoindent<'
16+
17+
setlocal autoindent
18+
19+
20+
let &cpo = s:cpo_save
21+
unlet s:cpo_save

‎runtime/syntax/django.vim‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim syntax file
22
" Language: Django template
33
" Maintainer: Dave Hodder <[email protected]>
4-
" Last Change: 2012 Apr 09
4+
" Last Change: 2014 Jul 13
55

66
" For version 5.x: Clear all syntax items
77
" For version 6.x: Quit when a syntax file was already loaded
@@ -64,7 +64,7 @@ syn region djangoTagBlock start="{%" end="%}" contains=djangoStatement,djangoFil
6464
syn region djangoVarBlock start="{{" end="}}" contains=djangoFilter,djangoArgument,djangoVarError display
6565

6666
" Django template 'comment' tag and comment block
67-
syn region djangoComment start="{%\s*comment\s*%}" end="{%\s*endcomment\s*%}" contains=djangoTodo
67+
syn region djangoComment start="{%\s*comment\(\s\+.\{-}\)\?%}" end="{%\s*endcomment\s*%}" contains=djangoTodo
6868
syn region djangoComBlock start="{#" end="#}" contains=djangoTodo
6969

7070
" Define the default highlighting.

‎runtime/syntax/htmldjango.vim‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim syntax file
22
" Language: Django HTML template
33
" Maintainer: Dave Hodder <[email protected]>
4-
" Last Change: 2007 Jan 26
4+
" Last Change: 2014 Jul 13
55

66
" For version 5.x: Clear all syntax items
77
" For version 6.x: Quit when a syntax file was already loaded
@@ -28,7 +28,7 @@ syn cluster djangoBlocks add=djangoTagBlock,djangoVarBlock,djangoComment,djangoC
2828

2929
syn region djangoTagBlock start="{%" end="%}" contains=djangoStatement,djangoFilter,djangoArgument,djangoTagError display containedin=ALLBUT,@djangoBlocks
3030
syn region djangoVarBlock start="{{" end="}}" contains=djangoFilter,djangoArgument,djangoVarError display containedin=ALLBUT,@djangoBlocks
31-
syn region djangoComment start="{%\s*comment\s*%}" end="{%\s*endcomment\s*%}" contains=djangoTodo containedin=ALLBUT,@djangoBlocks
31+
syn region djangoComment start="{%\s*comment\(\s\+.\{-}\)\?%}" end="{%\s*endcomment\s*%}" contains=djangoTodo containedin=ALLBUT,@djangoBlocks
3232
syn region djangoComBlock start="{#" end="#}" contains=djangoTodo containedin=ALLBUT,@djangoBlocks
3333

3434
let b:current_syntax = "htmldjango"

‎runtime/syntax/vroom.vim‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
" Vim syntax file
2+
" Language: Vroom (vim testing and executable documentation)
3+
" Maintainer: David Barnett (https://github.com/google/vim-ft.vroom)
4+
" Last Change: 2014 Jul 23
5+
6+
" For version 5.x: Clear all syntax items.
7+
" For version 6.x and later: Quit when a syntax file was already loaded.
8+
if v:version < 600
9+
syntax clear
10+
elseif exists('b:current_syntax')
11+
finish
12+
endif
13+
14+
let s:cpo_save = &cpo
15+
set cpo-=C
16+
17+
18+
syn include @vroomVim syntax/vim.vim
19+
syn include @vroomShell syntax/sh.vim
20+
21+
syntax region vroomAction
22+
\ matchgroup=vroomOutput
23+
\ start='\m^ ' end='\m$' keepend
24+
\ contains=vroomControlBlock
25+
26+
syntax region vroomAction
27+
\ matchgroup=vroomOutput
28+
\ start='\m^ & ' end='\m$' keepend
29+
\ contains=vroomControlBlock
30+
31+
syntax match vroomOutput '\m^ &$'
32+
33+
syntax region vroomMessageBody
34+
\ matchgroup=vroomMessage
35+
\ start='\m^ \~ ' end='\m$' keepend
36+
\ contains=vroomControlBlock
37+
38+
syntax region vroomColoredAction
39+
\ matchgroup=vroomInput
40+
\ start='\m^ > ' end='\m$' keepend
41+
\ contains=vimNotation,vroomControlBlock
42+
syntax region vroomAction
43+
\ matchgroup=vroomInput
44+
\ start='\m^ % ' end='\m$' keepend
45+
\ contains=vimNotation,vroomControlBlock
46+
47+
syntax region vroomAction
48+
\ matchgroup=vroomContinuation
49+
\ start='\m^ |' end='\m$' keepend
50+
51+
syntax region vroomAction
52+
\ start='\m^ \ze:' end='\m$' keepend
53+
\ contains=@vroomVim,vroomControlBlock
54+
55+
syntax region vroomAction
56+
\ matchgroup=vroomDirective
57+
\ start='\m^ @\i\+' end='\m$' keepend
58+
\ contains=vroomControlBlock
59+
60+
syntax region vroomSystemAction
61+
\ matchgroup=vroomSystem
62+
\ start='\m^ ! ' end='\m$' keepend
63+
\ contains=@vroomShell,vroomControlBlock
64+
65+
syntax region vroomHijackAction
66+
\ matchgroup=vroomHijack
67+
\ start='\m^ \$ ' end='\m$' keepend
68+
\ contains=vroomControlBlock
69+
70+
syntax match vroomControlBlock contains=vroomControlEscape,@vroomControls
71+
\ '\v \([^&()][^()]*\)$'
72+
73+
syntax match vroomControlEscape '\m&' contained
74+
75+
syntax cluster vroomControls
76+
\ contains=vroomDelay,vroomMode,vroomBuffer,vroomRange
77+
\,vroomChannel,vroomBind,vroomStrictness
78+
syntax match vroomRange '\v\.(,\+?(\d+|\$)?)?' contained
79+
syntax match vroomRange '\v\d*,\+?(\d+|\$)?' contained
80+
syntax match vroomBuffer '\v\d+,@!' contained
81+
syntax match vroomDelay '\v\d+(\.\d+)?s' contained
82+
syntax match vroomMode '\v<%(regex|glob|verbatim)' contained
83+
syntax match vroomChannel '\v<%(stderr|stdout|command|status)>' contained
84+
syntax match vroomBind '\v<bind>' contained
85+
syntax match vroomStrictness '\v\<%(STRICT|RELAXED|GUESS-ERRORS)\>' contained
86+
87+
highlight default link vroomInput Identifier
88+
highlight default link vroomDirective vroomInput
89+
highlight default link vroomControlBlock vroomInput
90+
highlight default link vroomSystem vroomInput
91+
highlight default link vroomOutput Statement
92+
highlight default link vroomContinuation Constant
93+
highlight default link vroomHijack Special
94+
highlight default link vroomColoredAction Statement
95+
highlight default link vroomSystemAction vroomSystem
96+
highlight default link vroomHijackAction vroomHijack
97+
highlight default link vroomMessage vroomOutput
98+
highlight default link vroomMessageBody Constant
99+
100+
highlight default link vroomControlEscape Special
101+
highlight default link vroomBuffer vroomInput
102+
highlight default link vroomRange Include
103+
highlight default link vroomMode Constant
104+
highlight default link vroomDelay Type
105+
highlight default link vroomStrictness vroomMode
106+
highlight default link vroomChannel vroomMode
107+
highlight default link vroomBind vroomMode
108+
109+
let b:current_syntax = 'vroom'
110+
111+
112+
let &cpo = s:cpo_save
113+
unlet s:cpo_save

0 commit comments

Comments
 (0)