Skip to content

Commit 7571d55

Browse files
committed
Updated runtime files.
1 parent 1381d79 commit 7571d55

11 files changed

Lines changed: 178 additions & 674 deletions

File tree

runtime/doc/eval.txt

Lines changed: 40 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 7.4. Last change: 2016 Aug 16
1+
*eval.txt* For Vim version 7.4. Last change: 2016 Aug 18
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -43,7 +43,7 @@ There are nine types of variables:
4343
Number A 32 or 64 bit signed number. |expr-number| *Number*
4444
64-bit Numbers are available only when compiled with the
4545
|+num64| feature.
46-
Examples: -123 0x10 0177
46+
Examples: -123 0x10 0177 0b1011
4747

4848
Float A floating point number. |floating-point-format| *Float*
4949
{only when compiled with the |+float| feature}
@@ -1038,9 +1038,10 @@ When expr8 is a |Funcref| type variable, invoke the function it refers to.
10381038
number
10391039
------
10401040
number number constant *expr-number*
1041-
*hex-number* *octal-number*
1041+
*hex-number* *octal-number* *binary-number*
10421042

1043-
Decimal, Hexadecimal (starting with 0x or 0X), or Octal (starting with 0).
1043+
Decimal, Hexadecimal (starting with 0x or 0X), Binary (starting with 0b or 0B)
1044+
and Octal (starting with 0).
10441045

10451046
*floating-point-format*
10461047
Floating point numbers can be written in two forms:
@@ -1446,8 +1447,8 @@ v:beval_winnr The number of the window, over which the mouse pointer is. Only
14461447
window gets a number).
14471448

14481449
*v:beval_winid* *beval_winid-variable*
1449-
v:beval_winid The window ID of the window, over which the mouse pointer is.
1450-
Otherwise like v:beval_winnr.
1450+
v:beval_winid The |window-ID| of the window, over which the mouse pointer
1451+
is. Otherwise like v:beval_winnr.
14511452

14521453
*v:char* *char-variable*
14531454
v:char Argument for evaluating 'formatexpr' and used for the typed
@@ -1945,7 +1946,8 @@ v:windowid When any X11 based GUI is running or when running in a
19451946
When an MS-Windows GUI is running this will be set to the
19461947
window handle.
19471948
Otherwise the value is zero.
1948-
Note: for windows inside Vim use |winnr()| or |win_getid()|.
1949+
Note: for windows inside Vim use |winnr()| or |win_getid()|,
1950+
see |window-ID|.
19491951

19501952
==============================================================================
19511953
4. Builtin Functions *functions*
@@ -2462,7 +2464,7 @@ arglistid([{winnr} [, {tabnr}]])
24622464
With {winnr} only use this window in the current tab page.
24632465
With {winnr} and {tabnr} use the window in the specified tab
24642466
page.
2465-
{winnr} can be the window number or the window ID.
2467+
{winnr} can be the window number or the |window-ID|.
24662468

24672469
*argv()*
24682470
argv([{nr}]) The result is the {nr}th file in the argument list of the
@@ -2708,7 +2710,7 @@ bufnr({expr} [, {create}])
27082710
Obsolete name for bufnr("$"): last_buffer_nr().
27092711

27102712
bufwinid({expr}) *bufwinid()*
2711-
The result is a Number, which is the window ID of the first
2713+
The result is a Number, which is the |window-ID| of the first
27122714
window associated with buffer {expr}. For the use of {expr},
27132715
see |bufname()| above. If buffer {expr} doesn't exist or
27142716
there is no such window, -1 is returned. Example: >
@@ -3116,7 +3118,7 @@ ch_setoptions({handle}, {options}) *ch_setoptions()*
31163118
lost.
31173119

31183120
These options cannot be changed:
3119-
"waittime" only applies to "ch_open()|
3121+
"waittime" only applies to |ch_open()|
31203122

