Skip to content

Commit ba14141

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents 1366a51 + a33ddbb commit ba14141

39 files changed

+743
-606
lines changed

runtime/doc/eval.txt

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 8.0. Last change: 2017 Mar 21
1+
*eval.txt* For Vim version 8.0. Last change: 2017 Mar 27
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -6936,16 +6936,19 @@ setqflist({list} [, {action}[, {what}]]) *setqflist()*
69366936
Note that the list is not exactly the same as what
69376937
|getqflist()| returns.
69386938

6939-
*E927*
6940-
If {action} is set to 'a', then the items from {list} are
6941-
added to the existing quickfix list. If there is no existing
6942-
list, then a new list is created.
6939+
{action} values: *E927*
6940+
'a' The items from {list} are added to the existing
6941+
quickfix list. If there is no existing list, then a
6942+
new list is created.
69436943

6944-
If {action} is set to 'r', then the items from the current
6945-
quickfix list are replaced with the items from {list}. This
6946-
can also be used to clear the list: >
6947-
:call setqflist([], 'r')
6944+
'r' The items from the current quickfix list are replaced
6945+
with the items from {list}. This can also be used to
6946+
clear the list: >
6947+
:call setqflist([], 'r')
69486948
<
6949+
'f' All the quickfix lists in the quickfix stack are
6950+
freed.
6951+
69496952
If {action} is not present or is set to ' ', then a new list
69506953
is created.
69516954

@@ -7874,6 +7877,7 @@ test_override({name}, {val}) *test_override()*
78747877

78757878
name effect when {val} is non-zero ~
78767879
redraw disable the redrawing() function
7880+
silent_mode enable silent mode (like using |-s| after |-e|)
78777881
char_avail disable the char_avail() function
78787882
ALL clear all overrides ({val} is not used)
78797883

runtime/doc/filetype.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*filetype.txt* For Vim version 8.0. Last change: 2017 Mar 21
1+
*filetype.txt* For Vim version 8.0. Last change: 2017 Mar 28
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -353,12 +353,12 @@ define yourself. There are a few ways to avoid this:
353353
You need to define your own mapping before the plugin is loaded (before
354354
editing a file of that type). The plugin will then skip installing the
355355
default mapping.
356-
356+
*no_mail_maps*
357357
3. Disable defining mappings for a specific filetype by setting a variable,
358358
which contains the name of the filetype. For the "mail" filetype this
359359
would be: >
360360
:let no_mail_maps = 1
361-
361+
< *no_plugin_maps*
362362
4. Disable defining mappings for all filetypes by setting a variable: >
363363
:let no_plugin_maps = 1
364364
<

runtime/doc/ft_rust.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
*ft_rust.txt* Filetype plugin for Rust
22

33
==============================================================================
4-
CONTENTS *rust* *ft-rust*
4+
CONTENTS *rust*
55

66
1. Introduction |rust-intro|
77
2. Settings |rust-settings|

runtime/doc/message.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*message.txt* For Vim version 8.0. Last change: 2017 Jan 02
1+
*message.txt* For Vim version 8.0. Last change: 2017 Mar 25
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -768,6 +768,13 @@ Example: >
768768
You tried to execute a command that is neither an Ex command nor
769769
a user-defined command.
770770

771+
*E943* >
772+
Command table needs to be updated, run 'make cmdidxs'
773+
774+
This can only happen when changing the source code, when adding a command in
775+
src/ex_cmds.h. The lookup table then needs to be updated, by running: >
776+
make cmdidxs
777+
771778
==============================================================================
772779
3. Messages *messages*
773780

runtime/doc/options.txt

Lines changed: 2 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: 2017 Mar 09
1+
*options.txt* For Vim version 8.0. Last change: 2017 Mar 22
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -6682,8 +6682,7 @@ A jump table for the options with a short description can be found at |Q_op|.
66826682
Flag passed to the shell to execute "!" and ":!" commands; e.g.,
66836683
"bash.exe -c ls" or "command.com /c dir". For the MS-DOS-like
66846684
systems, the default is set according to the value of 'shell', to
6685-
reduce the need to set this option by the user. It's not used for
6686-
OS/2 (EMX figures this out itself).
6685+
reduce the need to set this option by the user.
66876686
On Unix it can have more than one flag. Each white space separated
66886687
part is passed as an argument to the shell command.
66896688
See |option-backslash| about including spaces and backslashes.

runtime/doc/os_mac.txt

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@ Carbon version of Vim here:
1616
http://macvim.org/
1717

