Skip to content

Commit 9440f7f

Browse files
committed
Updated runtime files.
1 parent 9cd648b commit 9440f7f

File tree

17 files changed

+363
-108
lines changed

17 files changed

+363
-108
lines changed

runtime/doc/change.txt

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*change.txt* For Vim version 7.4. Last change: 2015 Jan 27
1+
*change.txt* For Vim version 7.4. Last change: 2015 Feb 10
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1192,12 +1192,14 @@ if none of buffers matches the given name.
11921192
7. Expression register "= *quote_=* *quote=* *@=*
11931193
This is not really a register that stores text, but is a way to use an
11941194
expression in commands which use a register. The expression register is
1195-
read-only; you cannot put text into it. After the '=', the cursor moves to
1196-
the command-line, where you can enter any expression (see |expression|). All
1197-
normal command-line editing commands are available, including a special
1198-
history for expressions. When you end the command-line by typing <CR>, Vim
1199-
computes the result of the expression. If you end it with <Esc>, Vim abandons
1200-
the expression. If you do not enter an expression, Vim uses the previous
1195+
read-write.
1196+
1197+
When typing the '=' after " or CTRL-R the cursor moves to the command-line,
1198+
where you can enter any expression (see |expression|). All normal
1199+
command-line editing commands are available, including a special history for
1200+
expressions. When you end the command-line by typing <CR>, Vim computes the
1201+
result of the expression. If you end it with <Esc>, Vim abandons the
1202+
expression. If you do not enter an expression, Vim uses the previous
12011203
expression (like with the "/" command).
12021204

12031205
The expression must evaluate to a String. A Number is always automatically
@@ -1242,7 +1244,7 @@ Contains the most recent search-pattern. This is used for "n" and 'hlsearch'.
12421244
It is writable with `:let`, you can change it to have 'hlsearch' highlight
12431245
other matches without actually searching. You can't yank or delete into this
12441246
register. The search direction is available in |v:searchforward|.
1245-
Note that the valued is restored when returning from a function
1247+
Note that the value is restored when returning from a function
12461248
|function-search-undo|.
12471249
{not in Vi}
12481250

@@ -1457,10 +1459,10 @@ When you hit Return in a C-comment, Vim will insert the middle comment leader
14571459
for the new line: " * ". To close this comment you just have to type "/"
14581460
before typing anything else on the new line. This will replace the
14591461
middle-comment leader with the end-comment leader and apply any specified
1460-
alignment, leaving just " */". There is no need to hit BackSpace first.
1462+
alignment, leaving just " */". There is no need to hit Backspace first.
14611463

1462-
When there is a match with a middle part, but there also is a maching end part
1463-
which is longer, the end part is used. This makes a C style comment work
1464+
When there is a match with a middle part, but there also is a matching end
1465+
part which is longer, the end part is used. This makes a C style comment work
14641466
without requiring the middle part to end with a space.
14651467

14661468
Here is an example of alignment flags at work to make a comment stand out

runtime/doc/editing.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*editing.txt* For Vim version 7.4. Last change: 2015 Jan 04
1+
*editing.txt* For Vim version 7.4. Last change: 2015 Feb 27
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -304,7 +304,8 @@ CTRL-^ Edit the alternate file. Mostly the alternate file is
304304
Mnemonic: "goto file".
305305
Uses the 'isfname' option to find out which characters
306306
are supposed to be in a file name. Trailing
307-
punctuation characters ".,:;!" are ignored.
307+
punctuation characters ".,:;!" are ignored. Escaped
308+
spaces "\ " are reduced to a single space.
308309
Uses the 'path' option as a list of directory names to
309310
look for the file. See the 'path' option for details
310311
about relative directories and wildcards.

runtime/doc/eval.txt

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

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -3314,7 +3314,7 @@ getchar([expr]) *getchar()*
33143314
: endwhile
33153315
:endfunction
33163316
<
3317-
You may also receive syntetic characters, such as
3317+
You may also receive synthetic characters, such as
33183318
|<CursorHold>|. Often you will want to ignore this and get
33193319
another character: >
33203320
:function GetKey()
@@ -4828,7 +4828,7 @@ py3eval({expr}) *py3eval()*
48284828
Evaluate Python expression {expr} and return its result
48294829
converted to Vim data structures.
48304830
Numbers and strings are returned as they are (strings are
4831-
copied though, unicode strings are additionally converted to
4831+
copied though, Unicode strings are additionally converted to
48324832
'encoding').
48334833
Lists are represented as Vim |List| type.
48344834
Dictionaries are represented as Vim |Dictionary| type with
@@ -5567,7 +5567,7 @@ setwinvar({nr}, {varname}, {val}) *setwinvar()*
55675567
:call setwinvar(2, "myvar", "foobar")
55685568
55695569
sha256({string}) *sha256()*
5570-
Returns a String with 64 hex charactes, which is the SHA256
5570+
Returns a String with 64 hex characters, which is the SHA256
55715571
checksum of {string}.
55725572
{only available when compiled with the |+cryptv| feature}
55735573

