Skip to content

Commit 6886afb

Browse files
committed
Updated runtime files.
1 parent 3054eea commit 6886afb

File tree

12 files changed

+211
-133
lines changed

12 files changed

+211
-133
lines changed

runtime/doc/eval.txt

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 7.3. Last change: 2012 Nov 14
1+
*eval.txt* For Vim version 7.3. Last change: 2012 Nov 21
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -4878,9 +4878,9 @@ search({pattern} [, {flags} [, {stopline} [, {timeout}]]]) *search()*
48784878
Search for regexp pattern {pattern}. The search starts at the
48794879
cursor position (you can use |cursor()| to set it).
48804880

4881+
When a match has been found its line number is returned.
48814882
If there is no match a 0 is returned and the cursor doesn't
48824883
move. No error message is given.
4883-
When a match has been found its line number is returned.
48844884

48854885
{flags} is a String, which can contain these character flags:
48864886
'b' search backward instead of forward
@@ -5694,8 +5694,10 @@ substitute({expr}, {pat}, {sub}, {flags}) *substitute()*
56945694
This works like the ":substitute" command (without any flags).
56955695
But the matching with {pat} is always done like the 'magic'
56965696
option is set and 'cpoptions' is empty (to make scripts
5697-
portable). 'ignorecase' is still relevant. 'smartcase' is
5698-
not used. See |string-match| for how {pat} is used.
5697+
portable). 'ignorecase' is still relevant, use |/\c| or |/\C|
5698+
if you want to ignore or match case and ignore 'ignorecase'.
5699+
'smartcase' is not used. See |string-match| for how {pat} is
5700+
used.
56995701

57005702
A "~" in {sub} is not replaced with the previous {sub}.
57015703
Note that some codes in {sub} have a special meaning
@@ -6160,8 +6162,9 @@ winline() The result is a Number, which is the screen line of the cursor
61606162
winnr([{arg}]) The result is a Number, which is the number of the current
61616163
window. The top window has number 1.
61626164
When the optional argument is "$", the number of the
6163-
last window is returned (the window count).
6164-
When the optional argument is "#", the number of the last
6165+
last window is returned (the window count). >
6166+
let window_count = winnr('$')
6167+
< When the optional argument is "#", the number of the last
61656168
accessed window is returned (where |CTRL-W_p| goes to).
61666169
If there is no previous window or it is in another tab page 0
61676170
is returned.
@@ -6532,6 +6535,8 @@ See |:verbose-cmd| for more information.
65326535
is excluded, ":{range}call" will call the function for
65336536
each line in the range, with the cursor on the start
65346537
of each line. See |function-range-example|.
6538+
The cursor is still moved to the first line of the
6539+
range, as is the case with all Ex commands.
65356540

65366541
When the [abort] argument is added, the function will
65376542
abort as soon as an error is detected.

runtime/doc/helphelp.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*helphelp.txt* For Vim version 7.3. Last change: 2012 May 18
1+
*helphelp.txt* For Vim version 7.3. Last change: 2012 Nov 28
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -194,11 +194,12 @@ command: >
194194
*E154* *E150* *E151* *E152* *E153* *E670*
195195
:helpt[ags] [++t] {dir}
196196
Generate the help tags file(s) for directory {dir}.
197-
All "*.txt" and "*.??x" files in the directory are
198-
scanned for a help tag definition in between stars.
199-
The "*.??x" files are for translated docs, they
200-
generate the "tags-??" file, see |help-translated|.
201-
The generated tags files are sorted.
197+
All "*.txt" and "*.??x" files in the directory and
198+
sub-directories are scanned for a help tag definition
199+
in between stars. The "*.??x" files are for
200+
translated docs, they generate the "tags-??" file, see
201+
|help-translated|. The generated tags files are
202+
sorted.
202203
When there are duplicates an error message is given.
203204
An existing tags file is silently overwritten.
204205
The optional "++t" argument forces adding the

