Skip to content

Commit 8c9b721

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents 30bd0e1 + 4d6cd29 commit 8c9b721

24 files changed

Lines changed: 221 additions & 144 deletions

runtime/doc/cmdline.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*cmdline.txt* For Vim version 8.0. Last change: 2018 May 10
1+
*cmdline.txt* For Vim version 8.0. Last change: 2018 May 14
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -458,6 +458,10 @@ a previous version <Esc> was used). In the pattern standard wildcards '*' and
458458
'?' are accepted when matching file names. '*' matches any string, '?'
459459
matches exactly one character.
460460

461+
When repeating 'wildchar' or CTRL-N you cycle through the matches, eventually
462+
ending up back to what was typed. If the first match is not what you wanted,
463+
you can use <S-Tab> or CTRL-P to go straight back to what you typed.
464+
461465
The 'wildignorecase' option can be set to ignore case in filenames.
462466

463467
The 'wildmenu' option can be set to show the matches just above the command

runtime/doc/options.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 8.0. Last change: 2018 Apr 22
1+
*options.txt* For Vim version 8.0. Last change: 2018 May 15
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2584,8 +2584,11 @@ A jump table for the options with a short description can be found at |Q_op|.
25842584
contain a list of words. This can be one word per line, or several
25852585
words per line, separated by non-keyword characters (white space is
25862586
preferred). Maximum line length is 510 bytes.
2587-
When this option is empty, or an entry "spell" is present, spell
2588-
checking is enabled the currently active spelling is used. |spell|
2587+
2588+
When this option is empty or an entry "spell" is present, and spell
2589+
checking is enabled, words in the word lists for the currently active
2590+
'spelllang' are used. See |spell|.
2591+
25892592
To include a comma in a file name precede it with a backslash. Spaces
25902593
after a comma are ignored, otherwise spaces are included in the file
25912594
name. See |option-backslash| about using backslashes.

runtime/doc/quickfix.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,12 @@ using these functions are below:
608608
" get the identifier of the current quickfix list
609609
:let qfid = getqflist({'id' : 0}).id
610610
611+
" get the identifier of the fourth quickfix list in the stack
612+
:let qfid = getqflist({'nr' : 4, 'id' : 0}).id
613+
614+
" check whether a quickfix list with a specific identifier exists
615+
:if getqflist({'id' : qfid}).id == qfid
616+
611617
" get the index of the current quickfix list in the stack
612618
:let qfnum = getqflist({'nr' : 0}).nr
613619
@@ -653,6 +659,11 @@ The setqflist() and setloclist() functions can be used to set the various
653659
attributes of a quickfix and location list respectively. Some examples for
654660
using these functions are below:
655661
>
662+
" create an empty quickfix list with a title and a context
663+
:let t = 'Search results'
664+
:let c = {'cmd' : 'grep'}
665+
:call setqflist([], ' ', {'title' : t, 'context' : c})
666+
656667
" set the title of the current quickfix list
657668
:call setqflist([], 'a', {'title' : 'Mytitle'})
658669
@@ -671,6 +682,9 @@ using these functions are below:
671682
\ {'filename' : 'b.txt', 'lnum' : 20, 'text' : "Orange"}]
672683
:call setqflist([], 'a', {'id' : qfid, 'items' : newItems})
673684
685+
" empty a quickfix list specified by an identifier
686+
:call setqflist([], 'r', {'id' : qfid, 'items' : []})
687+
674688
" free all the quickfix lists in the stack
675689
:call setqflist([], 'f')
676690

runtime/doc/todo.txt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 8.0. Last change: 2018 May 13
1+
*todo.txt* For Vim version 8.0. Last change: 2018 May 15
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -47,7 +47,7 @@ On Win32 when not in the console and t_Co >= 256, allow using 'tgc'.
4747
(Nobuhiro Takasaki, #2833) Also check t_Co.
4848

4949
Pop-up menu overlapping terminal is not cleared completely. (Lifepillar, 2018
50-
May 13, #2908)
50+
May 13, #2908) Hint from Christian, May 14.
5151

5252
balloon_show() does not work properly in the terminal. (Ben Jackson, 2017 Dec
5353
20, #2481)
@@ -1330,7 +1330,7 @@ When evaluating expression in backticks, autoload doesn't work.
13301330
(Andy Wokula, 2013 Dec 14)
13311331

13321332
Using <nr>ifoobar<esc> can slow down Vim. Patch by Christian Brabandt, 2013
1333-
Dec 13.
1333+
Dec 13. Only helps a bit, 10000ii<Esc> is still too slow.
13341334

13351335
GTK: problem with 'L' in 'guioptions' changing the window width.
13361336
(Aaron Cornelius, 2012 Feb 6)
@@ -4231,7 +4231,6 @@ Performance:
42314231
- Have a look at how pdksh does memory allocation (alloc.c). (Dalecki)
42324232
- Do profiling on:
42334233
- :g/pat/normal cmd
4234-
- 1000ii<Esc>
42354234
- deleting 10Mbyte worth of lines (netscape binary)
42364235
- "[i" and "[d" (Yegappan Lakshmanan)
42374236
- ":g/^/m0" on a 450Kbyte file. And the "u".
@@ -4250,8 +4249,6 @@ Performance:
42504249
- Executing a register, e.g. "10000@@" is slow, because ins_typebuf has to
42514250
move the previous commands forward each time. Pass count from
42524251
normal_cmd() down to do_execreg().
4253-
- Repeating insert "1000i-<Esc>" displays --INSERT-- all the time, because of
4254-
the <Esc> at the end. Make this work faster (disable redrawing).
42554252
- Avoid calls to plines() for cursor line, use w_cline_height.
42564253
- After ":set nowrap" remove superfluous redraw with wrong hor. offset if
42574254
cursor is right of the screen.

0 commit comments

Comments
 (0)