1818
1. Filename Convention |mac-filename|
19-
2. .vimrc an .vim files |mac-vimfile|
20-
3. FAQ |mac-faq|
21-
4. Known Lack |mac-lack|
22-
5. Mac Bug Report |mac-bug|
23-
6. Compiling Vim |mac-compile|
19+
2. .vimrc and .vim files |mac-vimfile|
20+
3. Standard mappings |mac-standard-mappings|
21+
4. FAQ |mac-faq|
22+
5. Known Lack |mac-lack|
23+
6. Mac Bug Report |mac-bug|
24+
7. Compiling Vim |mac-compile|
2425

2526
There was a Mac port for version 3.0 of Vim. Here are the first few lines
2627
from the old file:
@@ -76,7 +77,18 @@ the |'nocompatible'| option is set, otherwise it will only handle mac format
7677
files.
7778

7879
==============================================================================
79-
3. Mac FAQ *mac-faq*
80+
3. Standard mappings *mac-standard-mappings*
81+
82+
The following mappings are available for cut/copy/paste from/to clipboard.
83+
84+
key Normal Visual Insert Description ~
85+
Command-v "*P "-d"*P <C-R>* paste text *<D-v>*
86+
Command-c "*y copy Visual text *<D-c>*
87+
Command-x "*d cut Visual text *<D-x>*
88+
Backspace "*d cut Visual text
89+
90+
==============================================================================
91+
4. Mac FAQ *mac-faq*
8092

8193
On the internet: http://macvim.org/OSX/index.php#FAQ
8294

@@ -99,13 +111,13 @@ A: The following trick works with most shells. Put it in your vimrc file.
99111
let $PATH = matchstr(s:path, 'VIMPATH\zs.\{-}\ze\n')
100112
101113
==============================================================================
102-
4. Mac Lack *mac-lack*
114+
5. Mac Lack *mac-lack*
103115

104116
In a terminal CTRL-^ needs to be entered as Shift-Control-6. CTRL-@ as
105117
Shift-Control-2.
106118

107119
==============================================================================
108-
5. Mac Bug Report *mac-bug*
120+
6. Mac Bug Report *mac-bug*
109121

110122
When reporting any Mac specific bug or feature change, please use the vim-mac
111123
maillist |vim-mac|. However, you need to be subscribed. An alternative is to
@@ -114,7 +126,7 @@ send a message to the current MacVim maintainers:
114126
115127

116128
==============================================================================
117-
6. Compiling Vim *mac-compile*
129+
7. Compiling Vim *mac-compile*
118130

119131
See the file "src/INSTALLmac.txt" that comes with the source files.
120132

runtime/doc/os_win32.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*os_win32.txt* For Vim version 8.0. Last change: 2016 Oct 12
1+
*os_win32.txt* For Vim version 8.0. Last change: 2017 Mar 21
22

33

44
VIM REFERENCE MANUAL by George Reilly

