Skip to content

Commit

Permalink
vim-patch:214641f77df6
Browse files Browse the repository at this point in the history
Runtime file updates.

vim/vim@214641f

N/A:
vim-patch:26a280c47a1c
  • Loading branch information
justinmk committed Nov 6, 2017
1 parent 8f03014 commit 93fb738
Show file tree
Hide file tree
Showing 183 changed files with 745 additions and 580 deletions.
4 changes: 2 additions & 2 deletions runtime/autoload/javascriptcomplete.vim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" Vim completion script
" Language: Java Script
" Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
" Last Change: 2006 Apr 30
" Last Change: 2017 Mar 04

function! javascriptcomplete#CompleteJS(findstart, base)
if a:findstart
Expand Down Expand Up @@ -563,7 +563,7 @@ function! javascriptcomplete#CompleteJS(findstart, base)
for i in arguments
let g:ia = i
let f_elements = matchlist(i, 'function\s\+\(\k\+\)\s*(\(.\{-}\))')
if len(f_elements) == 3
if len(f_elements) >= 3
let b:js_menuinfo[f_elements[1].'('] = f_elements[2]
endif
endfor
Expand Down
6 changes: 3 additions & 3 deletions runtime/compiler/bdf.vim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" Vim compiler file
" Compiler: BDF to PCF Conversion
" Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2006-04-19
" Compiler: BDF to PCF Conversion
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2006-04-19

if exists("current_compiler")
finish
Expand Down
6 changes: 3 additions & 3 deletions runtime/compiler/gcc.vim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" Vim compiler file
" Compiler: GNU C Compiler
" Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2010-10-14
" Compiler: GNU C Compiler
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2010-10-14
" added line suggested by Anton Lindqvist 2016 Mar 31

if exists("current_compiler")
Expand Down
6 changes: 3 additions & 3 deletions runtime/compiler/rst.vim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" Vim compiler file
" Compiler: reStructuredText Documentation Format
" Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2006-04-19
" Compiler: reStructuredText Documentation Format
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2006-04-19

if exists("current_compiler")
finish
Expand Down
12 changes: 6 additions & 6 deletions runtime/doc/eval.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3197,7 +3197,7 @@ execute({command} [, {silent}]) *execute()*
"" no `:silent` used
"silent" `:silent` used
"silent!" `:silent!` used
The default is 'silent'. Note that with "silent!", unlike
The default is "silent". Note that with "silent!", unlike
`:redir`, error messages are dropped.

To get a list of lines use |split()| on the result: >
Expand Down Expand Up @@ -3775,10 +3775,10 @@ get({dict}, {key} [, {default}])
get({func}, {what})
Get item {what} from Funcref {func}. Possible values for
{what} are:
'name' The function name
'func' The function
'dict' The dictionary
'args' The list with arguments
"name" The function name
"func" The function
"dict" The dictionary
"args" The list with arguments

*getbufinfo()*
getbufinfo([{expr}])
Expand Down Expand Up @@ -7657,7 +7657,7 @@ taglist({expr}[, {filename}]) *taglist()*
may appear, they give the name of the entity the tag is
contained in.

The ex-command 'cmd' can be either an ex search pattern, a
The ex-command "cmd" can be either an ex search pattern, a
line number or a line number followed by a byte number.

If there are no matching tags, then an empty list is returned.
Expand Down
4 changes: 2 additions & 2 deletions runtime/doc/fold.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ whichever is lower. These are empty or white lines and lines starting
with a character in 'foldignore'. White space is skipped before checking for
characters in 'foldignore'. For C use "#" to ignore preprocessor lines.

When you want to ignore lines in another way, use the 'expr' method. The
When you want to ignore lines in another way, use the "expr" method. The
|indent()| function can be used in 'foldexpr' to get the indent of a line.


Expand Down Expand Up @@ -133,7 +133,7 @@ fold level. But note that foldlevel() may return -1 if the level is not known
yet. And it returns the level at the start of the line, while a fold might
end in that line.

It may happened that folds are not updated properly. You can use |zx| or |zX|
It may happen that folds are not updated properly. You can use |zx| or |zX|
to force updating folds.


Expand Down
2 changes: 1 addition & 1 deletion runtime/doc/helphelp.txt
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ the applicable Vim version. The last field specifies the last modification
date of the file. Each field is separated by a tab.

At the bottom of the help file, place a Vim modeline to set the 'textwidth'
and 'tabstop' options and the 'filetype' to 'help'. Never set a global option
and 'tabstop' options and the 'filetype' to "help". Never set a global option
in such a modeline, that can have consequences undesired by whoever reads that
help.

Expand Down
2 changes: 1 addition & 1 deletion runtime/doc/if_ruby.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ To see what version of Ruby you have: >

*:rubyfile* *:rubyf*
:rubyf[ile] {file} Execute the Ruby script in {file}. This is the same as
":ruby load 'file'", but allows file name completion.
`:ruby load 'file'`, but allows file name completion.

