aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2017-02-01 15:30:51 -0500
committerJames McCoy <jamessan@jamessan.com>2017-02-01 18:34:58 -0500
commita5b875fe8677addfef2f295872eefcf217285da3 (patch)
treec8eea48d73ab8f21e910c7441bd772c389403450 /runtime/doc
parent4e47568f89c4b937077d017baddd79de012694d8 (diff)
downloadrneovim-a5b875fe8677addfef2f295872eefcf217285da3.tar.gz
rneovim-a5b875fe8677addfef2f295872eefcf217285da3.tar.bz2
rneovim-a5b875fe8677addfef2f295872eefcf217285da3.zip
vim-patch:e18dbe8
Updated runtime files. https://github.com/vim/vim/commit/e18dbe865d190e74fb5d43ac8bc6ac22507d0223
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/eval.txt12
-rw-r--r--runtime/doc/indent.txt2
-rw-r--r--runtime/doc/options.txt4
-rw-r--r--runtime/doc/quickfix.txt16
4 files changed, 23 insertions, 11 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index b288662306..edf06959a2 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -784,8 +784,16 @@ equal" and "is" can be used. This compares the key/values of the |Dictionary|
recursively. Ignoring case means case is ignored when comparing item values.
*E694*
-A |Funcref| can only be compared with a |Funcref| and only "equal" and "not
-equal" can be used. Case is never ignored.
+A |Funcref| can only be compared with a |Funcref| and only "equal", "not
+equal", "is" and "isnot" can be used. Case is never ignored. Whether
+arguments or a Dictionary are bound (with a partial) matters. The
+Dictionaries must also be equal (or the same, in case of "is") and the
+arguments must be equal (or the same).
+
+To compare Funcrefs to see if they refer to the same function, ignoring bound
+Dictionary and arguments, use |get()| to get the function name: >
+ if get(Part1, 'name') == get(Part2, 'name')
+ " Part1 and Part2 refer to the same function
When using "is" or "isnot" with a |List| or a |Dictionary| this checks if the
expressions are referring to the same |List| or |Dictionary| instance. A copy
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index 6e96d9b816..496ccbc703 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -810,7 +810,7 @@ PHP indenting can be altered in several ways by modifying the values of some
global variables:
*php-comment* *PHP_autoformatcomment*
-To not enable auto-formating of comments by default (if you want to use your
+To not enable auto-formatting of comments by default (if you want to use your
own 'formatoptions'): >
:let g:PHP_autoformatcomment = 0
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 7bc6f25638..e4c5299305 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1238,8 +1238,8 @@ A jump table for the options with a short description can be found at |Q_op|.
Only non-printable keys are allowed.
The key can be specified as a single character, but it is difficult to
type. The preferred way is to use the <> notation. Examples: >
- :set cedit=<C-Y>
- :set cedit=<Esc>
+ :exe "set cedit=\<C-Y>"
+ :exe "set cedit=\<Esc>"
< |Nvi| also has this option, but it only uses the first character.
See |cmdwin|.
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index e94723f337..0b7907e364 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -30,10 +30,14 @@ positions in files. For example, |:vimgrep| finds pattern matches. You can
use the positions in a script with the |getqflist()| function. Thus you can
do a lot more than the edit/compile/fix cycle!
-You should save your compiler's error messages to a file and start vim with
-"vim -q filename". An easy way to do this is with the |:make| command (see
-below). The 'errorformat' option should be set to match the error messages
-from your compiler (see |errorformat| below).
+If you have the error messages in a file you can start Vim with: >
+ vim -q filename
+
+From inside Vim an easy way to run a command and handle the output is with the
+|:make| command (see below).
+
+The 'errorformat' option should be set to match the error messages from your
+compiler (see |errorformat| below).
*location-list* *E776*
A location list is similar to a quickfix list and contains a list of positions
@@ -42,8 +46,8 @@ have a separate location list. A location list can be associated with only
one window. The location list is independent of the quickfix list.
When a window with a location list is split, the new window gets a copy of the
-location list. When there are no references to a location list, the location
-list is destroyed.
+location list. When there are no longer any references to a location list,
+the location list is destroyed.
The following quickfix commands can be used. The location list commands are
similar to the quickfix commands, replacing the 'c' prefix in the quickfix