Skip to content

Commit f589277

Browse files
committed
Updated runtime files.
1 parent 31c48da commit f589277

File tree

22 files changed

+636
-52
lines changed

22 files changed

+636
-52
lines changed

runtime/doc/eval.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 7.4. Last change: 2014 Jul 02
1+
*eval.txt* For Vim version 7.4. Last change: 2014 Jul 06
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -5653,7 +5653,7 @@ sort({list} [, {func} [, {dict}]]) *sort()* *E702*
56535653

56545654
The sort is stable, items which compare equal (as number or as
56555655
string) will keep their relative position. E.g., when sorting
5656-
on numbers, text strings will sort next to eachother, in the
5656+
on numbers, text strings will sort next to each other, in the
56575657
same order as they were originally.
56585658

56595659
Also see |uniq()|.

runtime/doc/insert.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*insert.txt* For Vim version 7.4. Last change: 2013 Jul 12
1+
*insert.txt* For Vim version 7.4. Last change: 2014 Jul 06
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1302,7 +1302,7 @@ HTML *ft-html-omni*
13021302
XHTML *ft-xhtml-omni*
13031303

13041304
CTRL-X CTRL-O provides completion of various elements of (X)HTML files. It is
1305-
designed to support writing of XHTML 1.0 Strict files but will also works for
1305+
designed to support writing of XHTML 1.0 Strict files but will also work for
13061306
other versions of HTML. Features:
13071307

13081308
- after "<" complete tag name depending on context (no div suggestion inside

runtime/doc/starting.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*starting.txt* For Vim version 7.4. Last change: 2014 Jun 14
1+
*starting.txt* For Vim version 7.4. Last change: 2014 Jul 09
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1506,7 +1506,7 @@ most of the information will be restored).
15061506
already set (registers, marks, |v:oldfiles|, etc.)
15071507
will be overwritten {not in Vi}
15081508

1509-
*:wv* *:wviminfo* *E137* *E138* *E574*
1509+
*:wv* *:wviminfo* *E137* *E138* *E574* *E886*
15101510
:wv[iminfo][!] [file] Write to viminfo file [file] (default: see above).
15111511
The information in the file is first read in to make
15121512
a merge between old and new info. When [!] is used,

