Skip to content

Commit d042dc8

Browse files
committed
Update runtime files.
1 parent 0f6562e commit d042dc8

12 files changed

Lines changed: 165 additions & 112 deletions

File tree

runtime/doc/filetype.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*filetype.txt* For Vim version 7.4. Last change: 2013 Dec 15
1+
*filetype.txt* For Vim version 7.4. Last change: 2015 Nov 24
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -577,6 +577,10 @@ Global mapping:
577577
Local mappings:
578578
CTRL-] Jump to the manual page for the word under the cursor.
579579
CTRL-T Jump back to the previous manual page.
580+
q Same as ":quit"
581+
582+
To enable folding use this: >
583+
let g:ft_man_folding_enable = 1
580584
581585
582586
PDF *ft-pdf-plugin*

runtime/doc/fold.txt

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

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -97,9 +97,9 @@ These are the conditions with which the expression is evaluated:
9797
lowest.
9898
"=" use fold level from the previous line
9999
"a1", "a2", .. add one, two, .. to the fold level of the previous
100-
line
100+
line, use the result for the current line
101101
"s1", "s2", .. subtract one, two, .. from the fold level of the
102-
previous line
102+
previous line, use the result for the next line
103103
"<1", "<2", .. a fold with this level ends at this line
104104
">1", ">2", .. a fold with this level starts at this line
105105

@@ -122,6 +122,18 @@ method can be very slow!
122122
Try to avoid the "=", "a" and "s" return values, since Vim often has to search
123123
backwards for a line for which the fold level is defined. This can be slow.
124124

125+
An example of using "a1" and "s1": For a multi-line C comment, a line
126+
containing "/*" would return "a1" to start a fold, and a line containing "*/"
127+
would return "s1" to end the fold after that line: >
128+
if match(thisline, '/\*') >= 0
129+
return 'a1'
130+
elseif match(thisline, '\*/') >= 0
131+
return 's1'
132+
else
133+
return '='
134+
endif
135+
However, this won't work for single line comments, strings, etc.
136+
125137
|foldlevel()| can be useful to compute a fold level relative to a previous
126138
fold level. But note that foldlevel() may return -1 if the level is not known
127139
yet. And it returns the level at the start of the line, while a fold might

runtime/doc/hangulin.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*hangulin.txt* For Vim version 7.4. Last change: 2015 Nov 10
1+
*hangulin.txt* For Vim version 7.4. Last change: 2015 Nov 24
22

33

44
VIM REFERENCE MANUAL by Chi-Deok Hwang and Sung-Hyun Nam
@@ -34,7 +34,7 @@ If you set LC_ALL variable, it should be set to Korean locale also.
3434
VIM resource
3535
------------
3636
You may want to set 'encoding' and 'fileencodings'.
37-
Next are examples:
37+
Next are examples: >
3838
3939
:set encoding=euc-kr
4040
:set encoding=utf-8
@@ -54,7 +54,7 @@ If both are set, VIM_KEYBOARD has higher priority.
5454
Hangul Fonts
5555
------------
5656
If you use GTK version of GVIM, you should set 'guifont' and 'guifontwide'.
57-
For example:
57+
For example: >
5858
set guifont=Courier\ 12
5959
set guifontwide=NanumGothicCoding\ 12
6060

runtime/doc/options.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 7.4. Last change: 2015 Nov 11
1+
*options.txt* For Vim version 7.4. Last change: 2015 Nov 23
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -8075,9 +8075,9 @@ A jump table for the options with a short description can be found at |Q_op|.
80758075
% When included, save and restore the buffer list. If Vim is
80768076
started with a file name argument, the buffer list is not
80778077
restored. If Vim is started without a file name argument, the
8078-
buffer list is restored from the viminfo file. Buffers
8079-
without a file name and buffers for help files are not written
8080-
to the viminfo file.
8078+
buffer list is restored from the viminfo file. Quickfix
8079+
('buftype'), unlisted ('buflisted'), unnamed and buffers on
8080+
removable media (|viminfo-r|) are not saved.
80818081
When followed by a number, the number specifies the maximum
80828082
number of buffers that are stored. Without a number all
80838083
buffers are stored.

