Skip to content

Commit d2d246e

Browse files
committed
Update runtime files.
1 parent e330510 commit d2d246e

32 files changed

+675
-641
lines changed

runtime/doc/autocmd.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*autocmd.txt* For Vim version 7.4b. Last change: 2013 Jun 15
1+
*autocmd.txt* For Vim version 7.4b. Last change: 2013 Aug 02
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -952,7 +952,8 @@ the autocommand is executed. This is different from the command!
952952

953953
*file-pattern*
954954
The pattern is interpreted like mostly used in file names:
955-
* matches any sequence of characters
955+
* matches any sequence of characters; Unusal: includes path
956+
separators
956957
? matches any single character
957958
\? matches a '?'
958959
. matches a '.'

runtime/doc/editing.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*editing.txt* For Vim version 7.4b. Last change: 2013 Feb 07
1+
*editing.txt* For Vim version 7.4b. Last change: 2013 Aug 03
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -185,12 +185,13 @@ If you want to automatically save the changes without asking, switch on the
185185
that does not work for all commands.
186186

187187
If you want to keep the changed buffer without saving it, switch on the
188-
'hidden' option. See |hidden-buffer|.
188+
'hidden' option. See |hidden-buffer|. Some commands work like this even when
189+
'hidden' is not set, check the help for the command.
189190

190191
==============================================================================
191192
2. Editing a file *edit-a-file*
192193

193-
*:e* *:edit*
194+
*:e* *:edit* *reload*
194195
:e[dit] [++opt] [+cmd] Edit the current file. This is useful to re-edit the
195196
current file, when it has been changed outside of Vim.
196197
This fails when changes have been made to the current
@@ -199,7 +200,7 @@ If you want to keep the changed buffer without saving it, switch on the
199200
Also see |++opt| and |+cmd|.
200201
{Vi: no ++opt}
201202

202-
*:edit!*
203+
*:edit!* *discard*
203204
:e[dit]! [++opt] [+cmd]
204205
Edit the current file always. Discard any changes to
205206
the current buffer. This is useful if you want to

runtime/doc/eval.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 7.4b. Last change: 2013 Jun 11
1+
*eval.txt* For Vim version 7.4b. Last change: 2013 Aug 03
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -5884,6 +5884,9 @@ system({expr} [, {input}]) *system()* *E677*
58845884
< To make the result more system-independent, the shell output
58855885
is filtered to replace <CR> with <NL> for Macintosh, and
58865886
<CR><NL> with <NL> for DOS-like systems.
5887+
To avoid the string being truncated at a NUL, all NUL
5888+
characters are replaced with SOH (0x01).
5889+
58875890
The command executed is constructed using several options:
58885891
'shell' 'shellcmdflag' 'shellxquote' {expr} 'shellredir' {tmp} 'shellxquote'
58895892
({tmp} is an automatically generated file name).

runtime/doc/indent.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*indent.txt* For Vim version 7.4b. Last change: 2013 Jun 13
1+
*indent.txt* For Vim version 7.4b. Last change: 2013 Aug 03
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar

runtime/doc/quickfix.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*quickfix.txt* For Vim version 7.4b. Last change: 2013 Mar 07
1+
*quickfix.txt* For Vim version 7.4b. Last change: 2013 Aug 03
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -899,6 +899,8 @@ invalid.
899899
Special characters in 'errorformat' are comma and backslash. See
900900
|efm-entries| for how to deal with them. Note that a literal "%" is matched
901901
by "%%", thus it is not escaped with a backslash.
902+
Keep in mind that in the `:make` and `:grep` output all NUL characters are
903+
replaced with SOH (0x01).
902904

903905
Note: By default the difference between upper and lowercase is ignored. If
904906
you want to match case, add "\C" to the pattern |/\C|.