runtime/doc/tags

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4323,6 +4323,7 @@ E882 eval.txt /*E882*
43234323
E883 eval.txt /*E883*
43244324
E884 eval.txt /*E884*
43254325
E885 sign.txt /*E885*
4326+
E886 starting.txt /*E886*
43264327
E89 message.txt /*E89*
43274328
E90 message.txt /*E90*
43284329
E91 options.txt /*E91*

runtime/doc/todo.txt

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 7.4. Last change: 2014 Jul 04
1+
*todo.txt* For Vim version 7.4. Last change: 2014 Jul 10
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -34,13 +34,7 @@ not be repeated below, unless there is extra information.
3434
*known-bugs*
3535
-------------------- Known bugs and current work -----------------------
3636

37-
Sort is still not stable, add an index in the array.
38-
See patch from Takimoto.
39-
40-
Another follow-up patch for breakindent. (Christian, 2014 Jun 28)
41-
42-
After patch 7.4.305 the termresponse isn't requested at all?
43-
(Tomas Janousek, 2014 Jul 1, Jul 2)
37+
Forfeit test_listlbr when encoding is not utf8? (Danek Duvall)
4438

4539
Regexp problems:
4640
- Bug with pattern: '\vblock (\d+)\.\n.*\d+%(\1)@<!\.$'
@@ -55,26 +49,17 @@ Regexp problems:
5549
- Does not work with NFA regexp engine:
5650
\%u, \%x, \%o, \%d followed by a composing character
5751

52+
Patch to set y_width when getting the register from the clipboard.
53+
(Yukihiro Nakadaira, 2014 Jul 10)
54+
5855
Problem that a previous silent ":throw" causes a following try/catch not to
5956
work. (ZyX, 2013 Sep 28)
6057

6158
Completion for :buf does not use 'wildignorecase'. (Akshay H, 2014 May 31)
6259

63-
Patch to avoid inconsistency of using \v and \V after $ in regexp.
64-
(Ozaki Kiichi, 2014 Jul 2)
65-
6660
":cd C:\Windows\System32\drivers\etc*" does not work, even though the
6761
directory exists. (Sergio Gallelli, 2013 Dec 29)
6862

69-
Make matchparen faster by not using winsaveview()/winrestview().
70-
(Alexey Radkov, 2014 Jun 28)
71-
72-
Patch to avoid flicker when filling the preview window.
73-
(Hirohito Higashi, 2014 Jul 2)
74-
75-
matchaddpos() doesn't handle wrong byte length well, e.g. using 1 on a
76-
multi-byte charcter. (lcd47, 2014 Jun 29)
77-
7863
The entries added by matchaddpos() are returned by getmatches() but can't be
7964
set with setmatches(). (lcd47, 2014 Jun 29)
8065

@@ -92,9 +77,6 @@ MS-Windows: Crash opening very long file name starting with "\\".
9277

9378
Syntax highlighting slow (hangs) in SASS file. (Niek Bosch, 2013 Aug 21)
9479

95-
Patch to translate 0xce in K_NUL 3. (Yasuhiro Matsumoto, 2014 June 6)
96-
Update by Nobuhiro Takasaki, Jun 19.
97-
9880
Adding "~" to 'cdpath' doesn't work for completion? (Davido, 2013 Aug 19)
9981

10082
"hi link" does not respect groups with GUI settings only. (Mark Lodato, 2014
@@ -375,6 +357,7 @@ Patch to allow setting w:quickfix_title via setqflist() and setloclist()
375357
functions. (Christian Brabandt, 2013 May 8, update May 21)
376358
Patch to add getlocstack() / setlocstack(). (Christian Brabandt, 2013 May 14)
377359
Second one. Update May 22.
360+
Update by Daniel Hahler, 2014 Jul 4.
378361

379362
Patch to make fold updates much faster. (Christian Brabandt, 2012 Dec)
380363

runtime/doc/usr_08.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*usr_08.txt* For Vim version 7.4. Last change: 2006 Jul 18
1+
*usr_08.txt* For Vim version 7.4. Last change: 2014 Jul 06
22

33
VIM USER MANUAL - by Bram Moolenaar
44

@@ -532,7 +532,7 @@ window. And you will notice a bar at the top with the two file names:
532532

533533
You now have two tab pages. The first one has a window for "thisfile" and the
534534
second one a window for "thatfile". It's like two pages that are on top of
535-
eachother, with a tab sticking out of each page showing the file name.
535+
each other, with a tab sticking out of each page showing the file name.
536536

537537
Now use the mouse to click on "thisfile" in the top line. The result is
538538

runtime/filetype.vim

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim support file to detect file types
22
"
33
" Maintainer: Bram Moolenaar <[email protected]>
4-
" Last Change: 2014 Jun 12
4+
" Last Change: 2014 Jul 09
55

66
" Listen very carefully, I will say this only once
77
if exists("did_load_filetypes")
@@ -864,7 +864,7 @@ func! s:FThtml()
864864
setf xhtml
865865
return
866866
endif
867-
if getline(n) =~ '{%\s*\(extends\|block\)\>'
867+
if getline(n) =~ '{%\s*\(extends\|block\|load\)\>'
868868
setf htmldjango
869869
return
870870
endif
@@ -1649,6 +1649,20 @@ else
16491649
au BufNewFile,BufRead *.rnw,*.snw setf rnoweb
16501650
endif
16511651

1652+
" R Markdown file
1653+
if has("fname_case")
1654+
au BufNewFile,BufRead *.Rmd,*.rmd,*.Smd,*.smd setf rmd
1655+
else
1656+
au BufNewFile,BufRead *.rmd,*.smd setf rmd
1657+
endif
1658+
1659+
" R reStructuredText file
1660+
if has("fname_case")
1661+
au BufNewFile,BufRead *.Rrst,*.rrst,*.Srst,*.srst setf rrst
1662+
else
1663+
au BufNewFile,BufRead *.rrst,*.srst setf rrst
1664+
endif
1665+
16521666
" Rexx, Rebol or R
16531667
au BufNewFile,BufRead *.r,*.R call s:FTr()
16541668

@@ -2664,7 +2678,7 @@ au BufNewFile,BufRead zsh*,zlog* call s:StarSetf('zsh')
26642678

26652679
" Plain text files, needs to be far down to not override others. This avoids
26662680
" the "conf" type being used if there is a line starting with '#'.
2667-
au BufNewFile,BufRead *.txt,*.text setf text
2681+
au BufNewFile,BufRead *.txt,*.text,README setf text
26682682

26692683

26702684
" Use the filetype detect plugins. They may overrule any of the previously

runtime/ftplugin/r.vim

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
" Vim filetype plugin file
2+
" Language: R
3+
" Maintainer: Jakson Alves de Aquino <[email protected]>
4+
" Last Change: Sun Feb 23, 2014 04:07PM
5+
6+
" Only do this when not yet done for this buffer
7+
if exists("b:did_ftplugin")
8+
finish
9+
endif
10+
11+
" Don't load another plugin for this buffer
12+
let b:did_ftplugin = 1
13+
14+
let s:cpo_save = &cpo
15+
set cpo&vim
16+
17+
setlocal iskeyword=@,48-57,_,.
18+
setlocal formatoptions-=t
19+
setlocal commentstring=#\ %s
20+
setlocal comments=:#',:###,:##,:#
21+
22+
if has("gui_win32") && !exists("b:browsefilter")
23+
let b:browsefilter = "R Source Files (*.R)\t*.R\n" .
24+
\ "Files that include R (*.Rnw *.Rd *.Rmd *.Rrst)\t*.Rnw;*.Rd;*.Rmd;*.Rrst\n" .
25+
\ "All Files (*.*)\t*.*\n"
26+
endif
27+
28+
let b:undo_ftplugin = "setl cms< com< fo< isk< | unlet! b:browsefilter"
29+
30+
let &cpo = s:cpo_save
31+
unlet s:cpo_save

runtime/ftplugin/rhelp.vim

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
" Vim filetype plugin file
2+
" Language: R help file
3+
" Maintainer: Jakson Alves de Aquino <[email protected]>
4+
" Last Change: Wed Jul 09, 2014 06:23PM
5+
6+
" Only do this when not yet done for this buffer
7+
if exists("b:did_ftplugin")
8+
finish
9+
endif
10+
11+
" Don't load another plugin for this buffer
12+
let b:did_ftplugin = 1
13+
14+
let s:cpo_save = &cpo
15+
set cpo&vim
16+
17+
setlocal iskeyword=@,48-57,_,.
18+
19+
if has("gui_win32") && !exists("b:browsefilter")
20+
let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst\n" .
21+
\ "All Files (*.*)\t*.*\n"
22+
endif
23+
24+
let b:undo_ftplugin = "setl isk< | unlet! b:browsefilter"
25+
26+
let &cpo = s:cpo_save
27+
unlet s:cpo_save
28+
29+
" vim: sw=2

runtime/ftplugin/rmd.vim

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
" Vim filetype plugin file
2+
" Language: R help file
3+
" Maintainer: Jakson Alves de Aquino <[email protected]>
4+
" Last Change: Wed Jul 09, 2014 06:23PM
5+
" Original work by Alex Zvoleff (adjusted for rmd by Michel Kuhlmann)
6+
7+
" Only do this when not yet done for this buffer
8+
if exists("b:did_ftplugin")
9+
finish
10+
endif
11+
12+
runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
13+
14+
setlocal comments=fb:*,fb:-,fb:+,n:> commentstring=>\ %s
15+
setlocal formatoptions+=tcqln
16+
setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^\\s*[-*+]\\s\\+
17+
setlocal iskeyword=@,48-57,_,.
18+
19+
let s:cpo_save = &cpo
20+
set cpo&vim
21+
22+
" Enables pandoc if it is installed
23+
unlet! b:did_ftplugin
24+
runtime ftplugin/pandoc.vim
25+
26+
" Don't load another plugin for this buffer
27+
let b:did_ftplugin = 1
28+
29+
if has("gui_win32") && !exists("b:browsefilter")
30+
let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst\n" .
31+
\ "All Files (*.*)\t*.*\n"
32+
endif
33+
34+
if exists('b:undo_ftplugin')
35+
let b:undo_ftplugin .= " | setl cms< com< fo< flp< isk< | unlet! b:browsefilter"
36+
else
37+
let b:undo_ftplugin = "setl cms< com< fo< flp< isk< | unlet! b:browsefilter"
38+
endif
39+
40+
let &cpo = s:cpo_save
41+
unlet s:cpo_save
42+
43+
" vim: sw=2

0 commit comments

Comments
 (0)