runtime/doc/syntax.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*syntax.txt* For Vim version 7.3. Last change: 2012 Nov 02
1+
*syntax.txt* For Vim version 7.3. Last change: 2012 Nov 28
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1090,6 +1090,10 @@ Simpler is setting the filetype to "docbkxml" or "docbksgml": >
10901090
or: >
10911091
:set filetype=docbkxml
10921092
1093+
You can specify the DocBook version: >
1094+
:let docbk_ver = 3
1095+
When not set 4 is used.
1096+
10931097

10941098
DOSBATCH *dosbatch.vim* *ft-dosbatch-syntax*
10951099

runtime/doc/tags

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5728,6 +5728,7 @@ ft-quake-syntax syntax.txt /*ft-quake-syntax*
57285728
ft-r-indent indent.txt /*ft-r-indent*
57295729
ft-readline-syntax syntax.txt /*ft-readline-syntax*
57305730
ft-rexx-syntax syntax.txt /*ft-rexx-syntax*
5731+
ft-rst-syntax syntax.txt /*ft-rst-syntax*
57315732
ft-ruby-omni insert.txt /*ft-ruby-omni*
57325733
ft-ruby-syntax syntax.txt /*ft-ruby-syntax*
57335734
ft-scheme-syntax syntax.txt /*ft-scheme-syntax*
@@ -5872,6 +5873,7 @@ g:netrw_cygwin pi_netrw.txt /*g:netrw_cygwin*
58725873
g:netrw_dav_cmd pi_netrw.txt /*g:netrw_dav_cmd*
58735874
g:netrw_decompress pi_netrw.txt /*g:netrw_decompress*
58745875
g:netrw_dirhistmax pi_netrw.txt /*g:netrw_dirhistmax*
5876+
g:netrw_dynamic_maxfilenamelen pi_netrw.txt /*g:netrw_dynamic_maxfilenamelen*
58755877
g:netrw_errorlvl pi_netrw.txt /*g:netrw_errorlvl*
58765878
g:netrw_fastbrowse pi_netrw.txt /*g:netrw_fastbrowse*
58775879
g:netrw_fetch_cmd pi_netrw.txt /*g:netrw_fetch_cmd*
@@ -6840,6 +6842,7 @@ netrw-R pi_netrw.txt /*netrw-R*
68406842
netrw-S pi_netrw.txt /*netrw-S*
68416843
netrw-T pi_netrw.txt /*netrw-T*
68426844
netrw-U pi_netrw.txt /*netrw-U*
6845+
netrw-X pi_netrw.txt /*netrw-X*
68436846
netrw-a pi_netrw.txt /*netrw-a*
68446847
netrw-activate pi_netrw.txt /*netrw-activate*
68456848
netrw-bookmark pi_netrw.txt /*netrw-bookmark*
@@ -7426,6 +7429,7 @@ rileft.txt rileft.txt /*rileft.txt*
74267429
riscos os_risc.txt /*riscos*
74277430
rot13 change.txt /*rot13*
74287431
round() eval.txt /*round()*
7432+
rst.vim syntax.txt /*rst.vim*
74297433
rsync pi_netrw.txt /*rsync*
74307434
ruby if_ruby.txt /*ruby*
74317435
ruby-buffer if_ruby.txt /*ruby-buffer*

runtime/doc/todo.txt

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 7.3. Last change: 2012 Nov 15
1+
*todo.txt* For Vim version 7.3. Last change: 2012 Nov 28
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -45,30 +45,20 @@ GTK: problem with 'L' in 'guioptions' changing the window width.
4545

4646
Javascript file where indent gets stuck on: GalaxyMaster, 2012 May 3.
4747

48-
Patches for two problems, with explanations. (Christian Brabandt, 2012 Oct 22)
49-
5048
The CompleteDone autocommand needs some info passed to it:
5149
- The word that was selected (empty if abandoned complete)
5250
- Type of completion: tag, omnifunc, user func.
5351

54-
Unwanted file name escaping: ":echo input('file:' , '', 'file')"
55-
And use file name completion on a file with spaces. (Frederic Hardy, 2009 Mar
56-
23)
57-
Patch by Christian Brabandt, 2012 Oct 18. Update Oct 19.
58-
59-
Patch to reset did_endif. (Christian Brabandt,, 2012 Oct 23)
60-
How about a test?
61-
6252
Patch for Tab behavior with 'conceal'. (Dominique Pelle, 2012 Mar 18)
6353
Patch to test functionality of 'conceal' with tabs. (Simon Ruderich, 2012 Sep
6454
5) Update with screencol() and screenrow() functions: Sep 7.
6555

66-
Patch for integer overflow in move.c. (Dominique Pelle, 2012 Nov 6)
67-
6856
Patch for undefined integer behavior. (Dominique Pelle, 2012 Nov 4, second one)
6957

7058
Patch to have Python interface not depend on multi-byte.
7159

60+
Patch to fix justify.vim. (James McCoy, 2012 Nov 23)
61+
7262
mouse_sgr is not ordered alphabetically in :version output.
7363
Docs list mouse_urxvt as normal feature, should be big. (Hayaki Saito, 2012
7464
Aug 16)
@@ -82,6 +72,12 @@ Also remove the "rc" variable.
8272

8373
Crash with vimdiff. (Don Cruickshank, 2012 Sep 23)
8474

75+
Patch to support subdirectories for help files. (Charles Campbell, 2012 Nov
76+
21)
77+
78+
Patch for mzscheme. (Sergey Khorev, 2012 Nov 19)
79+
What about ignoring SEGV?
80+
8581
Win32: use 'guifontwide' for IME composition. (Taro Muraoka, 2012 Sep 30)
8682
Update Oct 2.
8783

@@ -98,6 +94,9 @@ Win32: When a directory name contains an exclamation mark, completion doesn't
9894
complete the contents of the directory. No escaping for the "!"? (Jan
9995
Stocker, 2012 Jan 5)
10096

97+
Problem parsing expression with function(). (Andy Wokula, 2012 Nov 22)
98+
Patch by Christian Brabandt, Nov 22. Tests in another patch, Nov 23.
99+
101100
Problem caused by patch 7.3.638: window->open does not update window
102101
correctly. Issue 91.
103102

@@ -121,6 +120,11 @@ then Sep 1, reminder Oct 14)
121120

122121
Issue 72: 'autochdir' causes problems for :vimgrep.
123122

123+
Undo problem: line not removed as expected when using setline() from Insert
124+
mode. (Israel Chauca, 2010 May 13, more in second msg)
125+
Break undo when CTRL-R = changes the text? Or save more lines?
126+
Patch by Christian Brabandt, 2012 Nov 16.
127+
124128
In the ATTENTION message about an existing swap file, mention the name of the
125129
process that is running. It might actually be some other program, e.g. after
126130
a reboot.
@@ -328,6 +332,9 @@ Oct 26)
328332

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

335+
Using "p" in Visual mode while specifying the small delete register "-
336+
overwrites the register before it is put. (Marcin Szamotulski, 2012 Nov 23)
337+
331338
With "unamedplus" in 'clipboard' pasting in Visual mode causes error for empty
332339
register. (Michael Seiwald, 2011 Jun 28) I can't reproduce it.
333340

@@ -673,10 +680,6 @@ Problem with stop directory in findfile(). (Adam Simpkins, 2009 Aug 26)
673680
Using ']' as the end of a range in a pattern requires double escaping:
674681
/[@-\\]] (Andy Wokula, 2011 Jun 28)
675682

676-
Undo problem: line not removed as expected when using setline() from Insert
677-
mode. (Israel Chauca, 2010 May 13, more in second msg)
678-
Break undo when CTRL-R = changes the text? Or save more lines?
679-
680683
Slow combination of folding and PHP syntax highlighting. Script to reproduce
681684
it. Caused by "syntax sync fromstart" in combination with patch 7.2.274.
682685
(Christian Brabandt, 2010 May 27)

runtime/doc/usr_05.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*usr_05.txt* For Vim version 7.3. Last change: 2009 Jun 04
1+
*usr_05.txt* For Vim version 7.3. Last change: 2012 Nov 20
22

33
VIM USER MANUAL - by Bram Moolenaar
44

@@ -49,8 +49,7 @@ For MS-DOS and MS-Windows you can use one of these:
4949

5050
The vimrc file can contain all the commands that you type after a colon. The
5151
most simple ones are for setting options. For example, if you want Vim to
52-
always start with the 'incsearch' option on, add this line you your vimrc
53-
file: >
52+
always start with the 'incsearch' option on, add this line your vimrc file: >
5453
5554
set incsearch
5655

runtime/filetype.vim

Lines changed: 12 additions & 3 deletions
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: 2012 Oct 05
4+
" Last Change: 2012 Nov 28
55

66
" Listen very carefully, I will say this only once
77
if exists("did_load_filetypes")
@@ -1745,7 +1745,8 @@ au BufNewFile,BufRead *.sgm,*.sgml
17451745
\ if getline(1).getline(2).getline(3).getline(4).getline(5) =~? 'linuxdoc' |
17461746
\ setf sgmllnx |
17471747
\ elseif getline(1) =~ '<!DOCTYPE.*DocBook' || getline(2) =~ '<!DOCTYPE.*DocBook' |
1748-
\ let b:docbk_type="sgml" |
1748+
\ let b:docbk_type = "sgml" |
1749+
\ let b:docbk_ver = 4 |
17491750
\ setf docbk |
17501751
\ else |
17511752
\ setf sgml |
@@ -2307,8 +2308,16 @@ func! s:FTxml()
23072308
let n = 1
23082309
while n < 100 && n < line("$")
23092310
let line = getline(n)
2310-
if line =~ '<!DOCTYPE.*DocBook'
2311+
" DocBook 4 or DocBook 5.
2312+
let is_docbook4 = line =~ '<!DOCTYPE.*DocBook'
2313+
let is_docbook5 = line =~ ' xmlns="http://docbook.org/ns/docbook"'
2314+
if is_docbook4 || is_docbook5
23112315
let b:docbk_type = "xml"
2316+
if is_docbook5
2317+
let b:docbk_ver = 5
2318+
else
2319+
let b:docbk_ver = 4
2320+
endif
23122321
setf docbk
23132322
return
23142323
endif

runtime/ftplugin/mail.vim

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
" Vim filetype plugin file
22
" Language: Mail
33
" Maintainer: Bram Moolenaar <[email protected]>
4-
" Last Change: 2009 Jun 03
4+
" Last Change: 2012 Nov 20
55

66
" Only do this when not done yet for this buffer
77
if exists("b:did_ftplugin")
88
finish
99
endif
1010
let b:did_ftplugin = 1
1111

12-
let b:undo_ftplugin = "setl modeline< tw< fo<"
12+
let b:undo_ftplugin = "setl modeline< tw< fo< comments<"
1313

1414
" Don't use modelines in e-mail messages, avoid trojan horses and nasty
1515
" "jokes" (e.g., setting 'textwidth' to 5).
@@ -23,6 +23,9 @@ endif
2323
" Set 'formatoptions' to break text lines and keep the comment leader ">".
2424
setlocal fo+=tcql
2525

26+
" Add n:> to 'comments, in case it was removed elsewhere
27+
setlocal comments+=n:>
28+
2629
" Add mappings, unless the user doesn't want this.
2730
if !exists("no_plugin_maps") && !exists("no_mail_maps")
2831
" Quote text by inserting "> "

0 commit comments

Comments
 (0)