31213123
ch_status({handle}) *ch_status()*
31223124
Return the status of {handle}:
@@ -4020,7 +4022,7 @@ getbufinfo([{dict}])
40204022
lnum line number
40214023
name sign name
40224024
variables dictionary of buffer local variables.
4023-
windows list of window IDs with this buffer
4025+
windows list of |window-ID|s with this buffer
40244026

40254027
Examples: >
40264028
for buf in getbufinfo()
@@ -4283,7 +4285,7 @@ getcwd([{winnr} [, {tabnr}]])
42834285
in the current tab page.
42844286
With {winnr} and {tabnr} return the local current directory of
42854287
the window in the specified tab page.
4286-
{winnr} can be the window number or the window ID.
4288+
{winnr} can be the window number or the |window-ID|.
42874289
Return an empty string if the arguments are invalid.
42884290

42894291
getfsize({fname}) *getfsize()*
@@ -4380,7 +4382,7 @@ getline({lnum} [, {end}])
43804382

43814383
getloclist({nr}[, {what}]) *getloclist()*
43824384
Returns a list with all the entries in the location list for
4383-
window {nr}. {nr} can be the window number or the window ID.
4385+
window {nr}. {nr} can be the window number or the |window-ID|.
43844386
When {nr} is zero the current window is used.
43854387

43864388
For a location list window, the displayed location list is
@@ -4456,7 +4458,7 @@ getqflist([{what}]) *getqflist()*
44564458
type type of the error, 'E', '1', etc.
44574459
valid |TRUE|: recognized error message
44584460

4459-
When there is no error list or it's empty an empty list is
4461+
When there is no error list or it's empty, an empty list is
44604462
returned. Quickfix list entries with non-existing buffer
44614463
number are returned with "bufnr" set to zero.
44624464

@@ -4471,8 +4473,8 @@ getqflist([{what}]) *getqflist()*
44714473
returns only the items listed in {what} as a dictionary. The
44724474
following string items are supported in {what}:
44734475
nr get information for this quickfix list
4474-
title get list title
4475-
winid get window id (if opened)
4476+
title get the list title
4477+
winid get the |window-ID| (if opened)
44764478
all all of the above quickfix properties
44774479
Non-string items in {what} are ignored.
44784480
If "nr" is not present then the current quickfix list is used.
@@ -4482,7 +4484,7 @@ getqflist([{what}]) *getqflist()*
44824484
The returned dictionary contains the following entries:
44834485
nr quickfix list number
44844486
title quickfix list title text
4485-
winid quickfix window id (if opened)
4487+
winid quickfix |window-ID| (if opened)
44864488

44874489
Examples: >
44884490
:echo getqflist({'all': 1})
@@ -4529,9 +4531,9 @@ gettabinfo([{arg}]) *gettabinfo()*
45294531
empty List is returned.
45304532

45314533
Each List item is a Dictionary with the following entries:
4532-
nr tab page number.
4534+
tabnr tab page number.
45334535
variables dictionary of tabpage local variables.
4534-
windows List of window IDs in the tag page.
4536+
windows List of |window-ID|s in the tag page.
45354537

45364538
gettabvar({tabnr}, {varname} [, {def}]) *gettabvar()*
45374539
Get the value of a tab-local variable {varname} in tab page
@@ -4553,7 +4555,7 @@ gettabwinvar({tabnr}, {winnr}, {varname} [, {def}]) *gettabwinvar()*
45534555
Note that {varname} must be the name without "w:".
45544556
Tabs are numbered starting with one. For the current tabpage
45554557
use |getwinvar()|.
4556-
{winnr} can be the window number or the window ID.
4558+
{winnr} can be the window number or the |window-ID|.
45574559
When {winnr} is zero the current window is used.
45584560
This also works for a global option, buffer-local option and
45594561
window-local option, but it doesn't work for a global variable
@@ -4581,22 +4583,22 @@ getwininfo([{winid}]) *getwininfo()*
45814583
is returned. If the window does not exist the result is an
45824584
empty list.
45834585