runtime/doc/tags

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,6 +1022,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME*
10221022
'tabstop' options.txt /*'tabstop'*
10231023
'tag' options.txt /*'tag'*
10241024
'tagbsearch' options.txt /*'tagbsearch'*
1025+
'tagcase' options.txt /*'tagcase'*
10251026
'taglength' options.txt /*'taglength'*
10261027
'tagrelative' options.txt /*'tagrelative'*
10271028
'tags' options.txt /*'tags'*
@@ -1032,6 +1033,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME*
10321033
'tbidi' options.txt /*'tbidi'*
10331034
'tbis' options.txt /*'tbis'*
10341035
'tbs' options.txt /*'tbs'*
1036+
'tc' options.txt /*'tc'*
10351037
'tenc' options.txt /*'tenc'*
10361038
'term' options.txt /*'term'*
10371039
'termbidi' options.txt /*'termbidi'*

runtime/doc/term.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*term.txt* For Vim version 7.4. Last change: 2015 Jun 25
1+
*term.txt* For Vim version 7.4. Last change: 2015 Nov 24
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -852,7 +852,7 @@ Mouse clicks can be mapped. The codes for mouse clicks are:
852852

853853
The X1 and X2 buttons refer to the extra buttons found on some mice. The
854854
'Microsoft Explorer' mouse has these buttons available to the right thumb.
855-
Currently X1 and X2 only work on Win32 environments.
855+
Currently X1 and X2 only work on Win32 and X11 environments.
856856

857857
Examples: >
858858
:noremap <MiddleMouse> <LeftMouse><MiddleMouse>

runtime/doc/todo.txt

Lines changed: 11 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 7.4. Last change: 2015 Nov 19
1+
*todo.txt* For Vim version 7.4. Last change: 2015 Nov 24
22

33

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

3737
Regexp problems:
38-
- Instructions for reproducing issue #465 (crash in nfa_regtry):
39-
https://github.com/mgedmin/vim-bug-465
40-
More info on the issue
4138
- The regexp engines are not reentrant, causing havoc when interrupted by a
4239
remote expression or something else. Move global variables onto the stack
4340
or into an allocated struct.
@@ -96,21 +93,12 @@ Also need to run update-desktop-database (Kuriyama Kazunobu, 2015 Nov 4)
9693
Access to uninitialized memory in match_backref() regexp_nda.c:4882
9794
(Dominique Pelle, 2015 Nov 6)
9895

99-
Netrw update. (Charles 2015 Oct 23)
100-
10196
Patch to use local value of 'errorformat' in :cexpr. (Christian Brabandt,
10297
2015 Oct 16) Only do this for :lexpr ?
10398

104-
Update Oracle syntax file from:
105-
https://github.com/chrisbra/vim-sqloracle-syntax/blob/master/syntax/sqloracle.vim
106-
10799
":cd C:\Windows\System32\drivers\etc*" does not work, even though the
108100
directory exists. (Sergio Gallelli, 2013 Dec 29)
109101

110-
Better changelog syntax file. (Martin Florian, 2015 Oct 25)
111-
112-
Better readline syntax file. (Raphael Bazaud, 2015 Oct 25)
113-
114102
English spell checking has an error. Updating doesn't work.
115103
(Dominique Pelle, 2015 Oct 15)
116104
Hint for new URL: Christian Brabandt, 2015 Oct 15.
@@ -137,32 +125,23 @@ Same for src/xxd/Make_cyg.mak
137125

138126
Python: ":py raw_input('prompt')" doesn't work. (Manu Hack)
139127

140-
Patch to fix memory leak. (Dominique Pelle, 2015 Nov 4)
128+
Plugin to use Vim in MANPAGER. Konfekt, PR #491
141129

142130
Using uninitialized memory. (Dominique Pelle, 2015 Nov 4)
143131

144132
Patch to recognize string slice for variable followed by colon.
145133
(Hirohito Higashi, 2015 Nov 3)
146-
147-
Patch to support hangul input with utf-8.
148-
149-
Patch to support UTF-8 for Hangul. (Shawn Y.H. Kim, 2011 May 1)
150-
Needs more work. Pinged 2012 Jan 4.
134+
Patch to .ok file is missing.
151135

152136
Patch to add debug backtrace. (Alberto Fanjul, 2015 Sep 27)
153-
Asked for :frame command.
154-
155-
vt52 terminal codes are not correct. Patch from Random, 2015 Nov 5.
137+
Needs fixes.
156138

157139
MS-Windows: When editing a file with a leading space, writing it uses the
158140
wrong name. (Aram, 2014 Nov 7) Vim 7.4.
159141

160142
Can't recognize the $ProgramFiles(x86) environment variable. Recognize it
161143
specifically? First try with the parens, then without.
162144

163-
Patch to add 'tagcase' option, whether to ignore case for tags.
164-
(Gary Johnson, 2015 Nov 6)
165-
166145
Patch to fix "." after CTRL-A in Visual block mode. (Ozaki Kiichi, 2015 Oct
167146
24)
168147

@@ -208,6 +187,9 @@ Update Aug 14.
208187

209188
Crash in :cnext on MS-Windows. (Ben Fritz, 2015 Oct 27)
210189

190+
Patch to add GUI colors to the terminal, when it supports it. (ZyX, 2013 Jan
191+
26, update 2013 Dec 14, another 2014 Nov 22)
192+
211193
Patch for problem with restoring screen on Windows. (Nobuhiro Takasaki, 2015
212194
Sep 10)
213195

@@ -229,6 +211,9 @@ ml_updatechunk() is slow when retrying for another encoding. (John Little,
229211
Patch to fix checking global option value when not using it.
230212
(Arnaud Decara, 2015 Jul 23)
231213

214+
Patch to support Python 'None' value in pyeval(). (Damien, 2015 Nov 21)
215+
Need a Vim equivalent of None and a way to test for it.
216+
232217
When 'showbreak' is set repeating a Visual operation counts the size of the
233218
'showbreak' text as part of the operation. (Axel Bender, 2015 Jul 20)
234219

@@ -283,6 +268,7 @@ Mixup of highlighting when there is a match and SpellBad. (ZyX, 2015 Jan 1)
283268

284269
Patch for drag&drop reordering of GUI tab pages reordering.
285270
(Ken Takata, 2013 Nov 22, second one, also by Masamichi Abe)
271+
Now on Git: https://gist.github.com/nocd5/165286495c782b815b94
286272

287273
Patch on Issue 72: 'autochdir' causes problems for :vimgrep.
288274

@@ -294,9 +280,6 @@ When two SIGWINCH arrive very quickly, the second one may be lost.
294280

295281
Make comments in the test Makefile silent. (Kartik Agaram, 2014 Sep 24)
296282

297-
Patch to add GUI colors to the terminal, when it supports it. (ZyX, 2013 Jan
298-
26, update 2013 Dec 14, another 2014 Nov 22)
299-
300283
Patch to improve behavior of dead keys on MS-Windows. (John Wellesz, 2015 Aug
301284
25) https://github.com/vim/vim/pull/399.diff
302285

runtime/ftplugin/changelog.vim

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
" Vim filetype plugin file
2-
" Language: generic Changelog file
3-
" Maintainer: Nikolai Weibull <[email protected]>
4-
" Latest Revision: 2014-01-10
2+
" Language: generic Changelog file
3+
" Maintainer: Martin Florian <[email protected]>
4+
" Previous Maintainer: Nikolai Weibull <[email protected]>
5+
" Latest Revision: 2015-10-25
56
" Variables:
67
" g:changelog_timeformat (deprecated: use g:changelog_dateformat instead) -
78
" description: the timeformat used in ChangeLog entries.
@@ -167,7 +168,7 @@ if &filetype == 'changelog'
167168
let cursor = stridx(line, '{cursor}')
168169
call setline(lnum, substitute(line, '{cursor}', '', ''))
169170
endif
170-
startinsert!
171+
startinsert
171172
endfunction
172173

173174
" Internal function to create a new entry in the ChangeLog.
@@ -223,7 +224,8 @@ if &filetype == 'changelog'
223224
endfunction
224225

225226
if exists(":NewChangelogEntry") != 2
226-
noremap <buffer> <silent> <Leader>o <Esc>:call <SID>new_changelog_entry('')<CR>
227+
nnoremap <buffer> <silent> <Leader>o :<C-u>call <SID>new_changelog_entry('')<CR>
228+
xnoremap <buffer> <silent> <Leader>o :<C-u>call <SID>new_changelog_entry('')<CR>
227229
command! -nargs=0 NewChangelogEntry call s:new_changelog_entry('')
228230
endif
229231

runtime/ftplugin/man.vim

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim filetype plugin file
22
" Language: man
33
" Maintainer: SungHyun Nam <[email protected]>
4-
" Last Change: 2014 Dec 29
4+
" Last Change: 2015 Nov 24
55

66
" To make the ":Man" command available before editing a manual page, source
77
" this script from your startup vimrc file.
@@ -33,6 +33,11 @@ if &filetype == "man"
3333
3434
nnoremap <buffer> <c-]> :call <SID>PreGetPage(v:count)<CR>
3535
nnoremap <buffer> <c-t> :call <SID>PopPage()<CR>
36+
nnoremap <buffer> <silent> q :q<CR>
37+
endif
38+
39+
if exists('g:ft_man_folding_enable') && (g:ft_man_folding_enable == 1)
40+
setlocal foldmethod=indent foldnestmax=1 foldenable
3641
endif
3742

3843
let b:undo_ftplugin = "setlocal iskeyword<"

runtime/syntax/man.vim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
" Maintainer: SungHyun Nam <[email protected]>
44
" Previous Maintainer: Gautam H. Mudunuri <[email protected]>
55
" Version Info:
6-
" Last Change: 2008 Sep 17
6+
" Last Change: 2015 Nov 24
77

88
" Additional highlighting by Johannes Tanzler <[email protected]>:
99
" * manSubHeading
@@ -27,8 +27,8 @@ endif
2727
syn case ignore
2828
syn match manReference "\f\+([1-9][a-z]\=)"
2929
syn match manTitle "^\f\+([0-9]\+[a-z]\=).*"
30-
syn match manSectionHeading "^[a-z][a-z ]*[a-z]$"
31-
syn match manSubHeading "^\s\{3\}[a-z][a-z ]*[a-z]$"
30+
syn match manSectionHeading "^[a-z][a-z -]*[a-z]$"
31+
syn match manSubHeading "^\s\{3\}[a-z][a-z -]*[a-z]$"
3232
syn match manOptionDesc "^\s*[+-][a-z0-9]\S*"
3333
syn match manLongOptionDesc "^\s*--[a-z0-9-]\S*"
3434
" syn match manHistory "^[a-z].*last change.*$"

0 commit comments

Comments
 (0)