Skip to content

Commit fc65cab

Browse files
brammoolbrammool
committed
Update runtime files.
1 parent 627cb6a commit fc65cab

33 files changed

Lines changed: 3984 additions & 344 deletions

‎runtime/autoload/haskellcomplete.vim‎

Lines changed: 3382 additions & 0 deletions
Large diffs are not rendered by default.

‎runtime/autoload/tar.vim‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ fun! tar#Browse(tarfile)
155155
let curlast= line("$")
156156
if tarfile =~# '\.\(gz\|tgz\)$'
157157
" call Decho("1: exe silent r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
158-
exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
158+
exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
159159
elseif tarfile =~# '\.lrp'
160160
" call Decho("2: exe silent r! cat -- ".shellescape(tarfile,1)."|gzip -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - ")
161161
exe "sil! r! cat -- ".shellescape(tarfile,1)."|gzip -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - "
@@ -292,7 +292,7 @@ fun! tar#Read(fname,mode)
292292
exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
293293
elseif tarfile =~# '\.\(gz\|tgz\)$'
294294
" call Decho("5: exe silent r! gzip -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd.' -'.g:tar_readoptions.' - '.tar_secure.shellescape(fname,1))
295-
exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
295+
exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
296296
elseif tarfile =~# '\.lrp$'
297297
" call Decho("6: exe silent r! cat ".shellescape(tarfile,1)." | gzip -d -c - | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp)
298298
exe "sil! r! cat -- ".shellescape(tarfile,1)." | gzip -d -c - | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp

‎runtime/doc/eval.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -954,6 +954,13 @@ These three can be repeated and mixed. Examples:
954954

955955
expr8 *expr8*
956956
-----
957+
This expression is either |expr9| or a sequence of the alternatives below,
958+
in any order. E.g., these are all possible:
959+
expr9[expr1].name
960+
expr9.name[expr1]
961+
expr9(expr1, ...)[expr1].name
962+
963+
957964
expr8[expr1] item of String or |List| *expr-[]* *E111*
958965
*E909* *subscript*
959966
If expr8 is a Number or String this results in a String that contains the
@@ -8014,6 +8021,7 @@ swapinfo({fname}) swapinfo()
80148021
mtime last modification time in seconds
80158022
inode Optional: INODE number of the file
80168023
dirty 1 if file was modified, 0 if not
8024+
Note that "user" and "host" are truncated to at most 39 bytes.
80178025
In case of failure an "error" item is added with the reason:
80188026
Cannot open file: file not found or in accessible
80198027
Cannot read file: cannot read first block

‎runtime/doc/filetype.txt‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,11 +638,31 @@ By default the following options are set, in accordance with PEP8: >
638638
639639
setlocal expandtab shiftwidth=4 softtabstop=4 tabstop=8
640640
641-
To disable this behaviour, set the following variable in your vimrc: >
641+
To disable this behavior, set the following variable in your vimrc: >
642642
643643
let g:python_recommended_style = 0
644644
645645
646+
R MARKDOWN *ft-rmd-plugin*
647+
648+
By default ftplugin/html.vim is not sourced. If you want it sourced, add to
649+
your |vimrc|: >
650+
let rmd_include_html = 1
651+
652+
The 'formatexpr' option is set dynamically with different values for R code
653+
and for Markdown code. If you prefer that 'formatexpr' is not set, add to your
654+
|vimrc|: >
655+
let rmd_dynamic_comments = 0
656+
657+
658+
R RESTRUCTURED TEXT *ft-rrst-plugin*
659+
660+
The 'formatexpr' option is set dynamically with different values for R code
661+
and for ReStructured text. If you prefer that 'formatexpr' is not set, add to
662+
your |vimrc|: >
663+
let rrst_dynamic_comments = 0
664+
665+
646666
RPM SPEC *ft-spec-plugin*
647667

648668
Since the text for this plugin is rather long it has been put in a separate

‎runtime/doc/if_pyth.txt‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,15 @@ vim.eval(str) *python-eval*
168168
- a dictionary if the Vim expression evaluates to a Vim dictionary
169169
Dictionaries and lists are recursively expanded.
170170
Examples: >
171+
:" value of the 'textwidth' option
171172
:py text_width = vim.eval("&tw")
172-
:py str = vim.eval("12+12") # NB result is a string! Use
173-
# string.atoi() to convert to
174-
# a number.
175-
173+
:
174+
:" contents of the 'a' register
175+
:py a_reg = vim.eval("@a")
176+
:
177+
:" Result is a string! Use string.atoi() to convert to a number.
178+
:py str = vim.eval("12+12")
179+
:
176180
:py tagList = vim.eval('taglist("eval_expr")')
177181
< The latter will return a python list of python dicts, for instance:
178182
[{'cmd': '/^eval_expr(arg, nextcmd)$/', 'static': 0, 'name': ~

‎runtime/doc/indent.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -978,6 +978,11 @@ Below is an example of indentation with and without this option enabled:
978978
paste(x) paste(x)
979979
} }
980980
<
981+
The code will be indented after lines that match the pattern
982+
`'\(&\||\|+\|-\|\*\|/\|=\|\~\|%\|->\)\s*$'`. If you want indentation after
983+
lines that match a different pattern, you should set the appropriate value of
984+
`r_indent_op_pattern` in your |vimrc|.
985+
981986

