Skip to content

Commit eba9637

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents d558443 + 1ad022a commit eba9637

29 files changed

+1237
-514
lines changed

runtime/doc/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,10 @@ tags.ref tags.html: tags
376376
perlhtml: tags $(DOCS)
377377
./vim2html.pl tags $(DOCS)
378378

379+
# Check URLs in the help with "curl".
380+
test_urls:
381+
vim -S test_urls.vim
382+
379383
clean:
380384
-rm doctags *.html tags.ref
381385

runtime/doc/eval.txt

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 8.0. Last change: 2017 Nov 19
1+
*eval.txt* For Vim version 8.0. Last change: 2017 Nov 24
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2452,6 +2452,7 @@ win_getid([{win} [, {tab}]]) Number get window ID for {win} in {tab}
24522452
win_gotoid({expr}) Number go to window with ID {expr}
24532453
win_id2tabwin({expr}) List get tab and window nr from window ID
24542454
win_id2win({expr}) Number get window nr from window ID
2455+
win_screenpos({nr}) List get screen position of window {nr}
24552456
winbufnr({nr}) Number buffer number of window {nr}
24562457
wincol() Number window column of the cursor
24572458
winheight({nr}) Number height of window {nr}
@@ -4662,11 +4663,11 @@ getqflist([{what}]) *getqflist()*
46624663
following string items are supported in {what}:
46634664
context get the context stored with |setqflist()|
46644665
efm errorformat to use when parsing "lines". If
4665-
not present, then the 'erroformat' option
4666+
not present, then the 'errorformat' option
46664667
value is used.
46674668
id get information for the quickfix list with
46684669
|quickfix-ID|; zero means the id for the
4669-
current list or the list specifed by "nr"
4670+
current list or the list specified by "nr"
46704671
idx index of the current entry in the list
46714672
items quickfix list entries
46724673
lines use 'errorformat' to extract items from a list
@@ -7695,8 +7696,9 @@ submatch({nr} [, {list}]) *submatch()* *E935*
76957696
When substitute() is used recursively only the submatches in
76967697
the current (deepest) call can be obtained.
76977698

7698-
Example: >
7699+
Examples: >
76997700
:s/\d\+/\=submatch(0) + 1/
7701+
:echo substitute(text, '\d\+', '\=submatch(0) + 1', '')
77007702
< This finds the first number in the line and adds one to it.
77017703
A line break is included as a newline character.
77027704

@@ -8632,6 +8634,14 @@ win_id2win({expr}) *win_id2win()*
86328634
Return the window number of window with ID {expr}.
86338635
Return 0 if the window cannot be found in the current tabpage.
86348636

8637+
win_screenpos({nr}) *win_screenpos()*
8638+
Return the screen position of window {nr} as a list with two
8639+
numbers: [row, col]. The first window always has position
8640+
[1, 1].
8641+
{nr} can be the window number or the |window-ID|.
8642+
Return [0, 0] if the window cannot be found in the current
8643+
tabpage.
8644+
86358645
*winbufnr()*
86368646
winbufnr({nr}) The result is a Number, which is the number of the buffer
86378647
associated with window {nr}. {nr} can be the window number or

runtime/doc/if_cscop.txt

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*if_cscop.txt* For Vim version 8.0. Last change: 2017 Jun 14
1+
*if_cscop.txt* For Vim version 8.0. Last change: 2017 Nov 23
22

33

44
VIM REFERENCE MANUAL by Andy Kahn
@@ -468,36 +468,18 @@ license or OS distribution), then you can download it for free from:
468468
http://cscope.sourceforge.net/
469469
This is released by SCO under the BSD license.
470470

471-
If you want a newer version of cscope, you will probably have to buy it.
472-
According to the (old) nvi documentation:
473-
474-
You can buy version 13.3 source with an unrestricted license
475-
for $400 from AT&T Software Solutions by calling +1-800-462-8146.
476-
477-
Also you can download cscope 13.x and mlcscope 14.x (multi-lingual cscope
478-
which supports C, C++, Java, lex, yacc, breakpoint listing, Ingres, and SDL)
479-
from World-Wide Exptools Open Source packages page:
480-
http://www.bell-labs.com/project/wwexptools/packages.html
481-
482471
In Solaris 2.x, if you have the C compiler license, you will also have
483472
cscope. Both are usually located under /opt/SUNWspro/bin
484473

485-
SGI developers can also get it. Search for Cscope on this page:
486-
http://freeware.sgi.com/index-by-alpha.html
487-
https://toolbox.sgi.com/toolbox/utilities/cscope/
488-
The second one is for those who have a password for the SGI toolbox.
489-
490474
There is source to an older version of a cscope clone (called "cs") available
491475
on the net. Due to various reasons, this is not supported with Vim.
492476

