Skip to content

Commit a0cfe22

Browse files
committed
Update runtime files.
1 parent 2569cce commit a0cfe22

6 files changed

Lines changed: 44 additions & 37 deletions

File tree

runtime/doc/editing.txt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*editing.txt* For Vim version 7.4. Last change: 2014 Nov 12
1+
*editing.txt* For Vim version 7.4. Last change: 2014 Nov 19
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1080,9 +1080,12 @@ The names can be in upper- or lowercase.
10801080
the last file in the argument list has not been
10811081
edited. See |:confirm| and 'confirm'. {not in Vi}
10821082

1083-
:q[uit]! Quit without writing, also when visible buffers have
1084-
changes. Does not exit when there are changed hidden
1085-
buffers. Use ":qall!" to exit always.
1083+
:q[uit]! Quit without writing, also when currently visible
1084+
buffers have changes. Does not exit when this is the
1085+
last window and there are is a changed hidden buffer.
1086+
In this case, the first changed hidden buffer becomes
1087+
the current buffer.
1088+
Use ":qall!" to exit always.
10861089

10871090
:cq[uit] Quit always, without writing, and return an error
10881091
code. See |:cq|. Used for Manx's QuickFix mode (see

runtime/doc/eval.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 7.4. Last change: 2014 Nov 05
1+
*eval.txt* For Vim version 7.4. Last change: 2014 Nov 15
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1755,8 +1755,8 @@ count( {list}, {expr} [, {ic} [, {start}]])
17551755
Number count how many {expr} are in {list}
17561756
cscope_connection( [{num} , {dbpath} [, {prepend}]])
17571757
Number checks existence of cscope connection
1758-
cursor( {lnum}, {col} [, {coladd}])
1759-
Number move cursor to {lnum}, {col}, {coladd}
1758+
cursor( {lnum}, {col} [, {off}])
1759+
Number move cursor to {lnum}, {col}, {off}
17601760
cursor( {list}) Number move cursor to position in {list}
17611761
deepcopy( {expr} [, {noref}]) any make a full copy of {expr}
17621762
delete( {fname}) Number delete file {fname}
@@ -2623,6 +2623,7 @@ cursor({list})
26232623
If {col} is zero, the cursor will stay in the current column.
26242624
If {curswant} is given it is used to set the preferred column
26252625
for vertical movement. Otherwise {col} is used.
2626+
26262627
When 'virtualedit' is used {off} specifies the offset in
26272628
screen columns from the start of the character. E.g., a
26282629
position within a <Tab> or after the last character.
@@ -4851,7 +4852,7 @@ readfile({fname} [, {binary} [, {max}]])
48514852
separated with CR will result in a single long line (unless a
48524853
NL appears somewhere).
48534854
All NUL characters are replaced with a NL character.
4854-
When {binary/append} is contains "b" binary mode is used:
4855+
When {binary/append} contains "b" binary mode is used:
48554856
- When the last line ends in a NL an extra empty list item is
48564857
added.
48574858
- No CR characters are removed.

runtime/doc/quickref.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*quickref.txt* For Vim version 7.4. Last change: 2014 Oct 22
1+
*quickref.txt* For Vim version 7.4. Last change: 2014 Nov 19
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -764,6 +764,7 @@ Short explanation of each option: *option-list*
764764
'keywordprg' 'kp' program to use for the "K" command
765765
'langmap' 'lmap' alphabetic characters for other language mode
766766
'langmenu' 'lm' language to be used for the menus
767+
'langnoremap' 'lnr' do not apply 'langmap' to mapped characters
767768
'laststatus' 'ls' tells when last window has status lines
768769
'lazyredraw' 'lz' don't redraw while executing macros
769770
'linebreak' 'lbr' wrap long lines at a blank

