Skip to content

Commit 9c41471

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents 8be81c4 + 1d669c2 commit 9c41471

28 files changed

+919
-479
lines changed

runtime/doc/develop.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*develop.txt* For Vim version 8.0. Last change: 2016 Jan 31
1+
*develop.txt* For Vim version 8.0. Last change: 2017 Jan 05
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -177,7 +177,7 @@ The basic steps to make changes to the code:
177177
5. Make a patch with "git diff". You can also create a pull request on
178178
github, but it's the diff that matters.
179179
6. Make a note about what changed, preferably mentioning the problem and the
180-
solution. Send an email to the vim-dev maillist with an explanation and
180+
solution. Send an email to the |vim-dev| maillist with an explanation and
181181
include the diff. Or create a pull request on github.
182182

183183

runtime/doc/eval.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 8.0. Last change: 2016 Nov 29
1+
*eval.txt* For Vim version 8.0. Last change: 2017 Jan 08
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -5229,6 +5229,7 @@ join({list} [, {sep}]) *join()*
52295229
js_decode({string}) *js_decode()*
52305230
This is similar to |json_decode()| with these differences:
52315231
- Object key names do not have to be in quotes.
5232+
- Strings can be in single quotes.
52325233
- Empty items in an array (between two commas) are allowed and
52335234
result in v:none items.
52345235

@@ -7615,7 +7616,8 @@ systemlist({expr} [, {input}]) *systemlist()*
76157616
Same as |system()|, but returns a |List| with lines (parts of
76167617
output separated by NL) with NULs transformed into NLs. Output
76177618
is the same as |readfile()| will output with {binary} argument
7618-
set to "b".
7619+
set to "b". Note that on MS-Windows you may get trailing CR
7620+
characters.
76197621

76207622
Returns an empty string on error.
76217623

runtime/doc/filetype.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*filetype.txt* For Vim version 8.0. Last change: 2016 Sep 09
1+
*filetype.txt* For Vim version 8.0. Last change: 2017 Jan 04
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -573,6 +573,8 @@ Man {number} {name}
573573

574574
Global mapping:
575575
<Leader>K Displays the manual page for the word under the cursor.
576+
<Plug>ManPreGetPage idem, allows for using a mapping: >
577+
nmap <F1> <Plug>ManPreGetPage<CR>
576578
577579
Local mappings:
578580
CTRL-] Jump to the manual page for the word under the cursor.

runtime/doc/intro.txt

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,21 +96,18 @@ mention that.
9696

9797
*mail-list* *maillist*
9898
There are several mailing lists for Vim:
99-
<vim@vim.org>
99+
<vim@vim.org> *vim-use* *vim_use*
100100
For discussions about using existing versions of Vim: Useful mappings,
101101
questions, answers, where to get a specific version, etc. There are
102102
quite a few people watching this list and answering questions, also
103103
for beginners. Don't hesitate to ask your question here.
104-
<vim-dev@vim.org> *vim-dev* *vimdev*
104+
<vim-dev@vim.org> *vim-dev* *vim_dev* *vimdev*
105105
For discussions about changing Vim: New features, porting, patches,
106106
beta-test versions, etc.
107-
<vim-announce@vim.org> *vim-announce*
107+
<vim-announce@vim.org> *vim-announce* *vim_announce*
108108
Announcements about new versions of Vim; also for beta-test versions
109109
and ports to different systems. This is a read-only list.
110-
<vim-multibyte@vim.org> *vim-multibyte*
111-
For discussions about using and improving the multi-byte aspects of
112-
Vim.
113-
<vim-mac@vim.org> *vim-mac*
110+
<vim-mac@vim.org> *vim-mac* *vim_mac*
114111
For discussions about using and improving the Macintosh version of
115112
Vim.
116113

