Skip to content

Commit 277ddd5

Browse files
committed
Updated runtime files.
1 parent bc8c97d commit 277ddd5

File tree

10 files changed

+131
-95
lines changed

10 files changed

+131
-95
lines changed

runtime/colors/README.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@ Some attributes (e.g., bold) might be set in the defaults that you want
3636
removed in your color scheme. Use something like "gui=NONE" to remove the
3737
attributes.
3838

39+
In case you want to set 'background' depending on the colorscheme selected,
40+
this autocmd might be useful:
41+
autocmd SourcePre */colors/blue_sky.vim set background=dark
42+
Replace "blue_sky" with the name of the colorscheme.
43+
44+
In case you want to tweak a colorscheme after it was loaded, check out that
45+
ColorScheme autocmd event.
46+
3947
To see which highlight group is used where, find the help for
4048
"highlight-groups" and "group-name".
4149

runtime/compiler/gcc.vim

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ CompilerSet errorformat=
2525
\%f:%l:\ %tarning:\ %m,
2626
\%f:%l:\ %m,
2727
\\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
28-
\%D%*\\a[%*\\d]:\ Entering\ directory\ `%f',
29-
\%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',
30-
\%D%*\\a:\ Entering\ directory\ `%f',
31-
\%X%*\\a:\ Leaving\ directory\ `%f',
28+
\%D%*\\a[%*\\d]:\ Entering\ directory\ [`']%f',
29+
\%X%*\\a[%*\\d]:\ Leaving\ directory\ [`']%f',
30+
\%D%*\\a:\ Entering\ directory\ [`']%f',
31+
\%X%*\\a:\ Leaving\ directory\ [`']%f',
3232
\%DMaking\ %*\\a\ in\ %f
3333

3434
if exists('g:compiler_gcc_ignore_unmatched_lines')

runtime/doc/autocmd.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*autocmd.txt* For Vim version 7.4. Last change: 2013 Aug 04
1+
*autocmd.txt* For Vim version 7.4. Last change: 2013 Dec 04
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -304,6 +304,9 @@ Name triggered by ~
304304
|InsertCharPre| when a character was typed in Insert mode, before
305305
inserting it
306306

307+
|TextChanged| after a change was made to the text in Normal mode
308+
|TextChangedI| after a change was made to the text in Insert mode
309+
307310
|ColorScheme| after loading a color scheme
308311

309312
|RemoteReply| a reply from a server Vim was received

runtime/doc/eval.txt

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 7.4. Last change: 2013 Nov 08
1+
*eval.txt* For Vim version 7.4. Last change: 2013 Dec 08
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -3200,7 +3200,7 @@ getchar([expr]) *getchar()*
32003200
If [expr] is 1, only check if a character is available, it is
32013201
not consumed. Return zero if no character available.
32023202

3203-
Without {expr} and when {expr} is 0 a whole character or
3203+
Without [expr] and when [expr] is 0 a whole character or
32043204
special key is returned. If it is an 8-bit character, the
32053205
result is a number. Use nr2char() to convert it to a String.
32063206
Otherwise a String is returned with the encoded character.
@@ -3210,7 +3210,7 @@ getchar([expr]) *getchar()*
32103210
String when a modifier (shift, control, alt) was used that is
32113211
not included in the character.
32123212

3213-
When {expr} is 1 only the first byte is returned. For a
3213+
When [expr] is 1 only the first byte is returned. For a
32143214
one-byte character it is the character itself as a number.
32153215
Use nr2char() to convert it to a String.
32163216

@@ -4134,6 +4134,8 @@ maparg({name}[, {mode} [, {abbr} [, {dict}]]]) *maparg()*
41344134
(|mapmode-ic|)
41354135
"sid" The script local ID, used for <sid> mappings
41364136
(|<SID>|).
4137+
"nowait" Do not wait for other, longer mappings.
4138+
(|:map-<nowait>|).
41374139

41384140
The mappings local to the current buffer are checked first,
41394141
then the global mappings.
@@ -4447,6 +4449,9 @@ getpos({expr}) Get the position for {expr}. For possible values of {expr}
44474449
it is the offset in screen columns from the start of the
44484450
character. E.g., a position within a <Tab> or after the last
44494451
character.
4452+
Note that for '< and '> Visual mode matters: when it is "V"
4453+
(visual line mode) the column of '< is zero and the column of
4454+
'> is a large number.
44504455
This can be used to save and restore the cursor position: >
44514456
let save_cursor = getpos(".")
44524457
MoveTheCursorAround
@@ -5270,6 +5275,10 @@ setpos({expr}, {list})
52705275
character. E.g., a position within a <Tab> or after the last
52715276
character.
52725277

5278+
Note that for '< and '> changing the line number may result in
5279+
the marks to be effectively be swapped, so that '< is always
5280+
before '>.
5281+
52735282
Returns 0 when the position could be set, -1 otherwise.
52745283
An error message is given if {expr} is invalid.
52755284

runtime/doc/fold.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*fold.txt* For Vim version 7.4. Last change: 2010 May 13
1+
*fold.txt* For Vim version 7.4. Last change: 2013 Dec 04
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -285,9 +285,10 @@ zF Create a fold for [count] lines. Works like "zf".
285285
*zd* *E351*
286286
zd Delete one fold at the cursor. When the cursor is on a folded
287287
line, that fold is deleted. Nested folds are moved one level
288-
up. In Visual mode all folds (partially) in the selected area
289-
are deleted. Careful: This easily deletes more folds than you
290-
expect and there is no undo.
288+
up. In Visual mode one level of all folds (partially) in the
289+
selected area are deleted.
290+
Careful: This easily deletes more folds than you expect and
291+
there is no undo for manual folding.
291292
This only works when 'foldmethod' is "manual" or "marker".
292293
Also see |fold-delete-marker|.
293294

runtime/doc/options.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 7.4. Last change: 2013 Nov 12
1+
*options.txt* For Vim version 7.4. Last change: 2013 Dec 04
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -987,7 +987,7 @@ A jump table for the options with a short description can be found at |Q_op|.
987987

988988
*'backupdir'* *'bdir'*
989989
'backupdir' 'bdir' string (default for Amiga: ".,t:",
990-
for MS-DOS and Win32: ".,c:/tmp,c:/temp"
990+
for MS-DOS and Win32: ".,$TEMP,c:/tmp,c:/temp"
991991
for Unix: ".,~/tmp,~/")
992992
global
993993
{not in Vi}
@@ -2477,7 +2477,7 @@ A jump table for the options with a short description can be found at |Q_op|.
24772477

24782478
*'directory'* *'dir'*
24792479
'directory' 'dir' string (default for Amiga: ".,t:",
2480-
for MS-DOS and Win32: ".,c:\tmp,c:\temp"
2480+
for MS-DOS and Win32: ".,$TEMP,c:\tmp,c:\temp"
24812481
for Unix: ".,~/tmp,/var/tmp,/tmp")
24822482
global
24832483
List of directory names for the swap file, separated with commas.

runtime/doc/todo.txt

Lines changed: 34 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 7.4. Last change: 2013 Nov 26
1+
*todo.txt* For Vim version 7.4. Last change: 2013 Dec 11
22

33

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

37-
NFA regexp doesn't count tab matches correctly. (Urtica Dioica / gaultheria
38-
Shallon, 2013 Nov 18)
39-
40-
After patch 7.4.100 there is still a difference between NFA and old engine.
41-
25 a's with pattern \v^(aa+)\1+$ (Urtica Dioica, 2013 Nov 21)
42-
Also: 9 a's with pattern \v^(a{-2,})\1+$ (Nov 23)
43-
44-
Error for incomplete help argument. (John Beckett, 2013 Sep 12)
45-
46-
Tutor: adjust text to start the tutor. (Jakson Alves de Aquino, 2013 Nov 19)
47-
48-
Should win_redr_custom() not be allowed to use recursively?
49-
(Yasuhiro Matsumoto, 2013 Aug 15)
50-
51-
NFA engine combining character mismatch. (glts, 2013 Aug 27)
52-
Remark Dominique, Aug 27
53-
54-
Patch to fix building with Ruby on Cygwin. (Steve Hall, 2013 Nov 21)
55-
56-
Patch to fix that in Python vim.eval errors are not caught by try/catch.
57-
(ZyX, 2013 Nov 26)
37+
Regexp problems:
38+
- NFA regexp doesn't count tab matches correctly. (Urtica Dioica / gaultheria
39+
Shallon, 2013 Nov 18)
40+
- After patch 7.4.100 there is still a difference between NFA and old engine.
41+
25 a's with pattern \v^(aa+)\1+$ (Urtica Dioica, 2013 Nov 21) Also: 9 a's
42+
with pattern \v^(a{-2,})\1+$ (Nov 23)
43+
- NFA engine combining character mismatch. (glts, 2013 Aug 27)
44+
Remark from Dominique, Aug 27
45+
- Issue 164: freeze on regexp search.
46+
- NFA problem with non-greedy match and branches. (Ingo Karkat, 2013 Nov 29)
5847

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

6251
Problem using ":try" inside ":execute". (ZyX, 2013 Sep 15)
6352

64-
Issue 164: freeze on regexp search.
65-
6653
Update for Clojure ftplugin. (Sung Pae). Await discussion about formatting in
6754
ftplugins.
6855

@@ -72,18 +59,17 @@ Patch to support slices in Python vim.List. (ZyX, 2013 Oct 20)
7259

7360
Patch to support iterator on Python vim.options. (ZyX, 2013 Nov 2)
7461

75-
Patch to fix that "zG" leaves temp files around. (Ken Takata, 2013 Nov 22)
76-
7762
Patch to make Dictionary.update() work without arguments.
7863
(ZyX, 2013 Oct 19)
7964

80-
Bug caused by patch 7.3.1288? Issue 183.
81-
8265
Patch for Cobol ftplugin. (ZyX, 2013 Oct 20)
8366
Await response from maintainer.
8467

8568
Include systemverilog file? Two votes yes.
8669

70+
Patch to add :S modifier for excaping the current file name.
71+
(ZyX, 2013 Nov 30) Update Dec 5.
72+
8773
Problem with 'spellsuggest' file, only works for some words.
8874
(Cesar Romani, 2013 Aug 20) Depends on file name? (Aug 24)
8975
Additional remark by glts: the suggested words are marked bad?
@@ -104,32 +90,27 @@ instead. (Samuel Ferencik, 2013 Sep 28)
10490

10591
Series of patches for NL vs NUL handling. (ZyX, 2013 Nov 3, Nov 9)
10692

93+
Patch to add v:completed_item. (Shougo Matsu, 2013 Nov 29).
94+
10795
Perl: support for Activestate perl 5.18: Issue 170.
10896

10997
Several syntax file match "^\s*" which may get underlined if that's in the
11098
highlight group. Add a "\zs" after it?
11199

100+
Patch to fix temp directories for Windows, so that it works without tweaking.
101+
Issue 28.
102+
112103
Go through more coverity reports.
113104

114105
Include Haiku port? (Adrien Destugues, Siarzhuk Zharski, 2013 Oct 24)
115106

116107
Updated spec ftplugin. (Matěj Cepl, 2013 Oct 16)
117108

118-
Patch to make ColorScheme autocommand match with the colorscheme name instead
119-
of the buffer name. (Christian Brabandt, 2013 Sep 25)
120-
121109
Patch to right-align signs. (James Kolb (email james), 2013 Sep 23)
122110

123111
With "$" in 'cpoptions' the popup menu isn't fully drawn. (Matti Niemenmaa,
124112
2013 Sep 5)
125113

126-
"gUgn" cannot be repeated, while "dgn" can. (Dimitar Dimitrov)
127-
Patch by Christian Brabandt (2013 Aug 12)
128-
Also notes by Christian Wellenbrock, Nov 13, response from Christian Nov 14.
129-
130-
Several Win32 functions are not using Unicode.
131-
Patches to fix this. (Ken Takata, 2013 Aug 9)
132-
133114
Patch to add item in 'listchars' to repeat first character. (Nathaniel Braun,
134115
pragm, 2013 Oct 13)
135116

@@ -147,6 +128,7 @@ Patch by Thomas Tuegel, also for GTK, 2013 Nov 24
147128

148129
Python: Extended funcrefs: use func_T* structure in place of char_u* function
149130
names. (ZyX, 2013 Jul 15, update Sep 22, 24, 28)
131+
Also fixes Bug: E685 error for func_unref(). (ZyX, 2010 Aug 5)
150132

151133
Patch to add funcref to Lua. (Luis Carvalho, 2013 Sep 4)
152134
With tests: Sep 5.
@@ -156,14 +138,14 @@ Patch to fix that on suckless Terminal mousewheel up does not work.
156138

157139
Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
158140

159-
Patch to make external commands work with multi-byte characters on Win32 when
160-
'encoding' differs from the active codepage. (Yasuhiro Matsumoto, 2013 Aug 5)
161-
162141
Checking runtime scripts: Thilo Six, 2012 Jun 6.
163142

164143
Fold can't be opened after ":move". (Ein Brown)
165144
Patch from Christian Brabandt doesn't fix it completely.
166145

146+
Patch from Christian Brabandt to preserve upper case marks when wiping out a
147+
buffer. (2013 Dec 9)
148+
167149
Patch for drag&drop reordering of GUI tab pages reordering.
168150
(Ken Takata, 2013 Nov 22, second one, also by Masamichi Abe)
169151

@@ -200,6 +182,12 @@ Or should we add a more general mechanism, like lambda functions?
200182
Problem caused by patch 7.3.638: window->open does not update window
201183
correctly. Issue 91.
202184

185+
Patch to add {lhs} to :mapclear: clear all maps starting with {lhs}.
186+
(Christian Brabandt, 2013 Dec 9)
187+
188+
The garbage collector may use too much stack. Make set_ref_in_item()
189+
iterative instead of recursive. Test program by Marc Weber (2013 Dec 10)
190+
203191
Exception caused by argument of return is not caught by try/catch.
204192
(David Barnett, 2013 Nov 19)
205193

@@ -277,6 +265,9 @@ cursor. (Daniel Thau, 2013 Nov 20)
277265

278266
patch to add "combine" flag to syntax commands. (so8res, 2012 Dec 6)
279267

268+
Bug caused by patch 7.3.1288? Issue 183.
269+
I can't reproduce it.
270+
280271
Syntax update problem in one buffer opened in two windows, bottom window is
281272
not correctly updated. (Paul Harris, 2012 Feb 27)
282273

@@ -402,6 +393,8 @@ Patch to add digraph() function. (Christian Brabandt, 2013 Aug 22, update Aug
402393

403394
Patch for input method status. (Hirohito Higashi, 2012 Apr 18)
404395

396+
Update Vim app icon (for Gnome). (Jakub Steiner, 2013 Dec 6)
397+
405398
Patch to use .png icons for the toolbar on MS-Windows. (Martin Gieseking, 2013
406399
Apr 18)
407400

@@ -420,8 +413,6 @@ And one for gui_x11.txt.
420413
finddir() has the same problem. (Yukihiro Nakadaira, 2012 Jan 10)
421414
Requires a rewrite of the file_file_in_path code.
422415

423-
Problem with l: dictionary being locked in a function. (ZyX, 2011 Jul 21)
424-
425416
Should use has("browsefilter") in ftplugins. Requires patch 7.3.593.
426417

427418
Update for vim2html.pl. (Tyru, 2013 Feb 22)
@@ -503,8 +494,6 @@ When using a Vim server, a # in the path causes an error message.
503494
Setting $HOME on MS-Windows is not very well documented. Suggestion by Ben
504495
Fritz (2011 Oct 27).
505496

506-
Bug: E685 error for func_unref(). (ZyX, 2010 Aug 5)
507-
508497
Bug: Windows 7 64 bit system freezes when 'clipboard' set to "unnamed" and
509498
doing ":g/test/d". Putting every delete on the clipboard? (Robert Chan, 2011
510499
Jun 17)

runtime/indent/sh.vim

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
" Vim indent file
22
" Language: Shell Script
3-
" Maintainer: Nikolai Weibull <[email protected]>
4-
" Latest Revision: 2010-01-06
3+
" Maintainer: Peter Aronoff <[email protected]>
4+
" Original Author: Nikolai Weibull <[email protected]>
5+
" Latest Revision: 2013-11-28
56

67
if exists("b:did_indent")
78
finish
@@ -77,6 +78,8 @@ function! GetShIndent()
7778
let line = getline(v:lnum)
7879
if line =~ '^\s*\%(then\|do\|else\|elif\|fi\|done\)\>' || line =~ '^\s*}'
7980
let ind -= s:indent_value('default')
81+
elseif line =~ '^\s*esac\>' && s:is_case_empty(getline(v:lnum - 1))
82+
let ind -= s:indent_value('default')
8083
elseif line =~ '^\s*esac\>'
8184
let ind -= (s:is_case_label(pine, lnum) && s:is_case_ended(pine) ?
8285
\ 0 : s:indent_value('case-statements')) +
@@ -154,5 +157,13 @@ function! s:is_case_ended(line)
154157
return s:is_case_break(a:line) || a:line =~ ';[;&]\s*\%(#.*\)\=$'
155158
endfunction
156159

160+
function! s:is_case_empty(line)
161+
if a:line =~ '^\s*$' || a:line =~ '^\s*#'
162+
return s:is_case_empty(getline(v:lnum - 1))
163+
else
164+
return a:line =~ '^\s*case\>'
165+
endif
166+
endfunction
167+
157168
let &cpo = s:cpo_save
158169
unlet s:cpo_save

0 commit comments

Comments
 (0)