Skip to content

Commit f56ba9d

Browse files
committed
Updated runtime files.
1 parent 9a42b84 commit f56ba9d

File tree

18 files changed

+180
-122
lines changed

18 files changed

+180
-122
lines changed

runtime/doc/change.txt

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*change.txt* For Vim version 7.3. Last change: 2012 Jan 04
1+
*change.txt* For Vim version 7.3. Last change: 2012 Apr 25
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -80,8 +80,8 @@ For inserting text see |insert.txt|.
8080
(default: current line |cmdline-ranges|) [into
8181
register x].
8282

83-
These commands delete text. You can repeat them with the "." command
84-
(except ":d") and undo them. Use Visual mode to delete blocks of text. See
83+
These commands delete text. You can repeat them with the `.` command
84+
(except `:d`) and undo them. Use Visual mode to delete blocks of text. See
8585
|registers| for an explanation of registers.
8686

8787
An exception for the d{motion} command: If the motion is not linewise, the
@@ -132,7 +132,7 @@ gJ Join [count] lines, with a minimum of two lines.
132132
See |ex-flags| for [flags].
133133

134134
These commands delete the <EOL> between lines. This has the effect of joining
135-
multiple lines into one line. You can repeat these commands (except ":j") and
135+
multiple lines into one line. You can repeat these commands (except `:j`) and
136136
undo them.
137137

138138
These commands, except "gJ", insert one space in place of the <EOL> unless
@@ -465,9 +465,9 @@ much as possible to make the indent. You can use ">><<" to replace an indent
465465
made out of spaces with the same indent made out of <Tab>s (and a few spaces
466466
if necessary). If the 'expandtab' option is on, Vim uses only spaces. Then
467467
you can use ">><<" to replace <Tab>s in the indent by spaces (or use
468-
":retab!").
468+
`:retab!`).
469469

470-
To move a line several 'shiftwidth's, use Visual mode or the ":" commands.
470+
To move a line several 'shiftwidth's, use Visual mode or the `:` commands.
471471
For example: >
472472
Vjj4> move three lines 4 indents to the right
473473
:<<< move current line 3 indents to the left
@@ -487,7 +487,7 @@ Examples of filters are "sort", which sorts lines alphabetically, and
487487
works like a filter; not all versions do). The 'shell' option specifies the
488488
shell Vim uses to execute the filter command (See also the 'shelltype'
489489
option). You can repeat filter commands with ".". Vim does not recognize a
490-
comment (starting with '"') after the ":!" command.
490+
comment (starting with '"') after the `:!` command.
491491

492492
*!*
493493
!{motion}{filter} Filter {motion} text lines through the external
@@ -574,34 +574,34 @@ For other systems the tmpnam() library function is used.
574574
Repeat last :substitute with same search pattern and
575575
substitute string, but without the same flags. You
576576
may add [flags], see |:s_flags|.
577-
Note that after ":substitute" the '&' flag can't be
577+
Note that after `:substitute` the '&' flag can't be
578578
used, it's recognized as a pattern separator.
579-
The space between ":substitute" and the 'c', 'g' and
579+
The space between `:substitute` and the 'c', 'g' and
580580
'r' flags isn't required, but in scripts it's a good
581581
idea to keep it to avoid confusion.
582582

583583
:[range]~[&][flags] [count] *:~*
584584
Repeat last substitute with same substitute string
585585
but with last used search pattern. This is like
586-
":&r". See |:s_flags| for [flags].
586+
`:&r`. See |:s_flags| for [flags].
587587

588588
*&*
589-
& Synonym for ":s" (repeat last substitute). Note
589+
& Synonym for `:s` (repeat last substitute). Note
590590
that the flags are not remembered, thus it might
591-
actually work differently. You can use ":&&" to keep
591+
actually work differently. You can use `:&&` to keep
592592
the flags.
593593