493477
The cscope interface/support for Vim was originally written by
494478
Andy Kahn <[email protected]>. The original structure (as well as a tiny
495-
bit of code) was adapted from the cscope interface in nvi. Please report
496-
any problems, suggestions, patches, et al., you have for the usage of
497-
cscope within Vim to him.
479+
bit of code) was adapted from the cscope interface in nvi.
498480
*cscope-win32*
499-
For a cscope version for Win32 see:
500-
http://code.google.com/p/cscope-win32/
481+
For a cscope version for Win32 see (seems abandonded):
482+
https://code.google.com/archive/p/cscope-win32/
501483

502484
Win32 support was added by Sergey Khorev <[email protected]>. Contact
503485
him if you have Win32-specific issues.

runtime/doc/if_perl.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*if_perl.txt* For Vim version 8.0. Last change: 2015 Oct 16
1+
*if_perl.txt* For Vim version 8.0. Last change: 2017 Nov 24
22

33

44
VIM REFERENCE MANUAL by Sven Verdoolaege
@@ -112,7 +112,7 @@ possible.
112112
Here is an overview of the functions that are available to Perl: >
113113
114114
:perl VIM::Msg("Text") # displays a message
115-
:perl VIM::Msg("Error", "ErrorMsg") # displays an error message
115+
:perl VIM::Msg("Wrong!", "ErrorMsg") # displays an error message
116116
:perl VIM::Msg("remark", "Comment") # displays a highlighted message
117117
:perl VIM::SetOption("ai") # sets a vim option
118118
:perl $nbuf = VIM::Buffers() # returns the number of buffers

runtime/doc/insert.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*insert.txt* For Vim version 8.0. Last change: 2017 May 30
1+
*insert.txt* For Vim version 8.0. Last change: 2017 Nov 23
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1296,7 +1296,8 @@ it here: http://ctags.sourceforge.net/ Version 5.6 or later is recommended.
12961296
For version 5.5.4 you should add a patch that adds the "typename:" field:
12971297
ftp://ftp.vim.org/pub/vim/unstable/patches/ctags-5.5.4.patch
12981298
A compiled .exe for MS-Windows can be found at:
1299-
http://georgevreilly.com/vim/ctags.html
1299+
http://ctags.sourceforge.net/
1300+
https://github.com/universal-ctags/ctags-win32
13001301

13011302
If you want to complete system functions you can do something like this. Use
13021303
ctags to generate a tags file for all the system header files: >

runtime/doc/mbyte.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*mbyte.txt* For Vim version 8.0. Last change: 2016 Jul 21
1+
*mbyte.txt* For Vim version 8.0. Last change: 2017 Nov 30
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar et al.
@@ -1257,8 +1257,8 @@ Combining forms:
12571257
==============================================================================
12581258
10. Input with imactivatefunc() *mbyte-func*
12591259

1260-
Vim has |imactivatefunc()| and |imstatusfunc()|. This is useful to
1261-
activate/deativate input method from Vim in any way, also with an external
1260+
Vim has the 'imactivatefunc' and 'imstatusfunc' options. These are useful to
1261+
activate/deativate the input method from Vim in any way, also with an external
12621262
command. For example, fcitx provide fcitx-remote command: >
12631263
12641264
set iminsert=2

runtime/doc/options.txt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 8.0. Last change: 2017 Nov 18
1+
*options.txt* For Vim version 8.0. Last change: 2017 Nov 26
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2657,6 +2657,9 @@ A jump table for the options with a short description can be found at |Q_op|.
26572657
vertical Start diff mode with vertical splits (unless
26582658
explicitly specified otherwise).
26592659

2660+
hiddenoff Do not use diff mode for a buffer when it
2661+
becomes hidden.
2662+
26602663
foldcolumn:{n} Set the 'foldcolumn' option to {n} when
26612664
starting diff mode. Without this 2 is used.
26622665

@@ -4587,8 +4590,8 @@ A jump table for the options with a short description can be found at |Q_op|.
45874590
match may not be found. This is to avoid that Vim hangs while you
45884591
are typing the pattern.
45894592
The highlighting can be set with the 'i' flag in 'highlight'.
4590-
When 'hlsearch' is on, all matched strings are highlighted too while typing
4591-
a search command. See also: 'hlsearch'.
4593+
When 'hlsearch' is on, all matched strings are highlighted too while
4594+
typing a search command. See also: 'hlsearch'.
45924595
If you don't want turn 'hlsearch' on, but want to highlight all matches
45934596
while searching, you can turn on and off 'hlsearch' with autocmd.
45944597
Example: >
@@ -8461,7 +8464,7 @@ A jump table for the options with a short description can be found at |Q_op|.
84618464
number, more intelligent detection process runs.
84628465
The "xterm2" value will be set if the xterm version is reported to be
84638466
from 95 to 276. The "sgr" value will be set if the xterm version is
8464-
277 or highter and when Vim detects Mac Terminal.app or Iterm2.
8467+
277 or higher and when Vim detects Mac Terminal.app or iTerm2.
84658468
If you do not want 'ttymouse' to be set to "xterm2" or "sgr"
84668469
automatically, set t_RV to an empty string: >
84678470
:set t_RV=

