Skip to content

Commit 256972a

Browse files
committed
Updated runtime files.
1 parent e292d80 commit 256972a

22 files changed

+380
-158
lines changed

runtime/doc/autocmd.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*autocmd.txt* For Vim version 7.4. Last change: 2015 Aug 18
1+
*autocmd.txt* For Vim version 7.4. Last change: 2015 Dec 05
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1131,6 +1131,9 @@ name!
11311131
:aug[roup] {name} Define the autocmd group name for the
11321132
following ":autocmd" commands. The name "end"
11331133
or "END" selects the default group.
1134+
To avoid confusion, the name should be
1135+
different from existing {event} names, as this
1136+
most likely will not do what you intended.
11341137

11351138
*:augroup-delete* *E367*
11361139
:aug[roup]! {name} Delete the autocmd group {name}. Don't use

runtime/doc/cmdline.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*cmdline.txt* For Vim version 7.4. Last change: 2015 Sep 25
1+
*cmdline.txt* For Vim version 7.4. Last change: 2015 Dec 17
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -101,6 +101,11 @@ CTRL-E or <End> *c_CTRL-E* *c_<End>* *c_End*
101101
*c_<LeftMouse>*
102102
<LeftMouse> Move the cursor to the position of the mouse click.
103103

104+
*c_<MiddleMouse>*
105+
<MiddleMouse> Paste the contents of the clipboard (for X11 the primary
106+
selection). This is similar to using CTRL-R *, but no CR
107+
characters are inserted between lines.
108+
104109
CTRL-H *c_<BS>* *c_CTRL-H* *c_BS*
105110
<BS> Delete the character in front of the cursor (see |:fixdel| if
106111
your <BS> key does not do what you want).

runtime/doc/eval.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 7.4. Last change: 2015 Dec 28
1+
*eval.txt* For Vim version 7.4. Last change: 2015 Dec 29
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -865,8 +865,8 @@ expr1'th single byte from expr8. expr8 is used as a String, expr1 as a
865865
Number. This doesn't recognize multi-byte encodings, see |byteidx()| for
866866
an alternative.
867867

868-
Index zero gives the first character. This is like it works in C. Careful:
869-
text column numbers start with one! Example, to get the character under the
868+
Index zero gives the first byte. This is like it works in C. Careful:
869+
text column numbers start with one! Example, to get the byte under the
870870
cursor: >
871871
:let c = getline(".")[col(".") - 1]
872872

runtime/doc/filetype.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*filetype.txt* For Vim version 7.4. Last change: 2015 Nov 28
1+
*filetype.txt* For Vim version 7.4. Last change: 2015 Dec 06
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -581,6 +581,9 @@ q Same as ":quit"
581581

582582
To enable folding use this: >
583583
let g:ft_man_folding_enable = 1
584+
If you do not like the default folding, use an autocommand to add your desired
585+
folding style instead. For example: >
586+
autocmd FileType man setlocal foldmethod=indent foldenable
584587
585588
586589
PDF *ft-pdf-plugin*

runtime/doc/pattern.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*pattern.txt* For Vim version 7.4. Last change: 2015 Mar 16
1+
*pattern.txt* For Vim version 7.4. Last change: 2015 Dec 26
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -393,15 +393,16 @@ Use of "\M" makes the pattern after it be interpreted as if 'nomagic' is used.
393393
Use of "\v" means that in the pattern after it all ASCII characters except
394394
'0'-'9', 'a'-'z', 'A'-'Z' and '_' have a special meaning. "very magic"
395395

396-
Use of "\V" means that in the pattern after it only the backslash has a
397-
special meaning. "very nomagic"
396+
Use of "\V" means that in the pattern after it only the backslash and the
397+
terminating character (/ or ?) has a special meaning. "very nomagic"
398398

399399
Examples:
400400
after: \v \m \M \V matches ~
401401
'magic' 'nomagic'
402402
$ $ $ \$ matches end-of-line
403403
. . \. \. matches any character
404404
* * \* \* any number of the previous atom
405+
~ ~ \~ \~ latest substitute string
405406
() \(\) \(\) \(\) grouping into an atom
406407
| \| \| \| separating alternatives
407408
\a \a \a \a alphabetic character
@@ -480,6 +481,7 @@ More explanation and examples below, follow the links.
480481
|/\%v| \%23v \%23v in virtual column 23 |/zero-width|
481482

482483
Character classes {not in Vi}: */character-classes*
484+
magic nomagic matches ~
483485
|/\i| \i \i identifier character (see 'isident' option)
484486
|/\I| \I \I like "\i", but excluding digits
485487
|/\k| \k \k keyword character (see 'iskeyword' option)
@@ -510,6 +512,7 @@ Character classes {not in Vi}: */character-classes*
510512
class with end-of-line included
511513
(end of character classes)
512514

