aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorKillTheMule <KillTheMule@users.noreply.github.com>2016-05-03 21:00:18 +0200
committerKillTheMule <KillTheMule@users.noreply.github.com>2016-05-03 21:03:17 +0200
commit367b1893e7efab3c97bb7df9c07703d076a94542 (patch)
tree64f3a9ebb2a2b3fc17d0b638e0e37a0814c50c1f /runtime/doc
parentc535cc7dde493f405d81cfb9d331405d9b0f097a (diff)
downloadrneovim-367b1893e7efab3c97bb7df9c07703d076a94542.tar.gz
rneovim-367b1893e7efab3c97bb7df9c07703d076a94542.tar.bz2
rneovim-367b1893e7efab3c97bb7df9c07703d076a94542.zip
vim-patch:b4ff518
Updated runtime files. https://github.com/vim/vim/commit/b4ff518d95aa57c2f8c0568c915035bef849581b Missing files: runtime/doc/tags, runtime/doc/todo.txt. Changes to runtime/doc/if_pyth.txt, runtime/doc/options.txt and runtime/doc/quickref.txt did not aply. Excluded runtime/syntax/vim.vim.
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/diff.txt6
-rw-r--r--runtime/doc/quickref.txt6
-rw-r--r--runtime/doc/syntax.txt5
-rw-r--r--runtime/doc/vi_diff.txt2
4 files changed, 12 insertions, 7 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index 77603b1e58..12bc655edc 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -1,4 +1,4 @@
-*diff.txt* For Vim version 7.4. Last change: 2015 Jul 03
+*diff.txt* For Vim version 7.4. Last change: 2015 Nov 01
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -174,8 +174,8 @@ hidden buffers. You can use ":hide" to close a window without unloading the
buffer. If you don't want a buffer to remain used for the diff do ":set
nodiff" before hiding it.
- *:diffu* *:diffupdate*
-:diffu[pdate][!] Update the diff highlighting and folds.
+ *:dif* *:diffupdate*
+:dif[fupdate][!] Update the diff highlighting and folds.
Vim attempts to keep the differences updated when you make changes to the
text. This mostly takes care of inserted and deleted lines. Changes within a
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 66773875c3..8e40628e25 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1,4 +1,4 @@
-*quickref.txt* For Vim version 7.4. Last change: 2015 Jul 21
+*quickref.txt* For Vim version 7.4. Last change: 2015 Nov 10
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -800,6 +800,7 @@ Short explanation of each option: *option-list*
'patchexpr' 'pex' expression used to patch a file
'patchmode' 'pm' keep the oldest version of a file
'path' 'pa' list of directories searched with "gf" et.al.
+'perldll' name of the Perl dynamic library
'preserveindent' 'pi' preserve the indent structure when reindenting
'previewheight' 'pvh' height of the preview window
'previewwindow' 'pvw' identifies the preview window
@@ -812,6 +813,8 @@ Short explanation of each option: *option-list*
'printmbfont' 'pmbfn' font names to be used for CJK output of :hardcopy
'printoptions' 'popt' controls the format of :hardcopy output
'pumheight' 'ph' maximum height of the popup menu
+'pythondll' name of the Python 2 dynamic library
+'pythonthreedll' name of the Python 3 dynamic library
'quoteescape' 'qe' escape characters used in a string
'readonly' 'ro' disallow writing the buffer
'redrawtime' 'rdt' timeout for 'hlsearch' and |:match| highlighting
@@ -822,6 +825,7 @@ Short explanation of each option: *option-list*
'revins' 'ri' inserting characters will work backwards
'rightleft' 'rl' window is right-to-left oriented
'rightleftcmd' 'rlc' commands for which editing works right-to-left
+'rubydll' name of the Ruby dynamic library
'ruler' 'ru' show cursor line and column in the status line
'rulerformat' 'ruf' custom format for the ruler
'runtimepath' 'rtp' list of directories used for runtime files
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 3e844c84a1..01bfc115a3 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt* For Vim version 7.4. Last change: 2015 Oct 17
+*syntax.txt* For Vim version 7.4. Last change: 2015 Nov 05
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1077,6 +1077,7 @@ Most of things are same as |ft-c-syntax|.
Variable Highlight ~
cpp_no_cpp11 don't highlight C++11 standard items
+cpp_no_cpp14 don't highlight C++14 standard items
CSH *csh.vim* *ft-csh-syntax*
@@ -4148,7 +4149,7 @@ example, for instance, can be done like this: >
As can be seen here, the \z actually does double duty. In the start pattern,
it marks the "\(\I\i*\)" sub-expression as external; in the end pattern, it
-changes the \1 back-reference into an external reference referring to the
+changes the \z1 back-reference into an external reference referring to the
first external sub-expression in the start pattern. External references can
also be used in skip patterns: >
:syn region foo start="start \(\I\i*\)" skip="not end \z1" end="end \z1"
diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt
index 38248d1b22..ec35694c9e 100644
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -1,4 +1,4 @@
-*vi_diff.txt* For Vim version 7.4. Last change: 2013 Aug 22
+*vi_diff.txt* For Vim version 7.4. Last change: 2015 Nov 01
VIM REFERENCE MANUAL by Bram Moolenaar