runtime/doc/tags

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5378,6 +5378,7 @@ dip motion.txt /*dip*
53785378
dircolors.vim syntax.txt /*dircolors.vim*
53795379
dis motion.txt /*dis*
53805380
disable-menus gui.txt /*disable-menus*
5381+
discard editing.txt /*discard*
53815382
distribute-script usr_41.txt /*distribute-script*
53825383
distribution intro.txt /*distribution*
53835384
diw motion.txt /*diw*
@@ -7508,6 +7509,7 @@ register-faq sponsor.txt /*register-faq*
75087509
register-variable eval.txt /*register-variable*
75097510
registers change.txt /*registers*
75107511
regular-expression pattern.txt /*regular-expression*
7512+
reload editing.txt /*reload*
75117513
reltime() eval.txt /*reltime()*
75127514
reltimestr() eval.txt /*reltimestr()*
75137515
remote.txt remote.txt /*remote.txt*

runtime/doc/todo.txt

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 7.4b. Last change: 2013 Jul 28
1+
*todo.txt* For Vim version 7.4b. Last change: 2013 Aug 03
22

33

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

37-
Syntax file updates. (Doug Kearns, Jul 28)
37+
PHP indent script. (John Wellesz, Aug 2)
3838

3939
Python: ":py raw_input('prompt')" doesn't work. (Manu Hack)
4040

@@ -106,9 +106,6 @@ carried over when using :global. (Christian Brabandt, 2013 Jun 19)
106106
Bug with 'cursorline' in diff mode. Line being scrolled into view gets
107107
highlighted as the cursor line. (Alessandro Ivaldi, 2013 Jun 4)
108108

109-
Bug when setting Visual area manually and 'selection' is exclusive, includes
110-
one character too much. (Ingo Karkat, 2013 Jul 26)
111-
112109
Patch to add the bufferlist() function. (Yegappan Lakshmanan, 2013 May 5)
113110
May 17: with winlist() and tabpagelist().
114111
May 19: with local variables.
@@ -211,8 +208,6 @@ Crash in autocmd that unloads buffers in a BufUnload event. (Andrew Pimlott,
211208

212209
Issue 72: 'autochdir' causes problems for :vimgrep.
213210

214-
'autochdir' causes problems for setbufvar(). (Ben Fritz, 2013 Jul 16)
215-
216211
Session file creation: 'autochdir' causes trouble. Keep it off until after
217212
loading all files.
218213

@@ -308,9 +303,6 @@ Patch to pass list to or(), and() and xor(). (Yasuhiro Matsumoto, 2012 Feb 8)
308303
Patch to improve "it" and "at" text object matching. (Christian Brabandt, 2011
309304
Nov 20)
310305

311-
Windows 7 confirm() dialog can be taller than the screen. (David Fishburn,
312-
2013 Jul 9) Does not count the height of the buttons?
313-
314306
Patch to improve GUI find/replace dialog. (Christian Brabandt, 2012 May 26)
315307
Update Jun 2.
316308

@@ -933,6 +925,9 @@ probably causes this.
933925
'scrollbind' is not respected when deleting lines or undo. (Milan Vancura,
934926
2009 Jan 16)
935927

928+
Patch to support strikethrough next to bold and italic. (Christian Brabandt,
929+
2013 Jul 30)
930+
936931
Document that default font in Athena can be set with resources:
937932
XtDefaultFont: "9x15"
938933
XtDefaultFontSet: "9x15"

runtime/doc/version7.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*version7.txt* For Vim version 7.4b. Last change: 2013 Jul 28
1+
*version7.txt* For Vim version 7.4b. Last change: 2013 Aug 02
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -10262,6 +10262,11 @@ Other:
1026210262
Lua interface now also uses userdata binded to Vim structures. (Taro
1026310263
Muraoka, Luis Carvalho)
1026410264

10265+
glob() and autocommand patterns used to work with the undocumented
10266+
"\{n,m\}" item from a regexp. "\{" is now used for a literal "{", as
10267+
this is normal in shell file patterns. Now used "\\\{n,m\}" to get
10268+
"\{n,m}" in the regexp pattern.
10269+
1026510270
Added *added-7.4*
1026610271
-----
1026710272

@@ -10349,8 +10354,7 @@ Other:
1034910354
Added |v:windowid| variable containing current window number in GUI
1035010355
Vim. (Christian J. Robinson, Lech Lorens)
1035110356

10352-
Added rxvt-unicode and >xterm-277 mouse support. (Yiding Jia, Hayaki
10353-
Saito)
10357+
Added rxvt-unicode and SGR mouse support. (Yiding Jia, Hayaki Saito)
1035410358

1035510359

1035610360
All changes in 7.4 *fixed-7.4*

runtime/filetype.vim

Lines changed: 13 additions & 23 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: 2013 Jul 21
4+
" Last Change: 2013 Aug 03
55

66
" Listen very carefully, I will say this only once
77
if exists("did_load_filetypes")
@@ -755,15 +755,15 @@ au BufNewFile,BufRead *.ged,lltxxxxx.txt setf gedcom
755755
au BufNewFile,BufRead *.git/COMMIT_EDITMSG setf gitcommit
756756
au BufNewFile,BufRead *.git/MERGE_MSG setf gitcommit
757757
au BufNewFile,BufRead *.git/config,.gitconfig,.gitmodules setf gitconfig
758-
au BufNewFile,BufRead *.git/modules/**/COMMIT_EDITMSG setf gitcommit
759-
au BufNewFile,BufRead *.git/modules/**/config setf gitconfig
758+
au BufNewFile,BufRead *.git/modules/*/COMMIT_EDITMSG setf gitcommit
759+
au BufNewFile,BufRead *.git/modules/*/config setf gitconfig
760760
au BufNewFile,BufRead */.config/git/config setf gitconfig
761761
au BufNewFile,BufRead git-rebase-todo setf gitrebase
762762
au BufNewFile,BufRead .msg.[0-9]*
763763
\ if getline(1) =~ '^From.*# This line is ignored.$' |
764764
\ setf gitsendemail |
765765
\ endif
766-
au BufNewFile,BufRead *.git/**
766+
au BufNewFile,BufRead *.git/*
767767
\ if getline(1) =~ '^\x\{40\}\>\|^ref: ' |
768768
\ setf git |
769769
\ endif
@@ -777,7 +777,7 @@ au BufNewFile,BufRead *.gp,.gprc setf gp
777777
" GPG
778778
au BufNewFile,BufRead */.gnupg/options setf gpg
779779
au BufNewFile,BufRead */.gnupg/gpg.conf setf gpg
780-
au BufNewFile,BufRead */usr/**/gnupg/options.skel setf gpg
780+
au BufNewFile,BufRead */usr/*/gnupg/options.skel setf gpg
781781

782782
" gnash(1) configuration files
783783
au BufNewFile,BufRead gnashrc,.gnashrc,gnashpluginrc,.gnashpluginrc setf gnash
@@ -928,24 +928,14 @@ au BufNewFile,BufRead indentrc setf indent
928928
au BufNewFile,BufRead *.inf,*.INF setf inform
929929

930930
" Initng
931-
au BufNewFile,BufRead */etc/initng/**/*.i,*.ii setf initng
931+
au BufNewFile,BufRead */etc/initng/*/*.i,*.ii setf initng
932932

933933
" Innovation Data Processing
934-
au BufRead,BufNewFile UPSTREAM.DAT,upstream.dat setf upstreamdat
935-
au BufRead,BufNewFile UPSTREAM.*.DAT,upstream.*.dat setf upstreamdat
936-
au BufRead,BufNewFile *.UPSTREAM.DAT,*.upstream.dat setf upstreamdat
937-
au BufRead,BufNewFile UPSTREAM.LOG,upstream.log setf upstreamlog
938-
au BufRead,BufNewFile UPSTREAM.*.LOG,upstream.*.log setf upstreamlog
939-
au BufRead,BufNewFile *.UPSTREAM.LOG,*.upstream.log setf upstreamlog
940-
au BufRead,BufNewFile UPSTREAMInstall.log,upstreaminstall.log setf upstreaminstalllog
941-
au BufRead,BufNewFile UPSTREAMInstall.*.log,upstreaminstall.*.log setf upstreaminstalllog
942-
au BufRead,BufNewFile *.UPSTREAMInstall.log,*.upstreaminstall.log setf upstreaminstalllog
943-
au BufRead,BufNewFile USSERVER.LOG,usserver.log setf usserverlog
944-
au BufRead,BufNewFile USSERVER.*.LOG,usserver.*.log setf usserverlog
945-
au BufRead,BufNewFile *.USSERVER.LOG,*.usserver.log setf usserverlog
946-
au BufRead,BufNewFile USW2KAgt.log,usw2kagt.log setf usw2kagtlog
947-
au BufRead,BufNewFile USW2KAgt.*.log,usw2kagt.*.log setf usw2kagtlog
948-
au BufRead,BufNewFile *.USW2KAgt.log,*.usw2kagt.log setf usw2kagtlog
934+
au BufRead,BufNewFile upstream.dat\c,upstream.*.dat\c,*.upstream.dat\c setf upstreamdat
935+
au BufRead,BufNewFile upstream.log\c,upstream.*.log\c,*.upstream.log\c setf upstreamlog
936+
au BufRead,BufNewFile upstreaminstall.log\c,upstreaminstall.*.log\c,*.upstreaminstall.log\c setf upstreaminstalllog
937+
au BufRead,BufNewFile usserver.log\c,usserver.*.log\c,*.usserver.log\c setf usserverlog
938+
au BufRead,BufNewFile usw2kagt.log\c,usw2kagt.*.log\c,*.usw2kagt.log\c setf usw2kagtlog
949939

950940
" Ipfilter
951941
au BufNewFile,BufRead ipf.conf,ipf6.conf,ipf.rules setf ipfilter
@@ -1092,7 +1082,7 @@ au BufNewFile,BufRead *.m4
10921082
au BufNewFile,BufRead *.mgp setf mgp
10931083

10941084
" Mail (for Elm, trn, mutt, muttng, rn, slrn)
1095-
au BufNewFile,BufRead snd.\d\+,.letter,.letter.\d\+,.followup,.article,.article.\d\+,pico.\d\+,mutt{ng,}-*-\w\+,mutt[[:alnum:]_-]\{6\},ae\d\+.txt,/tmp/SLRN[0-9A-Z.]\+,*.eml setf mail
1085+
au BufNewFile,BufRead snd.\d\+,.letter,.letter.\d\+,.followup,.article,.article.\d\+,pico.\d\+,mutt{ng,}-*-\w\+,mutt[[:alnum:]_-]\\\{6\},ae\d\+.txt,/tmp/SLRN[0-9A-Z.]\+,*.eml setf mail
10961086

10971087
" Mail aliases
10981088
au BufNewFile,BufRead */etc/mail/aliases,*/etc/aliases setf mailaliases
@@ -2561,7 +2551,7 @@ au BufNewFile,BufRead [mM]akefile* call s:StarSetf('make')
25612551
au BufNewFile,BufRead [rR]akefile* call s:StarSetf('ruby')
25622552

25632553
" Mail (also matches muttrc.vim, so this is below the other checks)
2564-
au BufNewFile,BufRead mutt[[:alnum:]._-]\{6\} setf mail
2554+
au BufNewFile,BufRead mutt[[:alnum:]._-]\\\{6\} setf mail
25652555

25662556
" Modconf
25672557
au BufNewFile,BufRead */etc/modutils/*

runtime/ftplugin/perl.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
" Maintainer: vim-perl <[email protected]>
44
" Homepage: http://github.com/vim-perl/vim-perl
55
" Bugs/requests: http://github.com/vim-perl/vim-perl/issues
6-
" Last Change: 2013 Jul 24
6+
" Last Change: 2013-07-21
77

88
if exists("b:did_ftplugin") | finish | endif
99
let b:did_ftplugin = 1

0 commit comments

Comments
 (0)