runtime/doc/todo.txt

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 7.4. Last change: 2014 Nov 13
1+
*todo.txt* For Vim version 7.4. Last change: 2014 Nov 19
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-
Add langnoremap in quickref.txt and optwin.vim.
38-
3937
Regexp problems:
4038
- The NFA engine does not implement the time limit passed to
4139
nfa_regexec_multi()
@@ -77,8 +75,6 @@ Patch by Marcin Szamotulski to add count to :close (2014 Aug 10, update Aug
7775
Doesn't look right, asked for updates.
7876
Update 2014 Nov 8. Replied with suggestions.
7977

80-
C macro with number highlighted wrong. (Dominique Pelle, 2014 Oct 23)
81-
8278
The entries added by matchaddpos() are returned by getmatches() but can't be
8379
set with setmatches(). (lcd47, 2014 Jun 29)
8480

@@ -88,14 +84,19 @@ Problem using ":try" inside ":execute". (ZyX, 2013 Sep 15)
8884

8985
Python: ":py raw_input('prompt')" doesn't work. (Manu Hack)
9086

91-
Patch to fix issue 203. (Christian Brabandt, 2014 Oct 8)
92-
9387
Patch to fix issue 78. (Christian Brabandt, 2014 Oct 8)
9488

9589
Patch to fix leak in map() with error. (Christian Brabandt, 2014 Oct 11)
9690

9791
Patch to fix incsearch for "2/pattern/e".
9892

93+
Patch to fix memory leak in :hardcopy. (Christian Brabandt, 2014 Nov 16)
94+
95+
Patch to fix warnings in if_ruby.c. (Ken Takata, 2014 Nov 17)
96+
97+
Patch to make test 63 pass when in a B&W terminal. (Christian Brabandt, 2014
98+
Nov 15) Other patch (better) on Nov 17.
99+
99100
Change behavior of v:hlsearch? Patch from Christian, 2014 Oct 22.
100101

101102
MS-Windows: When editing a file with a leading space, writing it uses the
@@ -106,14 +107,16 @@ patch to remove FEAT_OSFILETYPE from fileio.c. (Christian, 2014 Nov 12)
106107
Value returned by virtcol() changes depending on how lines wrap. This is
107108
inconsistent with the documentation.
108109

109-
Fix for wrong formatting if 'linebreak' is set. (Christian Brabandt, 2014 Nov
110-
12)
110+
Patch to fix relatie numbers. (Christian Brabandt, 2014 Nov 17)
111+
112+
Patch to fix wrong formatting if 'linebreak' is set. (Christian Brabandt, 2014
113+
Nov 12)
111114

112115
Patch to support hex values for setting option value.
113116
(Zyx, 2015 Nov 6)
114117

115-
On MS-Windows running tests with Mercurial has problems when the input files
116-
are changed. (Ken Takata, Taro Muraoka, 2014 Sep 25)
118+
On MS-Windows running tests with Mercurial has problems when the fileformat of
119+
the input files are changed. (Ken Takata, Taro Muraoka, 2014 Sep 25)
117120
Update Nov 5.
118121

119122
MS-Windows: Crash opening very long file name starting with "\\".
@@ -140,6 +143,10 @@ lines. (Marco Hinz, 2014 Nov 2)
140143

141144
Adding "~" to 'cdpath' doesn't work for completion? (Davido, 2013 Aug 19)
142145

146+
Plugins need to make a lot of effort, lots of mappings, to know what happened
147+
before pressing the key that triggers a plugin action. How about keeping the
148+
last N pressed keys, so that they do not need to be mapped?
149+
143150
Can assign to s:type when a function s:type has been defined.
144151
Also the other way around: define a function while a variable with that name
145152
was already defined.
@@ -152,6 +159,10 @@ Patch for building a 32bit Vim with 64bit MingW compiler.
152159

153160
Delete old code in os_msdos.c, mch_FullName().
154161

162+
Redo only remembers the last change. Could use "{count}g." to redo an older
163+
change. How does the user know which change? At least have a way to list
164+
them: ":repeats".
165+
155166
Using "." to repeat an Ex command puts that command in history. Probably
156167
should not happen. If the command is the result of a mapping it's not put in
157168
history either. (Jacob Niehus, 2014 Nov 2)
@@ -289,12 +300,8 @@ Patch to add v:completed_item. (Shougo Matsu, 2013 Nov 29).
289300

290301
Patch to get MSVC version in a nicer way. (Ken Takata, 2014 Jul 24)
291302

292-
Patch to make test 100 work on MS-Windows. (Taro Muraoka, 2013 Dec 12)
293-
294303
Patch to define macros for hardcoded values. (Elias Diem, 2013 Dec 14)
295304

296-
Perl: support for Activestate perl 5.18: Issue 170.
297-
298305
Several syntax file match "^\s*" which may get underlined if that's in the
299306
highlight group. Add a "\zs" after it?
300307

@@ -439,9 +446,6 @@ Update by Daniel Hahler, 2014 Jul 4, Aug 14, Oct 14, Oct 15.
439446

440447
Patch to make fold updates much faster. (Christian Brabandt, 2012 Dec)
441448

442-
MS-Windows: Patch to make tests copy files to avoid changing the fileformat of
443-
the files under version control. (Taro Muraoka, 2013 Jul 5)
444-
445449
Issue 54: document behavior of -complete, also expands arg.
446450

447451
- Add regex for 'paragraphs' and 'sections': 'parare' and 'sectre'. Combine
@@ -1560,8 +1564,6 @@ Changes for Win32 makefile. (Mike Williams, 2007 Jan 22, Alexei Alexandrov,
15601564
Win32: Can't complete shell command names. Why is setting xp_context in
15611565
set_one_cmd_context() inside #ifndef BACKSLASH_IN_FILENAME?
15621566

1563-
Win32: Patch for convert_filterW(). (Taro Muraoka, 2007 Mar 2)
1564-
15651567
Win32: Patch for cscope external command. (Mike Williams, 2007 Aug 7)
15661568

15671569
Win32: XPM support only works with path without spaces. Patch by Mathias

runtime/optwin.vim

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" These commands create the option window.
22
"
33
" Maintainer: Bram Moolenaar <Bram@vim.org>
4-
" Last Change: 2014 Oct 09
4+
" Last Change: 2014 Nov 19
55

66
" If there already is an option window, jump to that one.
77
if bufwinnr("option-window") > 0
@@ -149,7 +149,7 @@ setlocal ts=15 tw=0 noro buftype=nofile
149149
call append(0, '" Each "set" line shows the current value of an option (on the left).')
150150
call append(1, '" Hit <CR> on a "set" line to execute it.')
151151
call append(2, '" A boolean option will be toggled.')
152-
call append(3, '" For other options you can edit the value.')
152+
call append(3, '" For other options you can edit the value before hitting <CR>.')
153153
call append(4, '" Hit <CR> on a help line to open a help window on this option.')
154154
call append(5, '" Hit <CR> on an index line to jump there.')
155155
call append(6, '" Hit <Space> on a "set" line to refresh it.')
@@ -1194,8 +1194,10 @@ if has("keymap")
11941194
call <SID>OptionL("kmp")
11951195
endif
11961196
if has("langmap")
1197-
call append("$", "langmap\ttranslate characters for Normal mode")
1197+
call append("$", "langmap\tlist of characters that are translated in Normal mode")
11981198
call <SID>OptionG("lmap", &lmap)
1199+
call append("$", "langnoremap\tdon't apply 'langmap' to mapped characters")
1200+
call <SID>BinOptionG("lnr", &lnr)
11991201
endif
12001202
if has("xim")
12011203
call append("$", "imdisable\twhen set never use IM; overrules following IM options")

runtime/syntax/c.vim

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim syntax file
22
" Language: C
33
" Maintainer: Bram Moolenaar <Bram@vim.org>
4-
" Last Change: 2014 Sep 23
4+
" Last Change: 2014 Nov 13
55

66
" Quit when a (custom) syntax file was already loaded
77
if exists("b:current_syntax")
@@ -61,10 +61,9 @@ else
6161
syn region cCppString start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell
6262
endif
6363

64-
syn region cCppOut2 contained start="0" end="^\s*\(%:\|#\)\s*\(endif\>\|else\>\|elif\>\)" contains=cSpaceError,cCppSkip
6564
syn region cCppSkip contained start="^\s*\(%:\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(%:\|#\)\s*endif\>" contains=cSpaceError,cCppSkip
6665

67-
syn cluster cStringGroup contains=cCppString,cCppOut2,cCppSkip
66+
syn cluster cStringGroup contains=cCppString,cCppSkip
6867

6968
syn match cCharacter "L\='[^\\]'"
7069
syn match cCharacter "L'[^']*'" contains=cSpecial
@@ -462,8 +461,7 @@ hi def link cTodo Todo
462461
hi def link cBadContinuation Error
463462
hi def link cCppOutSkip cCppOutIf2
464463
hi def link cCppInElse2 cCppOutIf2
465-
hi def link cCppOutIf2 cCppOut2 " Old syntax group for #if 0 body
466-
hi def link cCppOut2 cCppOut " Old syntax group for #if of #if 0
464+
hi def link cCppOutIf2 cCppOut
467465
hi def link cCppOut Comment
468466

469467
let b:current_syntax = "c"

0 commit comments

Comments
 (0)