594594
*g&*
595-
g& Synonym for ":%s//~/&" (repeat last substitute on all
595+
g& Synonym for `:%s//~/&` (repeat last substitute on all
596596
lines with the same flags).
597597
Mnemonic: global substitute. {not in Vi}
598598

599599
*:snomagic* *:sno*
600-
:[range]sno[magic] ... Same as ":substitute", but always use 'nomagic'.
600+
:[range]sno[magic] ... Same as `:substitute`, but always use 'nomagic'.
601601
{not in Vi}
602602

603603
*:smagic* *:sm*
604-
:[range]sm[agic] ... Same as ":substitute", but always use 'magic'.
604+
:[range]sm[agic] ... Same as `:substitute`, but always use 'magic'.
605605
{not in Vi}
606606

607607
*:s_flags*
@@ -611,7 +611,7 @@ The flags that you can use for the substitute commands:
611611
command. Examples: >
612612
:&&
613613
:s/this/that/&
614-
< Note that ":s" and ":&" don't keep the flags.
614+
< Note that `:s` and `:&` don't keep the flags.
615615
{not in Vi}
616616

617617
[c] Confirm each substitution. Vim highlights the matching string (with
@@ -667,14 +667,14 @@ The flags that you can use for the substitute commands:
667667

668668
[l] Like [p] but print the text like |:list|.
669669

670-
[r] Only useful in combination with ":&" or ":s" without arguments. ":&r"
671-
works the same way as ":~": When the search pattern is empty, use the
670+
[r] Only useful in combination with `:&` or `:s` without arguments. `:&r`
671+
works the same way as `:~`: When the search pattern is empty, use the
672672
previously used search pattern instead of the search pattern from the
673-
last substitute or ":global". If the last command that did a search
674-
was a substitute or ":global", there is no effect. If the last
673+
last substitute or `:global`. If the last command that did a search
674+
was a substitute or `:global`, there is no effect. If the last
675675
command was a search command such as "/", use the pattern from that
676676
command.
677-
For ":s" with an argument this already happens: >
677+
For `:s` with an argument this already happens: >
678678
:s/blue/red/
679679
/green
680680
:s//red/ or :~ or :&r
@@ -691,9 +691,9 @@ reason is that the flags can only be found by skipping the pattern, and in
691691
order to skip the pattern the "magicness" must be known. Catch 22!
692692

693693
If the {pattern} for the substitute command is empty, the command uses the
694-
pattern from the last substitute or ":global" command. If there is none, but
694+
pattern from the last substitute or `:global` command. If there is none, but
695695
there is a previous search pattern, that one is used. With the [r] flag, the
696-
command uses the pattern from the last substitute, ":global", or search
696+
command uses the pattern from the last substitute, `:global`, or search
697697
command.
698698

699699
If the {string} is omitted the substitute is done as if it's empty. Thus the
@@ -848,7 +848,7 @@ This replaces each 'E' character with a euro sign. Read more in |<Char->|.
848848

849849

850850
4.4 Changing tabs *change-tabs*
851-
*:ret* *:retab*
851+
*:ret* *:retab* *:retab!*
852852
:[range]ret[ab][!] [new_tabstop]
853853
Replace all sequences of white-space containing a
854854
<Tab> with new strings of white-space using the new
@@ -867,7 +867,7 @@ This replaces each 'E' character with a euro sign. Read more in |<Char->|.
867867
Careful: This command modifies any <Tab> characters
868868
inside of strings in a C program. Use "\t" to avoid
869869
this (that's a good habit anyway).
870-
":retab!" may also change a sequence of spaces by
870+
`:retab!` may also change a sequence of spaces by
871871
<Tab> characters, which can mess up a printf().
872872
{not in Vi}
873873
Not available when |+ex_extra| feature was disabled at
@@ -977,8 +977,12 @@ inside of strings can change! Also see 'softtabstop' option. >
977977
current line). This always works |linewise|, thus
978978
this command can be used to put a yanked block as new
979979
lines.
980-
The cursor is left on the first non-blank in the last
981-
new line.
980+
If no register is specified, it depends on the 'cb'
981+
option: If 'cb' contains "unnamedplus", paste from the
982+
+ register |quoteplus|. Otherwise, if 'cb' contains
983+
"unnamed", paste from the * register |quote_star|.
984+
Otherwise, paste from the unnamed register
985+
|quote_quote|.
982986
The register can also be '=' followed by an optional
983987
expression. The expression continues until the end of
984988
the command. You need to escape the '|' and '"'
@@ -1183,20 +1187,20 @@ nothing is returned. {not in Vi}
11831187

11841188
9. Last search pattern register "/ *quote_/* *quote/*
11851189
Contains the most recent search-pattern. This is used for "n" and 'hlsearch'.
1186-
It is writable with ":let", you can change it to have 'hlsearch' highlight
1190+
It is writable with `:let`, you can change it to have 'hlsearch' highlight
11871191
other matches without actually searching. You can't yank or delete into this
11881192
register. The search direction is available in |v:searchforward|.
11891193
Note that the valued is restored when returning from a function
11901194
|function-search-undo|.
11911195
{not in Vi}
11921196

11931197
*@/*
1194-
You can write to a register with a ":let" command |:let-@|. Example: >
1198+
You can write to a register with a `:let` command |:let-@|. Example: >
11951199
:let @/ = "the"
11961200
11971201
If you use a put command without specifying a register, Vim uses the register
11981202
that was last filled (this is also the contents of the unnamed register). If
1199-
you are confused, use the ":dis" command to find out what Vim will put (this
1203+
you are confused, use the `:dis` command to find out what Vim will put (this
12001204
command displays all named and numbered registers; the unnamed register is
12011205
labelled '"').
12021206

@@ -1555,7 +1559,7 @@ Some examples:
15551559
:set fo=tcrq
15561560
<
15571561

1558-
Automatic formatting *auto-format*
1562+
Automatic formatting *auto-format* *autoformat*
15591563

15601564
When the 'a' flag is present in 'formatoptions' text is formatted
15611565
automatically when inserting text or deleting text. This works nice for
@@ -1664,7 +1668,7 @@ found here: |sort()|.
16641668
last search pattern is used. This allows trying out
16651669
a pattern first.
16661670

1667-
Note that using ":sort" with ":global" doesn't sort the matching lines, it's
1671+
Note that using `:sort` with `:global` doesn't sort the matching lines, it's
16681672
quite useless.
16691673

16701674
The details about sorting depend on the library function used. There is no

runtime/doc/eval.txt

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 7.3. Last change: 2012 Apr 13
1+
*eval.txt* For Vim version 7.3. Last change: 2012 Apr 25
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1544,15 +1544,18 @@ v:profiling Normally zero. Set to one after using ":profile start".
15441544

15451545
*v:progname* *progname-variable*
15461546
v:progname Contains the name (with path removed) with which Vim was
1547-
invoked. Allows you to do special initialisations for "view",
1548-
"evim" etc., or any other name you might symlink to Vim.
1547+
invoked. Allows you to do special initialisations for |view|,
1548+
|evim| etc., or any other name you might symlink to Vim.
15491549
Read-only.
15501550

15511551
*v:register* *register-variable*
15521552
v:register The name of the register in effect for the current normal mode
1553-
command. If none is supplied it is the default register '"',
1554-
unless 'clipboard' contains "unnamed" or "unnamedplus", then
1555-
it is '*' or '+'.
1553+
command (regardless of whether that command actually used a
1554+
register). Or for the currently executing normal mode mapping
1555+
(use this in custom commands that take a register).
1556+
If none is supplied it is the default register '"', unless
1557+
'clipboard' contains "unnamed" or "unnamedplus", then it is
1558+
'*' or '+'.
15561559
Also see |getreg()| and |setreg()|
15571560

15581561
*v:scrollstart* *scrollstart-variable*
@@ -1844,6 +1847,7 @@ lispindent( {lnum}) Number Lisp indent for line {lnum}
18441847
localtime() Number current time
18451848
log( {expr}) Float natural logarithm (base e) of {expr}
18461849
log10( {expr}) Float logarithm of Float {expr} to base 10
1850+
luaeval( {expr}[, {expr}]) any evaluate |Lua| expression
18471851
map( {expr}, {string}) List/Dict change each item in {expr} to {expr}
18481852
maparg( {name}[, {mode} [, {abbr} [, {dict}]]])
18491853
String or Dict
@@ -3997,6 +4001,20 @@ log10({expr}) *log10()*
39974001
< -2.0
39984002
{only available when compiled with the |+float| feature}
39994003

4004+
luaeval({expr}[, {expr}]) *luaeval()*
4005+
Evaluate Lua expression {expr} and return its result converted
4006+
to Vim data structures. Second {expr} may hold additional
4007+
argument accessible as _A inside first {expr}.
4008+
Strings are returned as they are.
4009+
Boolean objects are converted to numbers.
4010+
Numbers are converted to |Float| values if vim was compiled
4011+
with |+float| and to numbers otherwise.
4012+
Dictionaries and lists obtained by vim.eval() are returned
4013+
as-is.
4014+
Other objects are returned as zero without any errors.
4015+
See |lua-luaeval| for more details.
4016+
{only available when compiled with the |+lua| feature}
4017+
40004018
map({expr}, {string}) *map()*
40014019
{expr} must be a |List| or a |Dictionary|.
40024020
Replace each item in {expr} with the result of evaluating
@@ -4321,7 +4339,7 @@ mode([expr]) Return a string that indicates the current mode.
43214339

43224340
mzeval({expr}) *mzeval()*
43234341
Evaluate MzScheme expression {expr} and return its result
4324-
convert to Vim data structures.
4342+
converted to Vim data structures.
43254343
Numbers and strings are returned as they are.
43264344
Pairs (including lists and improper lists) and vectors are
43274345
returned as Vim |Lists|.

runtime/doc/insert.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*insert.txt* For Vim version 7.3. Last change: 2012 Apr 05
1+
*insert.txt* For Vim version 7.3. Last change: 2012 Apr 20
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -383,8 +383,11 @@ will then always put the cursor on it). Or use CTRL-\ CTRL-O, but then
383383
beware of the cursor possibly being beyond the end of the line.
384384

385385
The CTRL-O command takes you to Normal mode. If you then use a command enter
386-
Insert mode again it doesn't nest. Thus when typing "a<C-O>a" and then <Esc>
387-
takes you back to Normal mode, you do not need to type <Esc> twice.
386+
Insert mode again it normally doesn't nest. Thus when typing "a<C-O>a" and
387+
then <Esc> takes you back to Normal mode, you do not need to type <Esc> twice.
388+
An exception is when not typing the command, e.g. when executing a mapping or
389+
sourcing a script. This makes mappings work that briefly switch to Insert
390+
mode.
388391

389392
The shifted cursor keys are not available on all terminals.
390393

runtime/doc/syntax.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2721,7 +2721,14 @@ Some folks like to include things like source code in comments and so would
27212721
prefer that spell checking be disabled in comments in LaTeX files. To do
27222722
this, put the following in your <.vimrc>: >
27232723
let g:tex_comment_nospell= 1
2724-
<
2724+
The comment lines >
2725+
% nospell{
2726+
...
2727+
% nospell}
2728+
will suppress spell checking between them. These comment lines spelling
2729+
control are known to be fragile; for example, don't include any of the section
2730+
commands (\part, \chapter, \section, \paragraph, etc) inside nospell blocks
2731+
or interleave environments (such as math) across nospell blocks.
27252732
*tex-verb*
27262733
Tex: Want Spell Checking in Verbatim Zones?~
27272734

@@ -2828,6 +2835,7 @@ You may selectively use conceal mode by setting g:tex_conceal in your
28282835
following sets of characters: >
28292836
28302837
a = accents/ligatures
2838+
b = bold and italic
28312839
d = delimiters
28322840
m = math symbols
28332841
g = Greek

runtime/doc/tags

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2617,6 +2617,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME*
26172617
:resize windows.txt /*:resize*
26182618
:ret change.txt /*:ret*
26192619
:retab change.txt /*:retab*
2620+
:retab! change.txt /*:retab!*
26202621
:retu eval.txt /*:retu*
26212622
:return eval.txt /*:return*
26222623
:rew editing.txt /*:rew*
@@ -4745,6 +4746,7 @@ autocmds-kept version5.txt /*autocmds-kept*
47454746
autocommand autocmd.txt /*autocommand*
47464747
autocommand-events autocmd.txt /*autocommand-events*
47474748
autocommand-pattern autocmd.txt /*autocommand-pattern*
4749+
autoformat change.txt /*autoformat*
47484750
autoload eval.txt /*autoload*
47494751
autoload-functions eval.txt /*autoload-functions*
47504752
avoid-hit-enter version5.txt /*avoid-hit-enter*

0 commit comments

Comments
 (0)