runtime/doc/tags

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9220,16 +9220,19 @@ vim-dev intro.txt /*vim-dev*
92209220
vim-mac intro.txt /*vim-mac*
92219221
vim-modes intro.txt /*vim-modes*
92229222
vim-modes-intro intro.txt /*vim-modes-intro*
9223-
vim-multibyte intro.txt /*vim-multibyte*
92249223
vim-script-intro usr_41.txt /*vim-script-intro*
9224+
vim-use intro.txt /*vim-use*
92259225
vim-variable eval.txt /*vim-variable*
92269226
vim.vim syntax.txt /*vim.vim*
92279227
vim7 version7.txt /*vim7*
92289228
vim8 version8.txt /*vim8*
92299229
vim: options.txt /*vim:*
9230+
vim_announce intro.txt /*vim_announce*
9231+
vim_dev intro.txt /*vim_dev*
92309232
vim_did_enter-variable eval.txt /*vim_did_enter-variable*
92319233
vim_mac gui_mac.txt /*vim_mac*
92329234
vim_starting eval.txt /*vim_starting*
9235+
vim_use intro.txt /*vim_use*
92339236
vimball pi_vimball.txt /*vimball*
92349237
vimball-contents pi_vimball.txt /*vimball-contents*
92359238
vimball-extract pi_vimball.txt /*vimball-extract*

runtime/doc/todo.txt

Lines changed: 39 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 8.0. Last change: 2017 Jan 02
1+
*todo.txt* For Vim version 8.0. Last change: 2017 Jan 09
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -29,8 +29,8 @@ be worked on, but only if you sponsor Vim development. See |sponsor|.
2929

3030
Issues can also be entered online: https://github.com/vim/vim/issues
3131
Only use this for bug reports, not for questions! Those belong on the
32-
maillist. Updates will be forwarded to the vim_dev maillist. Issues entered
33-
there will not be repeated below, unless there is extra information.
32+
maillist. Updates will be forwarded to the |vim_dev| maillist. Issues
33+
entered there will not be repeated below, unless there is extra information.
3434

3535
*known-bugs*
3636
-------------------- Known bugs and current work -----------------------
@@ -109,11 +109,6 @@ Regexp problems:
109109
Make html indent file use javascript indent, now that it's not just cindent.
110110
#1220
111111

112-
Patch to fix completion of :filter command. (Ichizok, 2016 Dec 3, #1299)
113-
114-
Patch to use buffer id for system() and systemlist() (LemonBoy, 2016 Nov 7,
115-
#1240)
116-
117112
Concatenation with null string causes an error: 'a'[1:0] .. 'b'
118113
Might as well handle it like an empty string.
119114

@@ -123,27 +118,12 @@ position in 'runtimepath'. (Dugan Chen, 2016 Nov 18)
123118
json_encode(): should convert to utf-8. (Nikolai Pavlov, 2016 Jan 23)
124119
What if there is an invalid character?
125120

126-
Putting "k" early in 'complete' does not use dictionary first?
127-
(RubenGZ, 2016 Dec 10, #1316)
128-
patch proposed by Hirohito Higashi, 2016 Dec 11.
129-
130-
Patch to fix NULL pointer when sorting zero elements. (Dominique, 2016 Dec 15)
121+
Include rust files. (Klabnik, #1356)
131122

132-
Patch to test float functions. (Dominique, 2016 Dec 16)
133-
134-
Patch to improve completion of :syntax command. (Dominique, 2016 Dec 12)
135-
136-
Patch to use IEMSG() in more places. (Dominique, 2016 Dec 27)
123+
More float tests. (Dominique, #1364)
137124

138125
Patch to avoid ubsan warning for integer overflow. (Dominique, 2016 Dec 26)
139126

140-
Bug: ":earlier 100d" doesn't work after using undo file.
141-
(Pavol Juhas, 2016 Nov 15, #1254)
142-
Fix by Christian, but lacks a test.
143-
Test in testdir/test_undo.vim doesn't catch the problem.
144-
Test by Pavol Juhas, Nov 22.
145-
Patch with test (Pavol Juhas,, 2016 Dec 3, #1300)
146-
147127
Bug: Json with same key should not give internal error. (Lcd, 2016 Oct 26)
148128
Make dict_add give a duplicate key error.
149129

@@ -166,11 +146,16 @@ Patch to deal with changed configure events in GTK 3. (Jan Alexander Steffens,
166146
2016 Oct 23 #1193)
167147
Remarks from nuko8, 2016 Nov 2.
168148

149+
Multi-byte bug: dv} splits char. (Urtica Dioica, 2017 Jan 9)
150+
169151
Patch to change order of compiler flags. (Yousong Zhou, 2016 Sep 19, #1100)
170152

171153
Patch to add command line completion for :cexpr commands. (Yegappan
172154
Lakshmanan, 2016 Dec 13)
173155

156+
Patch for :pyx, run python commands depending on the supported version.
157+
(Marc Weber, update from Ken Takata, 2016 Sep 19, 2017 Jan 6)
158+
174159
Patch to avoid warnings for overflow. (Mike Williams, 2016 Dec 16)
175160
Update Dec 19.
176161

@@ -195,6 +180,9 @@ https://github.com/neovim/neovim/pull/5737#issuecomment-266055165
195180
Patch for better explanation of 'compatible' side effects.
196181
https://github.com/vim/vim/pull/1161/files
197182

183+
Patch to add 'makeencoding', useful when the system encoding differs from
184+
Vim's 'encoding' setting. (Ken Takata, 2017 Jan 6)
185+
198186
Patch to adjust marks when adding a new line to the end of buffer in diff
199187
mode. (James McCoy, 2016 Dec 14, #1329)
200188

@@ -240,6 +228,9 @@ Add tests for using number larger than number of lines in buffer.
240228
Patch to make v:shell_error writable. (Christian Brabandt, 2016 Sep 27)
241229
Useful to restore it. Is there another solution?
242230

231+
"ci[" does not look for next [ like ci" does look for next ".
232+
(J.F. 2017 Jan 7)
233+
243234
On MS-Windows with 'clipboard' set to "unnamed" this doesn't work to double
244235
lines: :g/^/normal yyp On Unix it works OK. (Bryce Orgill, 2016 Nov 5)
245236

@@ -248,6 +239,10 @@ Patch for wrong cursor position on wrapped line, involving breakindent.
248239

249240
Patch for 'cursorlinenr' option. (Ozaki Kiichi, 2016 Nov 30)
250241

242+
When adding an item to a new quickfix list make ":cnext" jump to that item.
243+
Make a difference being at the first item and not having used :cnext at all.
244+
(Afanasiy Fet, 2017 Jan 3)
245+
251246
Invalid behavior with NULL list. (Nikolai Pavlov, #768)
252247
E.g. deepcopy(test_null_list())
253248

@@ -280,6 +275,9 @@ sort() is not stable when using numeric/float sort (Nikolay Pavlov, 2016 Sep
280275

281276
Patch to add "cmdline" completion to getcompletion(). (Shougo, Oct 1, #1140)
282277

278+
Feature request: Complete members of a dictionary. (Luc Hermitte, 2017 Jan 4,
279+
#1350)
280+
283281
Patch for systemlist(), add empty item. (thinca, Sep 30, #1135)
284282
Add an argument to choose binary or non-binary (like readfile()), when omitted
285283
use the current behavior.
@@ -307,9 +305,6 @@ Patch to order results from taglist(). (Duncan McDougall, 2016 Oct 25)
307305
patch for 'spellcamelcase' option: spellcheck each CamelCased word.
308306
(Ben Tucker, 2016 Dec 2)
309307

310-
Patch for :pyx, run python commands depending on the supported version.
311-
(Marc Weber, update from Ken Takata, 2016 Sep 19)
312-
313308
When using ":diffput" through a mapping, undo in the target buffer isn't
314309
synced. (Ryan Carney, 2016 Sep 14)
315310

@@ -333,6 +328,19 @@ Jul 25, #948)
333328
Patch to fix wrong encoding of error message on Cygwin/MSYS terminal.
334329
(Ken Takata, 2016 Oct 4)
335330

331+
Patch to introduce 'cmdencoding'. (Ken Takata, Aug 18?)
332+
Better help Aug 19.
333+
Problem: applies to too many commands, such as :cbuffer.
334+
Updated patch with three options, 2016 Sep 8.
335+
Win32: When running ":make" and 'encoding' differs from the system locale,
336+
the output should be converted. Esp. when 'encoding' is "utf-8". (Yongwei
337+
Wu) Should we use 'termencoding' for this?
338+
339+
Patch to add 'systemencoding', convert between 'encoding' and this for file
340+
names, shell commands and the like. (Kikuchan, 2010 Oct 14)
341+
Assume the system converts between the actual encoding of the filesystem to
342+
the system encoding (usually utf-8).
343+
336344
'hlsearch' interferes with a Conceal match. (Rom Grk, 2016 Aug 9)
337345

338346
Patch to add context information to quickfix/location list. (Yegappan
@@ -467,14 +475,6 @@ Should use /usr/local/share/applications or /usr/share/applications.
467475
Or use $XDG_DATA_DIRS.
468476
Also need to run update-desktop-database (Kuriyama Kazunobu, 2015 Nov 4)
469477

470-
Patch to introduce 'cmdencoding'. (Ken Takata, Aug 18?)
471-
Better help Aug 19.
472-
Problem: applies to too many commands, such as :cbuffer.
473-
Updated patch with three options, 2016 Sep 8.
474-
Win32: When running ":make" and 'encoding' differs from the system locale,
475-
the output should be converted. Esp. when 'encoding' is "utf-8". (Yongwei
476-
Wu) Should we use 'termencoding' for this?
477-
478478
Patch to have text objects defined by arbitrary single characters. (Daniel
479479
Thau, 2013 Nov 20, 2014 Jan 29, 2014 Jan 31)
480480
Added tests (James McCoy, 2016 Aug 3). Still needs more work.
@@ -488,6 +488,9 @@ Access to uninitialized memory in match_backref() regexp_nda.c:4882
488488
":cd C:\Windows\System32\drivers\etc*" does not work, even though the
489489
directory exists. (Sergio Gallelli, 2013 Dec 29)
490490

491+
In debug mode one can inspect variables, but not the function parameters
492+
(starting with a:). (Luc Hermitte, 2017 Jan 4, #1352)
493+
491494
7 Add a watchpoint in the debug mode: An expression that breaks execution
492495
when evaluating to non-zero. Add the "watchadd expr" command, stop when
493496
the value of the expression changes. ":watchdel" deletes an item,
@@ -1355,11 +1358,6 @@ Regexp engine performance:
13551358
7.2.274. (Christian Brabandt, 2010 May 27) Generally, folding with
13561359
'foldmethod' set to "syntax" is slow. Do profiling to find out why.
13571360

1358-
Patch to add 'systemencoding', convert between 'encoding' and this for file
1359-
names, shell commands and the like. (Kikuchan, 2010 Oct 14)
1360-
Assume the system converts between the actual encoding of the filesystem to
1361-
the system encoding (usually utf-8).
1362-
13631361
Problem producing tags file when hebrew.frx is present. It has a BOM.
13641362
Results in E670. (Tony Mechelynck, 2010 May 2)
13651363

runtime/filetype.vim

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim support file to detect file types
22
"
33
" Maintainer: Bram Moolenaar <Bram@vim.org>
4-
" Last Change: 2016 Oct 31
4+
" Last Change: 2017 Jan 06
55

66
" Listen very carefully, I will say this only once
77
if exists("did_load_filetypes")
@@ -309,7 +309,10 @@ au BufNewFile,BufRead *.bl setf blank
309309
au BufNewFile,BufRead */etc/blkid.tab,*/etc/blkid.tab.old setf xml
310310

311311
" Bazel (http://bazel.io)
312-
autocmd BufRead,BufNewFile *.bzl,BUILD,WORKSPACE setfiletype bzl
312+
autocmd BufRead,BufNewFile *.bzl,WORKSPACE setfiletype bzl
313+
if has("fname_case")
314+
autocmd BufRead,BufNewFile BUILD setfiletype bzl
315+
endif
313316

314317
" C or lpc
315318
au BufNewFile,BufRead *.c call s:FTlpc()

runtime/ftplugin/man.vim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim filetype plugin file
22
" Language: man
33
" Maintainer: SungHyun Nam <goweol@gmail.com>
4-
" Last Change: 2016 Jun 20
4+
" Last Change: 2017 Jan 04
55

66
" To make the ":Man" command available before editing a manual page, source
77
" this script from your startup vimrc file.
@@ -47,6 +47,7 @@ endif
4747
if exists(":Man") != 2
4848
com -nargs=+ Man call s:GetPage(<f-args>)
4949
nmap <Leader>K :call <SID>PreGetPage(0)<CR>
50+
nmap <Plug>ManPreGetPage :call <SID>PreGetPage(0)<CR>
5051
endif
5152

5253
" Define functions only once.

0 commit comments

Comments
 (0)