@@ -8280,7 +8280,7 @@ You can catch all Vim errors by the pattern >
82808280
*catch-text*
82818281
NOTE: You should never catch the error message text itself: >
82828282
:catch /No such variable/
8283-
only works in the english locale, but not when the user has selected
8283+
only works in the English locale, but not when the user has selected
82848284
a different language by the |:language| command. It is however helpful to
82858285
cite the message text in a comment: >
82868286
:catch /^Vim(\a\+):E108:/ " No such variable

runtime/doc/if_ruby.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*if_ruby.txt* For Vim version 7.4. Last change: 2012 Aug 02
1+
*if_ruby.txt* For Vim version 7.4. Last change: 2015 Feb 22
22

33

44
VIM REFERENCE MANUAL by Shugo Maeda
@@ -120,9 +120,13 @@ VIM::command({cmd})
120120
*ruby-evaluate*
121121
VIM::evaluate({expr})
122122
Evaluates {expr} using the vim internal expression evaluator (see
123-
|expression|). Returns the expression result as a string.
124-
A |List| is turned into a string by joining the items and inserting
125-
line breaks.
123+
|expression|). Returns the expression result as:
124+
- a Integer if the Vim expression evaluates to a number
125+
- a Float if the Vim expression evaluates to a float
126+
- a String if the Vim expression evaluates to a string
127+
- a Array if the Vim expression evaluates to a Vim list
128+
- a Hash if the Vim expression evaluates to a Vim dictionary
129+
Dictionaries and lists are recursively expanded.
126130

127131
==============================================================================
128132
3. VIM::Buffer objects *ruby-buffer*