Executing Ruby commands is not possible in the |sandbox|.

Expand Down
6 changes: 4 additions & 2 deletions runtime/doc/index.txt
Original file line number Diff line number Diff line change
Expand Up @@ -993,10 +993,12 @@ tag command action in Command-line editing mode ~
|c_<CR>| <CR> execute entered command
|c_CTRL-M| CTRL-M same as <CR>
|c_CTRL-N| CTRL-N after using 'wildchar' with multiple matches:
go to next match, otherwise: same as <Down>
go to next match, otherwise: recall older
command-line from history.
CTRL-O not used
|c_CTRL-P| CTRL-P after using 'wildchar' with multiple matches:
go to previous match, otherwise: same as <Up>
go to previous match, otherwise: recall older
command-line from history.
|c_CTRL-Q| CTRL-Q same as CTRL-V, unless it's used for terminal
control flow
|c_CTRL-R| CTRL-R {0-9a-z"%#*:= CTRL-F CTRL-P CTRL-W CTRL-A}
Expand Down
2 changes: 1 addition & 1 deletion runtime/doc/insert.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1077,7 +1077,7 @@ items:
empty when non-zero this match will be added even when it is
an empty string

All of these except 'icase', 'dup' and 'empty' must be a string. If an item
All of these except "icase", "dup" and "empty" must be a string. If an item
does not meet these requirements then an error message is given and further
items in the list are not used. You can mix string and Dictionary items in
the returned list.
Expand Down
1 change: 1 addition & 0 deletions runtime/doc/mlang.txt
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ Send an e-mail to the Vim maintainer <maintainer@vim.org>.
special characters like "&" and "<Tab>" need to be
included. Spaces and dots need to be escaped with a
backslash, just like in other |:menu| commands.
Case in {english} is ignored.

See the $VIMRUNTIME/lang directory for examples.

Expand Down
2 changes: 1 addition & 1 deletion runtime/doc/options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5668,7 +5668,7 @@ A jump table for the options with a short description can be found at |Q_op|.
word. The expression must evaluate to a List of
Lists, each with a suggestion and a score.
Example:
[['the', 33], ['that', 44]]
[['the', 33], ['that', 44]] ~
Set 'verbose' and use |z=| to see the scores that the
internal methods use. A lower score is better.
This may invoke |spellsuggest()| if you temporarily
Expand Down
11 changes: 7 additions & 4 deletions runtime/doc/pattern.txt
Original file line number Diff line number Diff line change
Expand Up @@ -853,10 +853,13 @@ $ At end of pattern or in front of "\|", "\)" or "\n" ('magic' on):
\%V Match inside the Visual area. When Visual mode has already been
stopped match in the area that |gv| would reselect.
This is a |/zero-width| match. To make sure the whole pattern is
inside the Visual area put it at the start and end of the pattern,
e.g.: >
/\%Vfoo.*bar\%V
< Only works for the current buffer.
inside the Visual area put it at the start and just before the end of
the pattern, e.g.: >
/\%Vfoo.*ba\%Vr
< This works if "foo bar" (or more) was Visually selected. This: >
/\%Vfoo.*ba\%Vr
< would match "foo bar" if the Visual selection continues after the "r".
Only works for the current buffer.

*/\%#* *cursor-position*
\%# Matches with the cursor position. Only works when matching in a
Expand Down
2 changes: 1 addition & 1 deletion runtime/doc/quickfix.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1362,7 +1362,7 @@ prints information about entering a directory in the form "Making all in dir".
Making all in dir2 ./dir1/dir2

This can be solved by printing absolute directories in the "enter directory"
message or by printing "leave directory" messages..
message or by printing "leave directory" messages.

To avoid this problem, ensure to print absolute directory names and "leave
directory" messages.
Expand Down
2 changes: 1 addition & 1 deletion runtime/doc/scroll.txt
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ past its buffer's limits.
However, if a 'scrollbind' window that has a relative offset that is past its
buffer's limits is given the cursor focus, the other 'scrollbind' windows must
jump to a location where the current window's relative offset is valid. This
behavior can be changed by clearing the 'jump' flag from the 'scrollopt'
behavior can be changed by clearing the "jump" flag from the 'scrollopt'
option.

*syncbind* *:syncbind* *:sync*
Expand Down
4 changes: 2 additions & 2 deletions runtime/doc/syntax.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2616,9 +2616,9 @@ later, and part earlier) adds.

RESTRUCTURED TEXT *rst.vim* *ft-rst-syntax*

You may set what syntax definitions should be used for code blocks via
You may set what syntax definitions should be used for code blocks via >
let rst_syntax_code_list = ['vim', 'lisp', ...]

<

REXX *rexx.vim* *ft-rexx-syntax*