4584-
Without an information about all the windows in all the tab
4585-
pages is returned.
4586+
Without {winid} information about all the windows in all the
4587+
tab pages is returned.
45864588

45874589
Each List item is a Dictionary with the following entries:
4588-
bufnum number of buffer in the window
4590+
bufnr number of buffer in the window
45894591
height window height
45904592
loclist 1 if showing a location list
45914593
{only with the +quickfix feature}
4592-
nr window number
45934594
options dictionary of window local options
45944595
quickfix 1 if quickfix or location list window
45954596
{only with the +quickfix feature}
4596-
tpnr tab page number
4597+
tabnr tab page number
45974598
variables dictionary of window local variables
45984599
width window width
4599-
winid window ID
4600+
winid |window-ID|
4601+
winnr window number
46004602

46014603
getwinvar({winnr}, {varname} [, {def}]) *getwinvar()*
46024604
Like |gettabwinvar()| for the current tabpage.
@@ -4704,7 +4706,7 @@ haslocaldir([{winnr} [, {tabnr}]]) *haslocaldir()*
47044706
With {winnr} use this window in the current tab page.
47054707
With {winnr} and {tabnr} use the window in the specified tab
47064708
page.
4707-
{winnr} can be the window number or the window ID.
4709+
{winnr} can be the window number or the |window-ID|.
47084710
Return 0 if the arguments are invalid.
47094711

47104712
hasmapto({what} [, {mode} [, {abbr}]]) *hasmapto()*
@@ -5994,6 +5996,9 @@ printf({fmt}, {expr1} ...) *printf()*
59945996
s The text of the String argument is used. If a
59955997
precision is specified, no more bytes than the number
59965998
specified are used.
5999+
If the argument is not a String type, it is
6000+
automatically converted to text with the same format
6001+
as ":echo".
59976002
*printf-S*
59986003
S The text of the String argument is used. If a
59996004
precision is specified, no more display cells than the
@@ -6671,7 +6676,7 @@ setline({lnum}, {text}) *setline()*
66716676

66726677
setloclist({nr}, {list}[, {action}[, {what}]]) *setloclist()*
66736678
Create or replace or add to the location list for window {nr}.
6674-
{nr} can be the window number or the window ID.
6679+
{nr} can be the window number or the |window-ID|.
66756680
When {nr} is zero the current window is used.
66766681

66776682
For a location list window, the displayed location list is
@@ -6859,7 +6864,7 @@ settabwinvar({tabnr}, {winnr}, {varname}, {val}) *settabwinvar()*
68596864
{val}.
68606865
Tabs are numbered starting with one. For the current tabpage
68616866
use |setwinvar()|.
6862-
{winnr} can be the window number or the window ID.
6867+
{winnr} can be the window number or the |window-ID|.
68636868
When {winnr} is zero the current window is used.
68646869
This also works for a global or local buffer option, but it
68656870
doesn't work for a global or local buffer variable.
@@ -7967,11 +7972,11 @@ wildmenumode() *wildmenumode()*
79677972

79687973

79697974
win_findbuf({bufnr}) *win_findbuf()*
7970-
Returns a list with window IDs for windows that contain buffer
7971-
{bufnr}. When there is none the list is empty.
7975+
Returns a list with |window-ID|s for windows that contain
7976+
buffer {bufnr}. When there is none the list is empty.
79727977

79737978
win_getid([{win} [, {tab}]]) *win_getid()*
7974-
Get the window ID for the specified window.
7979+
Get the |window-ID| for the specified window.
79757980
When {win} is missing use the current window.
79767981
With {win} this is the window number. The top window has
79777982
number 1.
@@ -7996,7 +8001,7 @@ win_id2win({expr}) *win_id2win()*
79968001
*winbufnr()*
79978002
winbufnr({nr}) The result is a Number, which is the number of the buffer
79988003
associated with window {nr}. {nr} can be the window number or
7999-
the window ID.
8004+
the |window-ID|.
80008005
When {nr} is zero, the number of the buffer in the current
80018006
window is returned.
80028007
When window {nr} doesn't exist, -1 is returned.
@@ -8010,7 +8015,7 @@ wincol() The result is a Number, which is the virtual column of the
80108015

