aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/cmdline.txt4
-rw-r--r--runtime/doc/options.txt7
-rw-r--r--runtime/indent/php.vim2
-rw-r--r--runtime/syntax/php.vim2
4 files changed, 11 insertions, 4 deletions
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index a3b5f6b22a..5f4f128329 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -416,6 +416,10 @@ a previous version <Esc> was used). In the pattern standard wildcards '*' and
'?' are accepted when matching file names. '*' matches any string, '?'
matches exactly one character.
+When repeating 'wildchar' or CTRL-N you cycle through the matches, eventually
+ending up back to what was typed. If the first match is not what you wanted,
+you can use <S-Tab> or CTRL-P to go straight back to what you typed.
+
The 'wildignorecase' option can be set to ignore case in filenames.
The 'wildmenu' option can be set to show the matches just above the command
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 82be2f9033..b2efd9287d 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1827,8 +1827,11 @@ A jump table for the options with a short description can be found at |Q_op|.
contain a list of words. This can be one word per line, or several
words per line, separated by non-keyword characters (white space is
preferred). Maximum line length is 510 bytes.
- When this option is empty, or an entry "spell" is present, spell
- checking is enabled the currently active spelling is used. |spell|
+
+ When this option is empty or an entry "spell" is present, and spell
+ checking is enabled, words in the word lists for the currently active
+ 'spelllang' are used. See |spell|.
+
To include a comma in a file name precede it with a backslash. Spaces
after a comma are ignored, otherwise spaces are included in the file
name. See |option-backslash| about using backslashes.
diff --git a/runtime/indent/php.vim b/runtime/indent/php.vim
index b0430dea8d..5dee6c9f47 100644
--- a/runtime/indent/php.vim
+++ b/runtime/indent/php.vim
@@ -12,7 +12,7 @@
" A fully commented version of this file is available on github
"
"
-" If you find a bug, please open a ticket on github.org
+" If you find a bug, please open a ticket on github.com
" ( https://github.com/2072/PHP-Indenting-for-VIm/issues ) with an example of
" code that breaks the algorithm.
"
diff --git a/runtime/syntax/php.vim b/runtime/syntax/php.vim
index 5a7a2c3794..1c5c24e56b 100644
--- a/runtime/syntax/php.vim
+++ b/runtime/syntax/php.vim
@@ -261,7 +261,7 @@ syn keyword phpStatement return break continue exit goto yield contained
syn keyword phpKeyword var const contained
" Type
-syn keyword phpType bool boolean int integer real double float string array object NULL callable iterable contained
+syn keyword phpType void bool boolean int integer real double float string array object NULL callable iterable contained
" Structure
syn keyword phpStructure namespace extends implements instanceof parent self contained