Expand Down
2 changes: 1 addition & 1 deletion runtime/doc/usr_02.txt
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ Summary: *help-summary* >
22) Autocommand events can be found by their name: >
:help BufWinLeave
< To see all possible events: >
:help autocommands-events
:help autocommand-events
23) Command-line switches always start with "-". So for the help of the -f
command switch of Vim use: >
Expand Down
6 changes: 4 additions & 2 deletions runtime/doc/usr_41.txt
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Then there is the ":let i += 1" command. This does the same thing as
to the same variable.

The example was given to explain the commands, but would you really want to
make such a loop it can be written much more compact: >
make such a loop, it can be written much more compact: >
:for i in range(1, 4)
: echo "count is" i
Expand Down Expand Up @@ -692,6 +692,7 @@ Other computation: *bitwise-function*
Variables: *var-functions*
type() type of a variable
islocked() check if a variable is locked
funcref() get a Funcref for a function reference
function() get a Funcref for a function name
getbufvar() get a variable value from a specific buffer
setbufvar() set a variable in a specific buffer
Expand Down Expand Up @@ -883,6 +884,7 @@ GUI: *gui-functions*
getfontname() get name of current font being used
getwinposx() X position of the GUI Vim window
getwinposy() Y position of the GUI Vim window
balloon_show() set the balloon content

Vim server: *server-functions*
serverlist() return the list of server names
Expand Down Expand Up @@ -1541,7 +1543,7 @@ WHITE SPACE
Blank lines are allowed and ignored.

Leading whitespace characters (blanks and TABs) are always ignored. The
whitespaces between parameters (e.g. between the 'set' and the 'cpoptions' in
whitespaces between parameters (e.g. between the "set" and the "cpoptions" in
the example below) are reduced to one blank character and plays the role of a
separator, the whitespaces after the last (visible) character may or may not
be ignored depending on the situation, see below.
Expand Down
5 changes: 4 additions & 1 deletion runtime/filetype.vim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" Vim support file to detect file types
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2017 Jan 06
" Last Change: 2017 Mar 04

" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
Expand Down Expand Up @@ -2276,6 +2276,9 @@ au BufNewFile,BufRead .tidyrc,tidyrc setf tidy
" TF mud client
au BufNewFile,BufRead *.tf,.tfrc,tfrc setf tf

" tmux configuration
au BufNewFile,BufRead tmux*.conf setf tmux

" TPP - Text Presentation Program
au BufNewFile,BufReadPost *.tpp setf tpp

Expand Down
6 changes: 3 additions & 3 deletions runtime/ftplugin/a2ps.vim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: a2ps(1) configuration file
" Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09
" Language: a2ps(1) configuration file
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09

if exists("b:did_ftplugin")
finish
Expand Down
6 changes: 3 additions & 3 deletions runtime/ftplugin/alsaconf.vim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: alsaconf(8) configuration file
" Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09
" Language: alsaconf(8) configuration file
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09

if exists("b:did_ftplugin")
finish
Expand Down
6 changes: 3 additions & 3 deletions runtime/ftplugin/arch.vim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: GNU Arch inventory file
" Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09
" Language: GNU Arch inventory file
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09

if exists("b:did_ftplugin")
finish
Expand Down
6 changes: 3 additions & 3 deletions runtime/ftplugin/automake.vim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: Automake
" Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09
" Language: Automake
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09

if exists("b:did_ftplugin")
finish
Expand Down
6 changes: 3 additions & 3 deletions runtime/ftplugin/bdf.vim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: BDF font definition
" Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09
" Language: BDF font definition
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09

if exists("b:did_ftplugin")
finish
Expand Down
6 changes: 3 additions & 3 deletions runtime/ftplugin/calendar.vim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: calendar(1) input file
" Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09
" Language: calendar(1) input file
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09

if exists("b:did_ftplugin")
finish
Expand Down
4 changes: 2 additions & 2 deletions runtime/ftplugin/cdrdaoconf.vim
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
" Vim filetype plugin file
" Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2007-12-04
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2007-12-04

if exists("b:did_ftplugin")
finish
Expand Down
6 changes: 3 additions & 3 deletions runtime/ftplugin/conf.vim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: generic configuration file
" Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09
" Language: generic configuration file
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09

if exists("b:did_ftplugin")
finish
Expand Down
6 changes: 3 additions & 3 deletions runtime/ftplugin/crm.vim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: CRM114
" Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09
" Language: CRM114
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09

if exists("b:did_ftplugin")
finish
Expand Down
6 changes: 3 additions & 3 deletions runtime/ftplugin/css.vim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: CSS
" Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09
" Language: CSS
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09

if exists("b:did_ftplugin")
finish
Expand Down
6 changes: 3 additions & 3 deletions runtime/ftplugin/cvsrc.vim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: cvs(1) RC file
" Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09
" Language: cvs(1) RC file
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09

if exists("b:did_ftplugin")
finish
Expand Down
4 changes: 2 additions & 2 deletions runtime/ftplugin/denyhosts.vim
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
" Vim filetype plugin file
" Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2007-12-04
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2007-12-04

if exists("b:did_ftplugin")
finish
Expand Down
Loading

0 comments on commit 93fb738

Please sign in to comment.