80118016
winheight({nr}) *winheight()*
80128017
The result is a Number, which is the height of window {nr}.
8013-
{nr} can be the window number or the window ID.
8018+
{nr} can be the window number or the |window-ID|.
80148019
When {nr} is zero, the height of the current window is
80158020
returned. When window {nr} doesn't exist, -1 is returned.
80168021
An existing window always has a height of zero or more.
@@ -8090,7 +8095,7 @@ winsaveview() Returns a |Dictionary| that contains information to restore
80908095

80918096
winwidth({nr}) *winwidth()*
80928097
The result is a Number, which is the width of window {nr}.
8093-
{nr} can be the window number or the window ID.
8098+
{nr} can be the window number or the |window-ID|.
80948099
When {nr} is zero, the width of the current window is
80958100
returned. When window {nr} doesn't exist, -1 is returned.
80968101
An existing window always has a width of zero or more.

runtime/doc/sign.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*sign.txt* For Vim version 7.4. Last change: 2016 Aug 12
1+
*sign.txt* For Vim version 7.4. Last change: 2016 Aug 17
22

33

44
VIM REFERENCE MANUAL by Gordon Prieur
@@ -197,7 +197,9 @@ JUMPING TO A SIGN *:sign-jump* *E157*
197197
If the file isn't displayed in window and the current file can
198198
not be |abandon|ed this fails.
199199

200-
:sign jump {id} buffer={nr}
201-
Same, but use buffer {nr}.
200+
:sign jump {id} buffer={nr} *E934*
201+
Same, but use buffer {nr}. This fails if buffer {nr} does not
202+
have a name.
203+
202204

203205
vim:tw=78:ts=8:ft=help:norl:

