Skip to content

Commit 7dd64a3

Browse files
committed
Update runtime files.
1 parent c28cb5b commit 7dd64a3

11 files changed

Lines changed: 851 additions & 555 deletions

File tree

runtime/doc/popup.txt

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*popup.txt* For Vim version 8.1. Last change: 2019 May 26
1+
*popup.txt* For Vim version 8.1. Last change: 2019 May 31
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -13,9 +13,7 @@ THIS IS UNDER DESIGN - ANYTHING MAY STILL CHANGE
1313
3. Examples |popup-examples|
1414

1515

16-
{not available if the |+eval| feature was disabled at compile time}
17-
{not able to use text properties if the |+textprop| feature was disabled at
18-
compile time}
16+
{not available if the |+textprop| feature was disabled at compile time}
1917

2018
==============================================================================
2119
1. Introduction *popup-intro*
@@ -60,15 +58,22 @@ WINDOW POSITION AND SIZE *popup-position*
6058

6159
The height of the window is normally equal to the number of, possibly
6260
wrapping, lines in the buffer. It can be limited with the "maxheight"
63-
property. You can use empty lines to increase the height.
61+
property. You can use empty lines to increase the height or the "minheight"
62+
property.
6463

6564
The width of the window is normally equal to the longest line in the buffer.
6665
It can be limited with the "maxwidth" property. You can use spaces to
67-
increase the width.
66+
increase the width or the "minwidth" property.
6867

6968
By default the 'wrap' option is set, so that no text disappears. However, if
7069
there is not enough space, some text may be invisible.
7170

71+
Vim tries to show the popup in the location you specify. In some cases, e.g.
72+
when the popup would go outside of the Vim window, it will show it somewhere
73+
else. E.g. if you use `popup_atcursor()` the popup normally shows just above
74+
the current cursor position, but if the cursor is close to the top of the Vim
75+
window it will be placed below the cursor position.
76+
7277

7378

7479
TODO:
@@ -92,9 +97,13 @@ IMPLEMENTATION:
9297
- Handle screen resize in screenalloc().
9398
- Make redrawing more efficient and avoid flicker.
9499
Store popup info in a mask, use the mask in screen_line()
100+
Keep mask until next update_screen(), find differences and redraw affected
101+
windows/lines
95102
Fix redrawing problem with completion.
96103
Fix redrawing problem when scrolling non-current window
97104
Fix redrawing the statusline on top of a popup
105+
- Disable commands, feedkeys(), CTRL-W, etc. in a popup window. Or whitelist
106+
commands that are allowed?
98107
- Figure out the size and position better.
99108
if wrapping splits a double-wide character
100109
if wrapping inserts indent
@@ -114,7 +123,7 @@ popup_create({text}, {options}) *popup_create()*
114123
- a string
115124
- a list of strings
116125
- a list of text lines with text properties
117-
{not implemented yet}
126+
118127
{options} is a dictionary with many possible entries.
119128
See |popup_create-usage| for details.
120129

@@ -410,7 +419,7 @@ So we get:
410419
type name of the text property type, as added with
411420
|prop_type_add()|
412421
transparent do not show these characters, show the text under it;
413-
if there is an border character to the right or below
422+
if there is a border character to the right or below
414423
it will be made transparent as well
415424
{not implemented yet}
416425

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 8.1. Last change: 2019 May 24
1+
*quickref.txt* For Vim version 8.1. Last change: 2019 May 31
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -982,6 +982,7 @@ Short explanation of each option: *option-list*
982982
'wildmode' 'wim' mode for 'wildchar' command-line expansion
983983
'wildoptions' 'wop' specifies how command line completion is done
984984
'winaltkeys' 'wak' when the windows system handles ALT keys
985+
'wincolor' 'wcr' window-local highlighting
985986
'window' 'wi' nr of lines to scroll for CTRL-F and CTRL-B
986987
'winheight' 'wh' minimum number of lines for the current window
987988
'winfixheight' 'wfh' keep window height when opening/closing windows