runtime/doc/pattern.txt

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,25 +1085,27 @@ x A single character, with no special meaning, matches itself
10851085
- A character class expression is evaluated to the set of characters
10861086
belonging to that character class. The following character classes
10871087
are supported:
1088-
Name Contents ~
1089-
*[:alnum:]* [:alnum:] ASCII letters and digits
1090-
*[:alpha:]* [:alpha:] ASCII letters
1091-
*[:blank:]* [:blank:] space and tab characters
1092-
*[:cntrl:]* [:cntrl:] control characters
1093-
*[:digit:]* [:digit:] decimal digits
1094-
*[:graph:]* [:graph:] printable characters excluding space
1095-
*[:lower:]* [:lower:] lowercase letters (all letters when
1088+
Name Func Contents ~
1089+
*[:alnum:]* [:alnum:] isalnum ASCII letters and digits
1090+
*[:alpha:]* [:alpha:] isalpha ASCII letters
1091+
*[:blank:]* [:blank:] space and tab
1092+
*[:cntrl:]* [:cntrl:] iscntrl ASCII control characters
1093+
*[:digit:]* [:digit:] decimal digits '0' to '9'
1094+
*[:graph:]* [:graph:] isgraph ASCII printable characters excluding
1095+
space
1096+
*[:lower:]* [:lower:] (1) lowercase letters (all letters when
10961097
'ignorecase' is used)
1097-
*[:print:]* [:print:] printable characters including space
1098-
*[:punct:]* [:punct:] ASCII punctuation characters
1099-
*[:space:]* [:space:] whitespace characters
1100-
*[:upper:]* [:upper:] uppercase letters (all letters when
1098+
*[:print:]* [:print:] (2) printable characters including space
1099+
*[:punct:]* [:punct:] ispunct ASCII punctuation characters
1100+
*[:space:]* [:space:] whitespace characters: space, tab, CR,
1101+
NL, vertical tab, form feed
1102+
*[:upper:]* [:upper:] (3) uppercase letters (all letters when
11011103
'ignorecase' is used)
1102-
*[:xdigit:]* [:xdigit:] hexadecimal digits
1103-
*[:return:]* [:return:] the <CR> character
1104-
*[:tab:]* [:tab:] the <Tab> character
1105-
*[:escape:]* [:escape:] the <Esc> character
1106-
*[:backspace:]* [:backspace:] the <BS> character
1104+
*[:xdigit:]* [:xdigit:] hexadecimal digits: 0-9, a-f, A-F
1105+
*[:return:]* [:return:] the <CR> character
1106+
*[:tab:]* [:tab:] the <Tab> character
1107+
*[:escape:]* [:escape:] the <Esc> character
1108+
*[:backspace:]* [:backspace:] the <BS> character
11071109
The brackets in character class expressions are additional to the
11081110
brackets delimiting a collection. For example, the following is a
11091111
plausible pattern for a UNIX filename: "[-./[:alnum:]_~]\+" That is,
@@ -1114,6 +1116,13 @@ x A single character, with no special meaning, matches itself
11141116
regexp engine. See |two-engines|. In the future these items may
11151117
work for multi-byte characters. For now, to get all "alpha"
11161118
characters you can use: [[:lower:][:upper:]].
1119+
1120+
The "Func" column shows what library function is used. The
1121+
implementation depends on the system. Otherwise:
1122+
(1) Uses islower() for ASCII and Vim builtin rules for other
1123+
characters when built with the |+multi_byte| feature.
1124+
(2) Uses Vim builtin rules
1125+
(3) As with (1) but using isupper()
11171126
*/[[=* *[==]*
11181127
- An equivalence class. This means that characters are matched that
11191128
have almost the same meaning, e.g., when ignoring accents. This

runtime/doc/tags

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3308,6 +3308,9 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX*
33083308
<D-Right> gui_mac.txt /*<D-Right>*
33093309
<D-Up> gui_mac.txt /*<D-Up>*
33103310
<D-`> gui_mac.txt /*<D-`>*
3311+
<D-c> os_mac.txt /*<D-c>*
3312+
<D-v> os_mac.txt /*<D-v>*
3313+
<D-x> os_mac.txt /*<D-x>*
33113314
<Del> change.txt /*<Del>*
33123315
<Down> motion.txt /*<Down>*
33133316
<Drop> change.txt /*<Drop>*
@@ -4565,6 +4568,7 @@ E94 windows.txt /*E94*
45654568
E940 eval.txt /*E940*
45664569
E941 eval.txt /*E941*
45674570
E942 eval.txt /*E942*
4571+
E943 message.txt /*E943*
45684572
E95 message.txt /*E95*
45694573
E96 diff.txt /*E96*
45704574
E97 diff.txt /*E97*
@@ -6197,7 +6201,6 @@ ft-rst-syntax syntax.txt /*ft-rst-syntax*
61976201
ft-ruby-omni insert.txt /*ft-ruby-omni*
61986202
ft-ruby-syntax syntax.txt /*ft-ruby-syntax*
61996203
ft-rust filetype.txt /*ft-rust*
6200-
ft-rust ft_rust.txt /*ft-rust*
62016204
ft-scheme-syntax syntax.txt /*ft-scheme-syntax*
62026205
ft-sdl-syntax syntax.txt /*ft-sdl-syntax*
62036206
ft-sed-syntax syntax.txt /*ft-sed-syntax*
@@ -7240,6 +7243,7 @@ mac-compile os_mac.txt /*mac-compile*
72407243
mac-faq os_mac.txt /*mac-faq*
72417244
mac-filename os_mac.txt /*mac-filename*
72427245
mac-lack os_mac.txt /*mac-lack*
7246+
mac-standard-mappings os_mac.txt /*mac-standard-mappings*
72437247
mac-vimfile os_mac.txt /*mac-vimfile*
72447248
macintosh os_mac.txt /*macintosh*
72457249
macro map.txt /*macro*
@@ -7784,6 +7788,8 @@ nice todo.txt /*nice*
77847788
no-eval-feature eval.txt /*no-eval-feature*
77857789
no-type-checking eval.txt /*no-type-checking*
77867790
no_buffers_menu gui.txt /*no_buffers_menu*
7791+
no_mail_maps filetype.txt /*no_mail_maps*
7792+
no_plugin_maps filetype.txt /*no_plugin_maps*
77877793
non-greedy pattern.txt /*non-greedy*
77887794
non-zero-arg eval.txt /*non-zero-arg*
77897795
none-variable eval.txt /*none-variable*

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 8.0. Last change: 2017 Mar 21
1+
*todo.txt* For Vim version 8.0. Last change: 2017 Mar 29
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -110,8 +110,8 @@ manager. Problem with Motif?
110110

111111
Memory leak in test97? The string is actually freed. Weird.
112112

113-
Patch to make "start" work better: Use ShellExecute in !start (Katsuya Hino,
114-
#1570)
113+
Patch for deleting the quickfix lists and a test for it. (Yegappan, 2017 Mar
114+
21)
115115

116116
Add a toolbar in the terminal. Can be global, above all windows, or specific
117117
for one window.
@@ -122,6 +122,8 @@ Use tb_set(winid, [{'text': 'stop', 'cb': callback, 'hi': 'Green'}])
122122
json_encode(): should convert to utf-8. (Nikolai Pavlov, 2016 Jan 23)
123123
What if there is an invalid character?
124124

125+
Patch for broken foldtext. (Christian 2017 Mar 22, #1567, 2nd one)
126+
125127
Json string with trailing \u should be an error. (Lcd)
126128

127129
On MS-Windows with 'clipboard' set to "unnamed" this doesn't work to double
@@ -148,6 +150,9 @@ Another example in #1309
148150
Patch to change all use of &sw to shiftwidth(). (Tyru, 2017 Feb 19)
149151
Wait until maintainers integrate it.
150152

153+
Patch to change mb_char2len() to utf_char2len(c) when known to use UTF.
154+
(Dominique, 2017 Mar 21, #1582)
155+
151156
Completion for user-defined commands does not work if a few characters were
152157
already typed. (Dominique, 2017 Jan 26)
153158

@@ -157,6 +162,9 @@ when writing viminfo (and the delete was the most recent action). #1339
157162
Suggestion to improve pt-br spell checking. (Marcelo D Montu, 2016 Dec 15,
158163
#1330)
159164

165+
Patch to Modernize GtkForm Implmentation. (Kazuki Kuriyama, 2017 Mar 26)
166+
Any objections?
167+
160168
Error in test_startup_utf8 on Solaris. (Danek Duvall, 2016 Aug 17)
161169

162170
Completion for :!cmd shows each match twice. #1435
@@ -341,14 +349,6 @@ Jul 25, #948)
341349
Patch to fix wrong encoding of error message on Cygwin/MSYS terminal.
342350
(Ken Takata, 2016 Oct 4)
343351

344-
Patch to introduce 'cmdencoding'. (Ken Takata, Aug 18?)
345-
Better help Aug 19.
346-
Problem: applies to too many commands, such as :cbuffer.
347-
Updated patch with three options, 2016 Sep 8.
348-
Win32: When running ":make" and 'encoding' differs from the system locale,
349-
the output should be converted. Esp. when 'encoding' is "utf-8". (Yongwei
350-
Wu) Should we use 'termencoding' for this?
351-
352352
Patch to add 'systemencoding', convert between 'encoding' and this for file
353353
names, shell commands and the like. (Kikuchan, 2010 Oct 14)
354354
Assume the system converts between the actual encoding of the filesystem to
@@ -421,7 +421,7 @@ When doing "vi buf.md" a BufNew autocommand for *.md is not triggered.
421421
Because of using the initial buffer? (Dun Peal, 2016 May 12)
422422

423423
Patch to add the :bvimgrep command. (Christian Brabandt, 2014 Nov 12)
424-
Updated 2016 Jun 10, #858
424+
Updated 2016 Jun 10, #858 Update 2017 Mar 28: use <buffer>
425425

426426
Add redrawtabline command. (Naruhiko Nishino, 2016 Jun 11)
427427

runtime/doc/usr_41.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*usr_41.txt* For Vim version 8.0. Last change: 2017 Mar 18
1+
*usr_41.txt* For Vim version 8.0. Last change: 2017 Mar 28
22

33
VIM USER MANUAL - by Bram Moolenaar
44

@@ -2277,8 +2277,8 @@ plugin for the mail filetype: >
22772277
endif
22782278
22792279
Two global variables are used:
2280-
no_plugin_maps disables mappings for all filetype plugins
2281-
no_mail_maps disables mappings for a specific filetype
2280+
|no_plugin_maps| disables mappings for all filetype plugins
2281+
|no_mail_maps| disables mappings for the "mail" filetype
22822282

22832283

22842284
USER COMMANDS

runtime/filetype.vim

Lines changed: 3 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 <[email protected]>
4-
" Last Change: 2017 Mar 13
4+
" Last Change: 2017 Mar 27
55

66
" Listen very carefully, I will say this only once
77
if exists("did_load_filetypes")
@@ -288,7 +288,8 @@ au BufNewFile,BufRead *.bib setf bib
288288
au BufNewFile,BufRead *.bst setf bst
289289

290290
" BIND configuration
291-
au BufNewFile,BufRead named.conf,rndc.conf setf named
291+
" sudoedit uses namedXXXX.conf
292+
au BufNewFile,BufRead named*.conf,rndc*.conf setf named
292293

293294
" BIND zone
294295
au BufNewFile,BufRead named.root setf bindzone

0 commit comments

Comments
 (0)