runtime/doc/tags

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4474,6 +4474,7 @@ E930 eval.txt /*E930*
44744474
E931 message.txt /*E931*
44754475
E932 eval.txt /*E932*
44764476
E933 eval.txt /*E933*
4477+
E934 sign.txt /*E934*
44774478
E94 windows.txt /*E94*
44784479
E95 message.txt /*E95*
44794480
E96 diff.txt /*E96*
@@ -5069,6 +5070,7 @@ beval_lnum-variable eval.txt /*beval_lnum-variable*
50695070
beval_text-variable eval.txt /*beval_text-variable*
50705071
beval_winid-variable eval.txt /*beval_winid-variable*
50715072
beval_winnr-variable eval.txt /*beval_winnr-variable*
5073+
binary-number eval.txt /*binary-number*
50725074
bitwise-function usr_41.txt /*bitwise-function*
50735075
blockwise-examples visual.txt /*blockwise-examples*
50745076
blockwise-operators visual.txt /*blockwise-operators*
@@ -7793,10 +7795,12 @@ print-options print.txt /*print-options*
77937795
print.txt print.txt /*print.txt*
77947796
printf() eval.txt /*printf()*
77957797
printf-% eval.txt /*printf-%*
7798+
printf-B eval.txt /*printf-B*
77967799
printf-E eval.txt /*printf-E*
77977800
printf-G eval.txt /*printf-G*
77987801
printf-S eval.txt /*printf-S*
77997802
printf-X eval.txt /*printf-X*
7803+
printf-b eval.txt /*printf-b*
78007804
printf-c eval.txt /*printf-c*
78017805
printf-d eval.txt /*printf-d*
78027806
printf-e eval.txt /*printf-e*
@@ -9202,6 +9206,7 @@ win_id2win() eval.txt /*win_id2win()*
92029206
winbufnr() eval.txt /*winbufnr()*
92039207
wincol() eval.txt /*wincol()*
92049208
window windows.txt /*window*
9209+
window-ID windows.txt /*window-ID*
92059210
window-contents intro.txt /*window-contents*
92069211
window-exit editing.txt /*window-exit*
92079212
window-functions usr_41.txt /*window-functions*

runtime/doc/todo.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 7.4. Last change: 2016 Aug 16
1+
*todo.txt* For Vim version 7.4. Last change: 2016 Aug 18
22

33

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

37+
Rename 'langnoremap' to 'langremap' and invert the value?
38+
3739
+channel:
40+
- Check that raw mode does NL-NUL conversion.
41+
- Implement |job-term| ?
3842
- Channel test fails with Motif. Sometimes kills the X11 server.
3943
- When a message in the queue but there is no callback, drop it after a while?
4044
Add timestamp to queued messages and callbacks with ID, remove after a
@@ -99,12 +103,17 @@ Regexp problems:
99103
- Search for /\%d0\+ causes error E363 in a file with consecutive NUL
100104
characters. (Christian Brabandt, 2016 Jun 7)
101105

106+
getbufinfo() may return a lot of data. Select what to return?
107+
remove variables, does that help?
108+
102109
json_encode(): should convert to utf-8. (Nikolai Pavlov, 2016 Jan 23)
103110
What if there is an invalid character?
104111

105112
Should json_encode()/json_decode() restrict recursiveness?
106113
Or avoid recursiveness.
107114

115+
Error in test_startup_utf8 on Solaris. (Danek Duvall, 2016 Aug 17)
116+
108117
Once .exe with updated installer is available: Add remark to download page
109118
about /S and /D options (Ken Takata, 2016 Apr 13)
110119
Or point to nightly builds: https://github.com/vim/vim-win32-installer/releases
@@ -133,6 +142,8 @@ Problem with whitespace in errorformat. (Gerd Wachsmuth, 2016 May 15, #807)
133142

134143
Undo problem: "g-" doesn't go back, gets stuck. (Björn Linse, 2016 Jul 18)
135144

145+
cmap using execute() has side effects. (Killthemule, 2016 Aug 17, #983)
146+
136147
Syntax highlighting for messages with RFC3339 timestamp (#946)
137148
Did maintainer reply?
138149

@@ -146,27 +157,16 @@ Jul 25, #948)
146157

147158
'hlsearch' interferes with a Conceal match. (Rom Grk, 2016 Aug 9)
148159

149-
's$^$\=capture("s/^//gn")' locks Vim in sandbox mode (#950)
150-
Patch by Christian Brabandt, 2016 Jul 27.
151-
152160
MS-Windows: use WS_HIDE instead of SW_SHOWMINNOACTIVE in os_win32.c?
153161
Otherwise task flickers in taskbar.
154162

155163
Should make ":@r" handle line continuation. (Cesar Romani, 2016 Jun 26)
156164
Also for ":@.".
157165

158-
Patch to make printf() convert to string for %s items. (Ken Takata, 2016 Aug
159-
1)
160-
161-
Patch to add %b to printf(). (Ozaki Kiichi, 2016 Aug 5)
162-
163166
Repeating 'opfunc' in a function only works once. (Tarmean, 2016 Jul 15, #925)
164167

165168
Patch on issue #728 by Christian Brabandt, 2016 Apr 7. Update with test: Apr 8.
166169
Explanation Apr 12.
167-
Might be related to:
168-
Test 44 fails when [[=A=]] is changed to [[=À=]]. Caused by getcmdline() not
169-
handling the 0x80 as a second byte correctly? (Dominique Pelle, 2015 Jun 10)
170170

171171
Second problem in #966: ins_compl_add_tv() uses get_dict_string() multiple
172172
times, overwrites the one buffer. (Nikolay Pavlov, 2016 Aug 5)

0 commit comments

Comments
 (0)