982987
SHELL *ft-sh-indent*
983988

‎runtime/doc/insert.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,13 +1051,13 @@ The function must return the column where the completion starts. It must be a
10511051
number between zero and the cursor column "col('.')". This involves looking
10521052
at the characters just before the cursor and including those characters that
10531053
could be part of the completed item. The text between this column and the
1054-
cursor column will be replaced with the matches.
1054+
cursor column will be replaced with the matches. If the returned value is
1055+
larger than the cursor column, the cursor column is used.
10551056

1056-
Special return values:
1057-
-1 If no completion can be done, the completion will be cancelled with an
1058-
error message.
1059-
-2 To cancel silently and stay in completion mode.
1060-
-3 To cancel silently and leave completion mode.
1057+
Negative return values:
1058+
-2 To cancel silently and stay in completion mode.
1059+
-3 To cancel silently and leave completion mode.
1060+
Another negative value: completion starts at the cursor column
10611061

10621062
On the second invocation the arguments are:
10631063
a:findstart 0

‎runtime/doc/options.txt‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4480,8 +4480,18 @@ A jump table for the options with a short description can be found at |Q_op|.
44804480
so far, matches. The matched string is highlighted. If the pattern
44814481
is invalid or not found, nothing is shown. The screen will be updated
44824482
often, this is only useful on fast terminals.
4483-
Also applies to the `:s`, `:g` and `:v` commands.
4484-
Note that the match will be shown, but the cursor will return to its
4483+
Also applies to the pattern in commands: >
4484+
:global
4485+
:lvimgrep
4486+
:lvimgrepadd
4487+
:smagic
4488+
:snomagic
4489+
:sort
4490+
:substitute
4491+
:vglobal
4492+
:vimgrep
4493+
:vimgrepadd
4494+
< Note that the match will be shown, but the cursor will return to its
44854495
original position when no match is found and when pressing <Esc>. You
44864496
still need to finish the search command with <Enter> to move the
44874497
cursor to the match.

‎runtime/doc/quickfix.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1557,8 +1557,8 @@ reduce the number of entries. Load the plugin with: >
15571557
packadd cfilter
15581558
15591559
Then you can use these command: >
1560-
:Cfilter[!] {pat}
1561-
:Lfilter[!] {pat}
1560+
:Cfilter[!] /{pat}/
1561+
:Lfilter[!] /{pat}/
15621562
15631563
:Cfilter creates a new quickfix list from entries matching {pat} in the
15641564
current quickfix list. Both the file name and the text of the entries are

‎runtime/doc/syntax.txt‎

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1265,7 +1265,7 @@ doxygen_javadoc_autobrief 1 Set to 0 to disable javadoc autobrief
12651265
doxygen_end_punctuation '[.]' Set to regexp match for the ending
12661266
punctuation of brief
12671267

1268-
There are also some hilight groups worth mentioning as they can be useful in
1268+
There are also some highlight groups worth mentioning as they can be useful in
12691269
configuration.
12701270

12711271
Highlight Effect ~
@@ -2641,6 +2641,48 @@ Any combination of these three variables is legal, but might highlight more
26412641
commands than are actually available to you by the game.
26422642

26432643

2644+
R *r.vim* *ft-r-syntax*
2645+
2646+
The parsing of R code for syntax highlight starts 40 lines backwards, but you
2647+
can set a different value in your |vimrc|. Example: >
2648+
let r_syntax_minlines = 60
2649+
2650+
You can also turn off syntax highlighting of ROxygen: >
2651+
let r_syntax_hl_roxygen = 0
2652+
2653+
enable folding of code delimited by parentheses, square brackets and curly
2654+
braces: >
2655+
let r_syntax_folding = 1
2656+
2657+
and highlight as functions all keywords followed by an opening parenthesis: >
2658+
let r_syntax_fun_pattern = 1
2659+
2660+
2661+
R MARKDOWN *rmd.vim* *ft-rmd-syntax*
2662+
2663+
To disable syntax highlight of YAML header, add to your |vimrc|: >
2664+
let rmd_syn_hl_yaml = 0
2665+
2666+
To disable syntax highlighting of citation keys: >
2667+
let rmd_syn_hl_citations = 0
2668+
2669+
To highlight R code in knitr chunk headers: >
2670+
let rmd_syn_hl_chunk = 1
2671+
2672+
By default, chunks of R code will be highlighted following the rules of R
2673+
language. If you want proper syntax highlighting of chunks of other languages,
2674+
you should add them to either `markdown_fenced_languages` or
2675+
`rmd_fenced_languages`. For example to properly highlight both R and Python,
2676+
you may add this to your |vimrc|: >
2677+
let rmd_fenced_languages = ['r', 'python']
2678+
2679+
2680+
R RESTRUCTURED TEXT *rrst.vim* *ft-rrst-syntax*
2681+
2682+
To highlight R code in knitr chunk headers, add to your |vimrc|: >
2683+
let rrst_syn_hl_chunk = 1
2684+
2685+
26442686
READLINE *readline.vim* *ft-readline-syntax*
26452687

26462688
The readline library is primarily used by the BASH shell, which adds quite a

0 commit comments

Comments
 (0)