515+
magic nomagic matches ~
513516
|/\e| \e \e <Esc>
514517
|/\t| \t \t <Tab>
515518
|/\r| \r \r <CR>
@@ -535,6 +538,7 @@ Character classes {not in Vi}: */character-classes*
535538
|/\Z| \Z \Z ignore differences in Unicode "combining characters".
536539
Useful when searching voweled Hebrew or Arabic text.
537540

541+
magic nomagic matches ~
538542
|/\m| \m \m 'magic' on for the following chars in the pattern
539543
|/\M| \M \M 'magic' off for the following chars in the pattern
540544
|/\v| \v \v the following chars in the pattern are "very magic"

runtime/doc/syntax.txt

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*syntax.txt* For Vim version 7.4. Last change: 2015 Nov 05
1+
*syntax.txt* For Vim version 7.4. Last change: 2015 Dec 19
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1438,34 +1438,27 @@ form, then >
14381438
:let fortran_fixed_source=1
14391439
in your .vimrc prior to the :syntax on command.
14401440

1441-
If the form of the source code depends upon the file extension, then it is
1442-
most convenient to set fortran_free_source in a ftplugin file. For more
1443-
information on ftplugin files, see |ftplugin|. For example, if all your
1444-
fortran files with an .f90 extension are written in free source form and the
1445-
rest in fixed source form, add the following code to your ftplugin file >
1446-
let s:extfname = expand("%:e")
1447-
if s:extfname ==? "f90"
1448-
let fortran_free_source=1
1449-
unlet! fortran_fixed_source
1450-
else
1451-
let fortran_fixed_source=1
1452-
unlet! fortran_free_source
1453-
endif
1454-
Note that this will work only if the "filetype plugin indent on" command
1455-
precedes the "syntax on" command in your .vimrc file.
1441+
If the form of the source code depends, in a non-standard way, upon the file
1442+
extension, then it is most convenient to set fortran_free_source in a ftplugin
1443+
file. For more information on ftplugin files, see |ftplugin|. Note that this
1444+
will work only if the "filetype plugin indent on" command precedes the "syntax
1445+
on" command in your .vimrc file.
14561446

14571447
When you edit an existing fortran file, the syntax script will assume free
14581448
source form if the fortran_free_source variable has been set, and assumes
14591449
fixed source form if the fortran_fixed_source variable has been set. If
14601450
neither of these variables have been set, the syntax script attempts to
1461-
determine which source form has been used by examining the first five columns
1462-
of the first 250 lines of your file. If no signs of free source form are
1463-
detected, then the file is assumed to be in fixed source form. The algorithm
1464-
should work in the vast majority of cases. In some cases, such as a file that
1465-
begins with 250 or more full-line comments, the script may incorrectly decide
1466-
that the fortran code is in fixed form. If that happens, just add a
1467-
non-comment statement beginning anywhere in the first five columns of the
1468-
first twenty five lines, save (:w) and then reload (:e!) the file.
1451+
determine which source form has been used by examining the file extension
1452+
using conventions common to the ifort, gfortran, Cray, NAG, and PathScale
1453+
compilers (.f, .for, .f77 for fixed-source, .f90, .f95, .f03, .f08 for
1454+
free-source). If none of this works, then the script examines the first five
1455+
columns of the first 500 lines of your file. If no signs of free source form
1456+
are detected, then the file is assumed to be in fixed source form. The
1457+
algorithm should work in the vast majority of cases. In some cases, such as a
1458+
file that begins with 500 or more full-line comments, the script may
1459+
incorrectly decide that the fortran code is in fixed form. If that happens,
1460+
just add a non-comment statement beginning anywhere in the first five columns
1461+
of the first twenty five lines, save (:w) and then reload (:e!) the file.
14691462

14701463
Tabs in fortran files ~
14711464
Tabs are not recognized by the Fortran standards. Tabs are not a good idea in

runtime/doc/tags

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5060,6 +5060,7 @@ c_<Home> cmdline.txt /*c_<Home>*
50605060
c_<Insert> cmdline.txt /*c_<Insert>*
50615061
c_<Left> cmdline.txt /*c_<Left>*
50625062
c_<LeftMouse> cmdline.txt /*c_<LeftMouse>*
5063+
c_<MiddleMouse> cmdline.txt /*c_<MiddleMouse>*
50635064
c_<NL> cmdline.txt /*c_<NL>*
50645065
c_<PageDown> cmdline.txt /*c_<PageDown>*
50655066
c_<PageUp> cmdline.txt /*c_<PageUp>*

0 commit comments

Comments
 (0)