runtime/doc/index.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*index.txt* For Vim version 7.4. Last change: 2015 Jan 07
1+
*index.txt* For Vim version 7.4. Last change: 2015 Feb 12
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -702,12 +702,16 @@ tag char note action in Normal mode ~
702702
|g'| g'{mark} 1 like |'| but without changing the jumplist
703703
|g`| g`{mark} 1 like |`| but without changing the jumplist
704704
|gstar| g* 1 like "*", but without using "\<" and "\>"
705+
|g+| g+ go to newer text state N times
706+
|g,| g, 1 go to N newer position in change list
707+
|g-| g- go to older text state N times
705708
|g0| g0 1 when 'wrap' off go to leftmost character of
706709
the current line that is on the screen;
707710
when 'wrap' on go to the leftmost character
708711
of the current screen line
709712
|g8| g8 print hex value of bytes used in UTF-8
710713
character under the cursor
714+
|g;| g; 1 go to N older position in change list
711715
|g<| g< display previous command output
712716
|g?| g? 2 Rot13 encoding operator
713717
|g?g?| g?? 2 Rot13 encode current line
@@ -736,6 +740,7 @@ tag char note action in Normal mode ~
736740
the screen; when 'wrap' on go to the
737741
leftmost non-white character of the current
738742
screen line
743+
|g_| g_ 1 cursor to the last CHAR N - 1 lines lower
739744
|ga| ga print ascii value of character under the
740745
cursor
741746
|gd| gd 1 go to definition of word under the cursor

runtime/doc/options.txt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 7.4. Last change: 2015 Jan 27
1+
*options.txt* For Vim version 7.4. Last change: 2015 Feb 17
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -536,11 +536,11 @@ number can be specified where "vim:" or "Vim:" is used:
536536
vim<{vers}: version before {vers}
537537
vim={vers}: version {vers}
538538
vim>{vers}: version after {vers}
539-
{vers} is 600 for Vim 6.0 (hundred times the major version plus minor).
540-
For example, to use a modeline only for Vim 6.0 and later:
541-
/* vim600: set foldmethod=marker: */ ~
542-
To use a modeline for Vim before version 5.7:
543-
/* vim<570: set sw=4: */ ~
539+
{vers} is 700 for Vim 7.0 (hundred times the major version plus minor).
540+
For example, to use a modeline only for Vim 7.0:
541+
/* vim700: set foldmethod=marker */ ~
542+
To use a modeline for Vim after version 7.2:
543+
/* vim>702: set cole=2: */ ~
544544
There can be no blanks between "vim" and the ":".
545545

546546

@@ -1316,8 +1316,9 @@ A jump table for the options with a short description can be found at |Q_op|.
13161316
nofile only: The buffer name is fixed, it is not handled like a
13171317
file name. It is not modified in response to a |:cd|
13181318
command.
1319-
nofile only: When using ":e bufname" and already editing "bufname"
1320-
nothing changes, since there is no file to edit.
1319+
both: When using ":e bufname" and already editing "bufname"
1320+
the buffer is made empty and autocommands are
1321+
triggered as usual for |:edit|.
13211322
*E676*
13221323
"acwrite" implies that the buffer name is not related to a file, like
13231324
"nofile", but it will be written. Thus, in contrast to "nofile" and
@@ -2950,8 +2951,8 @@ A jump table for the options with a short description can be found at |Q_op|.
29502951
2. If a <NL> is found and 'fileformats' includes "unix", 'fileformat'
29512952
is set to "unix". Note that when a <NL> is found without a
29522953
preceding <CR>, "unix" is preferred over "dos".
2953-
3. If 'fileformat' has not yet been set, and if 'fileformats'
2954-
includes "mac", 'fileformat' is set to "mac".
2954+
3. If 'fileformat' has not yet been set, and if a <CR> is found, and
2955+
if 'fileformats' includes "mac", 'fileformat' is set to "mac".
29552956
This means that "mac" is only chosen when:
29562957
"unix" is not present or no <NL> is found in the file, and
29572958
"dos" is not present or no <CR><NL> is found in the file.

runtime/doc/pattern.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*pattern.txt* For Vim version 7.4. Last change: 2014 Sep 06
1+
*pattern.txt* For Vim version 7.4. Last change: 2015 Feb 17
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -59,6 +59,8 @@ explanations are in chapter 27 |usr_27.txt|.
5959

6060
*n*
6161
n Repeat the latest "/" or "?" [count] times.
62+
If the cursor doesn't move the search is repeated with
63+
count + 1.
6264
|last-pattern| {Vi: no count}
6365

6466
*N*

runtime/doc/syntax.txt

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

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -211,7 +211,8 @@ thing. These are then linked to a highlight group that specifies the color.
211211
A syntax group name doesn't specify any color or attributes itself.
212212

213213
The name for a highlight or syntax group must consist of ASCII letters, digits
214-
and the underscore. As a regexp: "[a-zA-Z0-9_]*"
214+
and the underscore. As a regexp: "[a-zA-Z0-9_]*". However, Vim does not give
215+
an error when using other characters.
215216

216217
To be able to allow each user to pick his favorite set of colors, there must
217218
be preferred names for highlight groups that are common for many languages.
@@ -4253,7 +4254,7 @@ If the "maxlines={N}" argument is given, the number of lines that are searched
42534254
for a comment or syncing pattern is restricted to N lines backwards (after
42544255
adding "minlines"). This is useful if you have few things to sync on and a
42554256
slow machine. Example: >
4256-
:syntax sync ccomment maxlines=500
4257+
:syntax sync maxlines=500 ccomment
42574258
<
42584259
*:syn-sync-linebreaks*
42594260
When using a pattern that matches multiple lines, a change in one line may

runtime/doc/tags

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -995,6 +995,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME*
995995
't_ve' term.txt /*'t_ve'*
996996
't_vi' term.txt /*'t_vi'*
997997
't_vs' term.txt /*'t_vs'*
998+
't_xn' term.txt /*'t_xn'*
998999
't_xs' term.txt /*'t_xs'*
9991000
'ta' options.txt /*'ta'*
10001001
'tabline' options.txt /*'tabline'*
@@ -8203,6 +8204,7 @@ t_vb term.txt /*t_vb*
82038204
t_ve term.txt /*t_ve*
82048205
t_vi term.txt /*t_vi*
82058206
t_vs term.txt /*t_vs*
8207+
t_xn term.txt /*t_xn*
82068208
t_xs term.txt /*t_xs*
82078209
tab intro.txt /*tab*
82088210
tab-page tabpage.txt /*tab-page*

runtime/doc/term.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*term.txt* For Vim version 7.4. Last change: 2014 May 13
1+
*term.txt* For Vim version 7.4. Last change: 2015 Feb 23
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -283,8 +283,8 @@ OUTPUT CODES
283283
*t_xs* *'t_xs'*
284284
t_xs if non-empty, standout not erased by overwriting (hpterm)
285285
*t_xn* *'t_xn'*
286-
t_xn if non-empty, character writing at the last cell of screen
287-
didn't causes scrolling
286+
t_xn if non-empty, writing a character at the last screen cell
287+
does not cause scrolling
288288
t_ZH italics mode *t_ZH* *'t_ZH'*
289289
t_ZR italics end *t_ZR* *'t_ZR'*
290290

0 commit comments

Comments
 (0)