aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2016-06-22 20:24:20 -0400
committerJames McCoy <jamessan@jamessan.com>2016-07-08 01:45:20 -0400
commit0b2633b1bb3a73dae7679bf9bec0dc9f5e75fe44 (patch)
tree25016229490cea091aaa1dc0097f14cd530fdf2f
parent4bd14e921b7ac56560f53d54aba1380bc7bc0689 (diff)
downloadrneovim-0b2633b1bb3a73dae7679bf9bec0dc9f5e75fe44.tar.gz
rneovim-0b2633b1bb3a73dae7679bf9bec0dc9f5e75fe44.tar.bz2
rneovim-0b2633b1bb3a73dae7679bf9bec0dc9f5e75fe44.zip
vim-patch:e18c0b3
Updated runtime files. https://github.com/vim/vim/commit/e18c0b39815c5a746887a509c2cd9f11fadaba07 Ignore changes to * doc/channel.txt, runtime/tools/demoserver.py: Channel related changes * doc/if_lua.txt, doc/if_perl.txt, doc/if_pyth.txt, doc/if_ruby.txt, doc/if_tcl.txt, doc/todo.txt: Irrelevant to Neovim * doc/tags: Generated at build time
-rw-r--r--runtime/doc/helphelp.txt5
-rw-r--r--runtime/doc/index.txt3
-rw-r--r--runtime/doc/quickfix.txt6
-rw-r--r--runtime/doc/repeat.txt11
-rw-r--r--runtime/doc/syntax.txt8
-rw-r--r--runtime/doc/usr_41.txt6
-rw-r--r--runtime/doc/various.txt3
-rw-r--r--runtime/optwin.vim2
8 files changed, 29 insertions, 15 deletions
diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt
index f3533b8815..2a098544c6 100644
--- a/runtime/doc/helphelp.txt
+++ b/runtime/doc/helphelp.txt
@@ -1,4 +1,4 @@
-*helphelp.txt* For Vim version 7.4. Last change: 2014 Sep 19
+*helphelp.txt* For Vim version 7.4. Last change: 2016 Mar 12
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -188,6 +188,9 @@ command: >
*E154* *E150* *E151* *E152* *E153* *E670*
:helpt[ags] [++t] {dir}
Generate the help tags file(s) for directory {dir}.
+ When {dir} is ALL then all "doc" directories in
+ 'runtimepath' will be used.
+
All "*.txt" and "*.??x" files in the directory and
sub-directories are scanned for a help tag definition
in between stars. The "*.??x" files are for
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index eff03c8daf..bd2df5d1e5 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1,4 +1,4 @@
-*index.txt* For Vim version 7.4. Last change: 2016 Mar 04
+*index.txt* For Vim version 7.4. Last change: 2016 Mar 12
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1379,6 +1379,7 @@ tag command action ~
|:ounmenu| :ounme[nu] remove menu for Operator-pending mode
|:ownsyntax| :ow[nsyntax] set new local syntax highlight for this window
|:packadd| :pa[ckadd] add a plugin from 'packpath'
+|:packloadall| :packl[oadall] load all packages under 'packpath'
|:pclose| :pc[lose] close preview window
|:pedit| :ped[it] edit file in the preview window
|:print| :p[rint] print lines
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 317226108f..3b54faf18e 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1,4 +1,4 @@
-*quickfix.txt* For Vim version 7.4. Last change: 2016 Jan 21
+*quickfix.txt* For Vim version 7.4. Last change: 2016 Mar 19
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -49,6 +49,10 @@ The following quickfix commands can be used. The location list commands are
similar to the quickfix commands, replacing the 'c' prefix in the quickfix
command with 'l'.
+ *E924*
+If the current window was closed by an |autocommand| while processing a
+location list command, it will be aborted.
+
*:cc*
:cc[!] [nr] Display error [nr]. If [nr] is omitted, the same
error is displayed again. Without [!] this doesn't
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index 5357090b1b..2a20a42c16 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -1,4 +1,4 @@
-*repeat.txt* For Vim version 7.4. Last change: 2016 Mar 09
+*repeat.txt* For Vim version 7.4. Last change: 2016 Mar 15
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -240,15 +240,18 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
Also see |pack-add|.
+ *:packl* *:packloadall*
:packloadall[!] Load all packages in the "start" directories under
'packpath'. The directories found are added to
'runtimepath'.
- This normally done during startup, after loading your
- .vimrc file. With this command it can be done
- earlier.
+ This is normally done automatically during startup,
+ after loading your .vimrc file. With this command it
+ can be done earlier.
Packages will be loaded only once. After this command
it won't happen again. When the optional ! is added
this command will load packages even when done before.
+ An Error only causes sourcing the script where it
+ happens to be aborted, further plugins will be loaded.
See |packages|.
:scripte[ncoding] [encoding] *:scripte* *:scriptencoding* *E167*
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index b6f1e4d856..9bec855190 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt* For Vim version 7.4. Last change: 2016 Feb 25
+*syntax.txt* For Vim version 7.4. Last change: 2016 Mar 12
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -4518,9 +4518,9 @@ in their own color.
:colo[rscheme] {name} Load color scheme {name}. This searches 'runtimepath'
for the file "colors/{name}.vim". The first one that
is found is loaded.
- To see the name of the currently active color scheme: >
- :colo
-< The name is also stored in the g:colors_name variable.
+ Also searches all plugins in 'packpath', first below
+ "start" and then under "opt".
+
Doesn't work recursively, thus you can't use
":colorscheme" in a color scheme script.
After the color scheme has been loaded the
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index a14e722328..f57e237a01 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1,4 +1,4 @@
-*usr_41.txt* For Vim version 7.4. Last change: 2016 Feb 14
+*usr_41.txt* For Vim version 7.4. Last change: 2016 Mar 15
VIM USER MANUAL - by Bram Moolenaar
@@ -889,9 +889,11 @@ Mappings: *mapping-functions*
wildmenumode() check if the wildmode is active
Testing: *test-functions*
- assert_equal() assert that two expressions values are equal
+ assert_equal() assert that two expressions values are equal
assert_false() assert that an expression is false
assert_true() assert that an expression is true
+ assert_exception() assert that a command throws an exception
+ assert_fails() assert that a function call fails
Various: *various-functions*
mode() get current editing mode
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index b3e5e2db03..eb813866da 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt* For Vim version 7.4. Last change: 2016 Feb 27
+*various.txt* For Vim version 7.4. Last change: 2016 Mar 20
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -375,6 +375,7 @@ B *+termguicolors* 24-bit color in xterm-compatible terminals support
N *+termresponse* support for |t_RV| and |v:termresponse|
N *+textobjects* |text-objects| selection
*+tgetent* non-Unix only: able to use external termcap
+N *+timers* the |timer_start()| function
N *+title* Setting the window 'title' and 'icon'
N *+toolbar* |gui-toolbar|
N *+user_commands* User-defined commands. |user-commands|
diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index 7e58c76ec4..bfcf4d5294 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -1,7 +1,7 @@
" These commands create the option window.
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2016 Feb 21
+" Last Change: 2016 Mar 19
" If there already is an option window, jump to that one.
if bufwinnr("option-window") > 0