runtime/doc/tags

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4742,6 +4742,7 @@ E99 diff.txt /*E99*
47424742
E990 eval.txt /*E990*
47434743
E991 eval.txt /*E991*
47444744
E992 options.txt /*E992*
4745+
E993 popup.txt /*E993*
47454746
E999 repeat.txt /*E999*
47464747
EX intro.txt /*EX*
47474748
EXINIT starting.txt /*EXINIT*
@@ -8207,7 +8208,7 @@ popup_dialog() popup.txt /*popup_dialog()*
82078208
popup_filter_menu() popup.txt /*popup_filter_menu()*
82088209
popup_filter_yesno() popup.txt /*popup_filter_yesno()*
82098210
popup_getoptions() popup.txt /*popup_getoptions()*
8210-
popup_getposition() popup.txt /*popup_getposition()*
8211+
popup_getpos() popup.txt /*popup_getpos()*
82118212
popup_hide() popup.txt /*popup_hide()*
82128213
popup_menu() popup.txt /*popup_menu()*
82138214
popup_move() popup.txt /*popup_move()*
@@ -9853,6 +9854,7 @@ win32-vimrun gui_w32.txt /*win32-vimrun*
98539854
win32-win3.1 os_win32.txt /*win32-win3.1*
98549855
win32-win95 os_win32.txt /*win32-win95*
98559856
win32s os_win32.txt /*win32s*
9857+
win_execute() eval.txt /*win_execute()*
98569858
win_findbuf() eval.txt /*win_findbuf()*
98579859
win_getid() eval.txt /*win_getid()*
98589860
win_gotoid() eval.txt /*win_gotoid()*

runtime/doc/terminal.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*terminal.txt* For Vim version 8.1. Last change: 2019 May 20
1+
*terminal.txt* For Vim version 8.1. Last change: 2019 May 29
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -907,7 +907,7 @@ When 'background' is "dark":
907907
hi debugBreakpoint term=reverse ctermbg=red guibg=red
908908

909909

910-
Shorcuts *termdebug_shortcuts*
910+
Shortcuts *termdebug_shortcuts*
911911

912912
You can define your own shortcuts (mappings) to control gdb, that can work in
913913
any window, using the TermDebugSendCommand() function. Example: >

runtime/doc/todo.txt

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 8.1. Last change: 2019 May 26
1+
*todo.txt* For Vim version 8.1. Last change: 2019 May 31
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -42,6 +42,8 @@ Ongoing work on text properties, see src/textprop.c
4242

4343
Popup windows are being implemented, see |popup-window|.
4444

45+
Listener causes extra } to be inserted. (Paul Jolly, #4455)
46+
4547
Patch to beautify the output of a test run. (Christian Brabandt, #4391)
4648
can be improved.
4749

@@ -52,6 +54,12 @@ remains equal? Then %argdel to clean it up. Do try this with 'hidden' set.
5254

5355
Patch for Chinese translations for nsis. (#4407) Comments handled?
5456

57+
Patch to add v:searchstat. (Takuya Fujiwara, #4446) Should be independent of
58+
'shortmess', filled on demand and cached until search changes.
59+
60+
listener callback is invoked while another is still busy? (Paul Jolly)
61+
Should not happen because of text lock.
62+
5563
'incsearch' with :s: (#3321)
5664
- Get E20 when using command history to get "'<,'>s/a/b" and no Visual area
5765
was set. (#3837)
@@ -130,6 +138,12 @@ Should do current file first and not split it up when more results are found.
130138
Adding "10" to 'spellsuggest' causes spell suggestions to become very slow.
131139
(#4087)
132140

141+
Problem with German spell file. Hint for solution by Klaus-Peter Schreiner in
142+
#4314, solves the Rasenmäher problem.
143+
144+
Visual highlight not removed when 'dipslay' is "lastline" and line doesn't
145+
fit. (Kevin Lawler, #4457)
146+
133147
Does not build with MinGW out of the box:
134148
- _stat64 is not defined, need to use "struct stat" in vim.h
135149
- WINVER conflict, should use 0x0600 by default?
@@ -177,6 +191,10 @@ register "", So that registers can be saved and fully restored.
177191
Add a way to create an empty, hidden buffer. Like doing ":new|hide".
178192
":let buf = bufcreate('name')
179193

194+
Session file contains absolute paths when "curdir" is removed form
195+
'sessionoptions', making it impossible to have a session with a relative path.
196+
(#4450)
197+
180198
When using a timer callback vgetc_busy is reset, allowing for using input().
181199
But in a channel callback this does not happen. We need to do something
182200
similar to check_due_timer(). Also see #3809.

runtime/doc/usr_41.txt

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*usr_41.txt* For Vim version 8.1. Last change: 2019 May 16
1+
*usr_41.txt* For Vim version 8.1. Last change: 2019 May 29
22

33
VIM USER MANUAL - by Bram Moolenaar
44

@@ -105,20 +105,21 @@ We won't explain how |:for| and |range()| work until later. Follow the links
105105
if you are impatient.
106106

107107

108-
THREE KINDS OF NUMBERS
108+
FOUR KINDS OF NUMBERS
109109

110-
Numbers can be decimal, hexadecimal or octal. A hexadecimal number starts
111-
with "0x" or "0X". For example "0x1f" is decimal 31. An octal number starts
112-
with a zero. "017" is decimal 15. Careful: don't put a zero before a decimal
113-
number, it will be interpreted as an octal number!
110+
Numbers can be decimal, hexadecimal, octal or binary. A hexadecimal number
111+
starts with "0x" or "0X". For example "0x1f" is decimal 31. An octal number
112+
starts with a zero. "017" is decimal 15. A binary number starts with "0b" or
113+
"0B". For example "0b101" is decimal 5. Careful: don't put a zero before a
114+
decimal number, it will be interpreted as an octal number!
114115
The ":echo" command always prints decimal numbers. Example: >
115116
116117
:echo 0x7f 036
117118
< 127 30 ~
118119

119-
A number is made negative with a minus sign. This also works for hexadecimal
120-
and octal numbers. A minus sign is also used for subtraction. Compare this
121-
with the previous example: >
120+
A number is made negative with a minus sign. This also works for hexadecimal,
121+
octal and binary numbers. A minus sign is also used for subtraction. Compare
122+
this with the previous example: >
122123
123124
:echo 0x7f -036
124125
< 97 ~
@@ -614,6 +615,7 @@ String manipulation: *string-functions*
614615
repeat() repeat a string multiple times
615616
eval() evaluate a string expression
616617
execute() execute an Ex command and get the output
618+
win_execute() like execute() but in a specified window
617619
trim() trim characters from a string
618620

619621
List manipulation: *list-functions*

0 commit comments

Comments
 (0)