runtime/doc/tags

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7443,6 +7443,7 @@ mbyte-encoding mbyte.txt /*mbyte-encoding*
74437443
mbyte-first mbyte.txt /*mbyte-first*
74447444
mbyte-fonts-MSwin mbyte.txt /*mbyte-fonts-MSwin*
74457445
mbyte-fonts-X11 mbyte.txt /*mbyte-fonts-X11*
7446+
mbyte-func mbyte.txt /*mbyte-func*
74467447
mbyte-keymap mbyte.txt /*mbyte-keymap*
74477448
mbyte-locale mbyte.txt /*mbyte-locale*
74487449
mbyte-options mbyte.txt /*mbyte-options*

runtime/doc/todo.txt

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 8.0. Last change: 2017 Nov 21
1+
*todo.txt* For Vim version 8.0. Last change: 2017 Nov 29
22

33

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

38+
Motif testgui:
39+
From test_options.vim:
40+
Found errors in Test_set_values():
41+
Caught exception in Test_set_values(): Vim(set):E596: Invalid font(s): guifont=fixedsys @ /home/mool/vim/vim80/src/testdir/opt_test.vim, line 1153
42+
43+
WinBar: balloon shows up for next line
44+
3845
No maintainer for Vietnamese translations.
3946
No maintainer for Simplified Chinese translations.
4047

@@ -150,8 +157,17 @@ Compiler warnings (geeknik, 2017 Oct 26):
150157
- signed integer overflow in nfa_regatom() (#2251)
151158
- undefined left shift in get_string_tv() (#2250)
152159

153-
Patch to use imactivatefunc() also without +xim feature. (Yasuhiro Matsumoto,
154-
2017 Nov 19, #2349)
160+
patch for: fix SHIFT-Insert on Windows command prompt (Yasuhiro Matsumoto,
161+
#2381)
162+
163+
Patch for profile log truncating halfway a character. (ichizok, 2017 Nov 28,
164+
#2385)
165+
166+
WinBar: Maximizing window causes window size to be wrong. (Lifepillar, 2017
167+
Nov 29, #2356)
168+
169+
CTRL-A does not work with empty line. (Alex, #2387)
170+
Patch by Hirohito Higashi, 2017 Nov 29.
155171

156172
'hlsearch' shows empty matches, which means highlighting everything.
157173
Don't do that. For "foo\|" or "\v"
@@ -171,19 +187,16 @@ With foldmethod=syntax and nofoldenable comment highlighting isn't removed.
171187
Using 'wildignore' also applies to literally entered file name. Also with
172188
:drop (remote commands).
173189

174-
Race condition between stat() and open() in write_viminfo(). Use open() in the
175-
loop and try another name instead of using a temp file. (Simon Ruderich)
176-
The first one, when viminfo is new, should just fail if it creating with
177-
O_EXCL fails.
178-
Also use umask instead of mch_fopen() after vim_tempname().
179-
180190
"gvim --remote" from a directory with non-word characters changes the current
181191
directory (Paulo Marcel Coelho Arabic, 2017 Oct 30, #2266)
182192
Also see #1689.
183193

184194
ml_get error when using a Python. (Yggdroot, 2017 Jun 1, #1737)
185195
Lemonboy can reproduce (2017 Jun 5)
186196

197+
Patch to fix E806. (Dominique, 2017 Nov 22, #2368)
198+
Kazunobu Kuriyama: caused by XtSetLanguageProc().
199+
187200
Invalid range error when using BufWinLeave for closing terminal.
188201
(Gabriel Barta, 2017 Nov 15, #2339)
189202

@@ -208,7 +221,7 @@ Patch to fix cmdline abbreviation after '<,'>. (Christian Brabandt, 2017 Nov
208221

209222
Patch to add TextDeletePost and TextYankPost events. (Philippe Vaucher, 2011
210223
May 24) Update May 26.
211-
Now in patch by Lemonboy, #2333 (who is Lemonboy?)
224+
Now in patch by Lemonboy, #2333
212225

213226
Default install on MS-Windows should source defaults.vim.
214227
Ask whether to use Windows or Vim key behavior?

runtime/doc/version8.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*version8.txt* For Vim version 8.0. Last change: 2017 Apr 23
1+
*version8.txt* For Vim version 8.0. Last change: 2017 Nov 24
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -15582,7 +15582,7 @@ Files: src/json.c, src/testdir/test_json.vim
1558215582

1558315583
Patch 8.0.0181
1558415584
Problem: When 'cursorbind' and 'cursorcolumn' are both on, the column
15585-
highlignt in non-current windows is wrong.
15585+
highlight in non-current windows is wrong.
1558615586
Solution: Add validate_cursor(). (Masanori Misono, closes #1372)
1558715587
Files: src/move.c
1558815588

0 commit comments

Comments
 (0)