Skip to content

Commit a7f1e97

Browse files
committed
Revert "update English documents to 7.4"
This reverts commit e870b73. Sorry, it was a mistake.
1 parent 908350e commit a7f1e97

27 files changed

+255
-734
lines changed

en/autocmd.txt

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*autocmd.txt* For Vim version 7.4. Last change: 2013 Aug 04
1+
*autocmd.txt* For Vim version 7.4. Last change: 2013 May 19
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -513,9 +513,9 @@ CursorHold When the user doesn't press a key for the time
513513
CursorHoldI Just like CursorHold, but in Insert mode.
514514

515515
*CursorMoved*
516-
CursorMoved After the cursor was moved in Normal or Visual
517-
mode. Also when the text of the cursor line
518-
has been changed, e.g., with "x", "rx" or "p".
516+
CursorMoved After the cursor was moved in Normal mode.
517+
Also when the text of the cursor line has been
518+
changed, e.g., with "x", "rx" or "p".
519519
Not triggered when there is typeahead or when
520520
an operator is pending.
521521
For an example see |match-parens|.
@@ -952,8 +952,7 @@ the autocommand is executed. This is different from the command!
952952

953953
*file-pattern*
954954
The pattern is interpreted like mostly used in file names:
955-
* matches any sequence of characters; Unusual: includes path
956-
separators
955+
* matches any sequence of characters
957956
? matches any single character
958957
\? matches a '?'
959958
. matches a '.'
@@ -962,9 +961,6 @@ The pattern is interpreted like mostly used in file names:
962961
\, matches a ','
963962
{ } like \( \) in a |pattern|
964963
, inside { }: like \| in a |pattern|
965-
\} literal }
966-
\{ literal {
967-
\\\{n,m\} like \{n,m} in a |pattern|
968964
\ special meaning like in a |pattern|
969965
[ch] matches 'c' or 'h'
970966
[^ch] match any character but 'c' and 'h'

en/change.txt

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*change.txt* For Vim version 7.4. Last change: 2013 Aug 25
1+
*change.txt* For Vim version 7.4. Last change: 2013 Mar 19
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -71,21 +71,9 @@ For inserting text see |insert.txt|.
7171
"D" deletes the highlighted text plus all text until
7272
the end of the line. {not in Vi}
7373

74-
*:d* *:de* *:del* *:delete* *:dl* *:dp*
74+
*:d* *:de* *:del* *:delete* *:dl*
7575
:[range]d[elete] [x] Delete [range] lines (default: current line) [into
7676
register x].
77-
Note these weird abbreviations:
78-
:dl delete and list
79-
:dell idem
80-
:delel idem
81-
:deletl idem
82-
:deletel idem
83-
:dp delete and print
84-
:dep idem
85-
:delp idem
86-
:delep idem
87-
:deletp idem
88-
:deletep idem
8977

9078
:[range]d[elete] [x] {count}
9179
Delete {count} lines, starting with [range]
@@ -1069,11 +1057,6 @@ another register. E.g., yank the text to copy, Visually select the text to
10691057
replace and use "0p . You can repeat this as many times as you like, the
10701058
unnamed register will be changed each time.
10711059

1072-
When you use a blockwise Visual mode command and yank only a single line into
1073-
a register, a paste on a visual selected area will paste that single line on
1074-
each of the selected lines (thus replacing the blockwise selected region by a
1075-
block of the pasted line).
1076-
10771060
*blockwise-register*
10781061
If you use a blockwise Visual mode command to get the text into the register,
10791062
the block of text will be inserted before ("P") or after ("p") the cursor
@@ -1131,8 +1114,6 @@ less than one line (the small delete register is used then). An exception is
11311114
made for the delete operator with these movement commands: |%|, |(|, |)|, |`|,
11321115
|/|, |?|, |n|, |N|, |{| and |}|. Register "1 is always used then (this is Vi
11331116
compatible). The "- register is used as well if the delete is within a line.
1134-
Note that these characters may be mapped. E.g. |%| is mapped by the matchit
1135-
plugin.
11361117
With each successive deletion or change, Vim shifts the previous contents
11371118
of register 1 into register 2, 2 into 3, and so forth, losing the previous
11381119
contents of register 9.

en/diff.txt

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*diff.txt* For Vim version 7.4. Last change: 2013 Sep 20
1+
*diff.txt* For Vim version 7.4. Last change: 2012 Sep 05
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -123,18 +123,14 @@ Since the option values are remembered with the buffer, you can edit another
123123
file for a moment and come back to the same file and be in diff mode again.
124124

125125
*:diffo* *:diffoff*
126-
:diffo[ff] Switch off diff mode for the current window. Resets related
127-
options also when 'diff' was not set.
126+
:diffo[ff] Switch off diff mode for the current window.
128127

129128
:diffo[ff]! Switch off diff mode for the current window and in all windows
130-
in the current tab page where 'diff' is set. Resetting
131-
related options only happens in a window that has 'diff' set,
132-
if the current window does not have 'diff' set then no options
133-
in it are changed.
134-
135-
The ":diffoff" command resets the relevant options to the values they had when
136-
using |:diffsplit|, |:diffpatch| , |:diffthis|. or starting Vim in diff mode.
137-
Otherwise they are set to their default value:
129+
in the current tab page where 'diff' is set.
130+
131+
The ":diffoff" command resets the relevant options to their default value.
132+
This may be different from what the values were before diff mode was started,
133+
the old values are not remembered.
138134

139135
'diff' off
140136
'scrollbind' off

en/eval.txt

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 7.4. Last change: 2013 Aug 24
1+
*eval.txt* For Vim version 7.3. Last change: 2013 May 21
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -123,7 +123,6 @@ around the arguments, to invoke the function it refers to. Example: >
123123
:echo Fn()
124124
< *E704* *E705* *E707*
125125
A Funcref variable must start with a capital, "s:", "w:", "t:" or "b:". You
126-
can use "g:" but the following name must still start with a capital. You
127126
cannot have both a Funcref variable and a function with the same name.
128127

129128
A special case is defining a function and directly assigning its Funcref to a
@@ -1907,8 +1906,6 @@ repeat( {expr}, {count}) String repeat {expr} {count} times
19071906
resolve( {filename}) String get filename a shortcut points to
19081907
reverse( {list}) List reverse {list} in-place
19091908
round( {expr}) Float round off {expr}
1910-
screenattr( {row}, {col}) Number attribute at screen position
1911-
screenchar( {row}, {col}) Number character at screen position
19121909
screencol() Number current cursor column
19131910
screenrow() Number current cursor row
19141911
search( {pattern} [, {flags} [, {stopline} [, {timeout}]]])
@@ -2776,8 +2773,7 @@ expand({expr} [, {nosuf} [, {list}]]) *expand()*
27762773
file name contains a space]
27772774

27782775
If the expansion fails, the result is an empty string. A name
2779-
for a non-existing file is not included, unless {expr} does
2780-
not start with '%', '#' or '<', see below.
2776+
for a non-existing file is not included.
27812777

27822778
When {expr} starts with '%', '#' or '<', the expansion is done
27832779
like for the |cmdline-special| variables with their associated
@@ -4894,21 +4890,6 @@ round({expr}) *round()*
48944890
< -5.0
48954891
{only available when compiled with the |+float| feature}
48964892

4897-
screenattr(row, col) *screenattr()*
4898-
Like screenchar(), but return the attribute. This is a rather
4899-
arbitrary number that can only be used to compare to the
4900-
attribute at other positions.
4901-
4902-
screenchar(row, col) *screenchar()*
4903-
The result is a Number, which is the character at position
4904-
[row, col] on the screen. This works for every possible
4905-
screen position, also status lines, window separators and the
4906-
command line. The top left position is row one, column one
4907-
The character excludes composing characters. For double-byte
4908-
encodings it may only be the first byte.
4909-
This is mainly to be used for testing.
4910-
Returns -1 when row or col is out of range.
4911-
49124893
screencol() *screencol()*
49134894
The result is a Number, which is the current screen column of
49144895
the cursor. The leftmost column has number 1.
@@ -5885,9 +5866,6 @@ system({expr} [, {input}]) *system()* *E677*
58855866
< To make the result more system-independent, the shell output
58865867
is filtered to replace <CR> with <NL> for Macintosh, and
58875868
<CR><NL> with <NL> for DOS-like systems.
5888-
To avoid the string being truncated at a NUL, all NUL
5889-
characters are replaced with SOH (0x01).
5890-
58915869
The command executed is constructed using several options:
58925870
'shell' 'shellcmdflag' 'shellxquote' {expr} 'shellredir' {tmp} 'shellxquote'
58935871
({tmp} is an automatically generated file name).
@@ -6338,7 +6316,6 @@ There are three types of features:
63386316
< Note that it's possible for patch 147 to be omitted even though 148 is
63396317
included.
63406318

6341-
acl Compiled with |ACL| support.
63426319
all_builtin_terms Compiled with all builtin terminals enabled.
63436320
amiga Amiga version of Vim.
63446321
arabic Compiled with Arabic support |Arabic|.
@@ -6505,9 +6482,7 @@ windows Compiled with support for more than one window.
65056482
writebackup Compiled with 'writebackup' default on.
65066483
xfontset Compiled with X fontset support |xfontset|.
65076484
xim Compiled with X input method support |xim|.
6508-
xpm Compiled with pixmap support.
6509-
xpm_w32 Compiled with pixmap support for Win32. (Only for
6510-
backward compatibility. Use "xpm" instead.)
6485+
xpm_w32 Compiled with pixmap support for Win32.
65116486
xsmp Compiled with X session management support.
65126487
xsmp_interact Compiled with interactive X session management support.
65136488
xterm_clipboard Compiled with support for xterm clipboard.

en/gui.txt

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*gui.txt* For Vim version 7.4. Last change: 2013 Jun 12
1+
*gui.txt* For Vim version 7.4. Last change: 2011 Jul 22
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -93,16 +93,10 @@ and initialize other things that you may want to set up differently from the
9393
terminal version.
9494

9595
Recommended place for your personal GUI initializations:
96-
Unix $HOME/.gvimrc or $HOME/.vim/gvimrc
97-
OS/2 $HOME/.gvimrc, $HOME/vimfiles/gvimrc
98-
or $VIM/.gvimrc
99-
MS-DOS and Win32 $HOME/_gvimrc, $HOME/vimfiles/gvimrc
100-
or $VIM/_gvimrc
101-
Amiga s:.gvimrc, home:.gvimrc, home:vimfiles:gvimrc
102-
or $VIM/.gvimrc
103-
104-
The personal initialization files are searched in the order specified above
105-
and only the first one that is found is read.
96+
Unix $HOME/.gvimrc
97+
OS/2 $HOME/.gvimrc or $VIM/.gvimrc
98+
MS-DOS and Win32 $HOME/_gvimrc or $VIM/_gvimrc
99+
Amiga s:.gvimrc or $VIM/.gvimrc
106100

107101
There are a number of options which only have meaning in the GUI version of
108102
Vim. These are 'guicursor', 'guifont', 'guipty' and 'guioptions'. They are

en/if_lua.txt

Lines changed: 14 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*if_lua.txt* For Vim version 7.4. Last change: 2013 Sep 04
1+
*if_lua.txt* For Vim version 7.4. Last change: 2012 Jun 29
22

33

44
VIM REFERENCE MANUAL by Luis Carvalho
@@ -10,10 +10,9 @@ The Lua Interface to Vim *lua* *Lua*
1010
2. The vim module |lua-vim|
1111
3. List userdata |lua-list|
1212
4. Dict userdata |lua-dict|
13-
5. Funcref userdata |lua-funcref|
14-
6. Buffer userdata |lua-buffer|
15-
7. Window userdata |lua-window|
16-
8. The luaeval function |lua-luaeval|
13+
5. Buffer userdata |lua-buffer|
14+
6. Window userdata |lua-window|
15+
7. The luaeval function |lua-luaeval|
1716

1817
{Vi does not have any of these commands}
1918

@@ -111,31 +110,9 @@ input range are stored in "vim.firstline" and "vim.lastline" respectively. The
111110
module also includes routines for buffer, window, and current line queries,
112111
Vim evaluation and command execution, and others.
113112

114-
vim.list([arg]) Returns an empty list or, if "arg" is a Lua
115-
table with numeric keys 1, ..., n (a
116-
"sequence"), returns a list l such that l[i] =
117-
arg[i] for i = 1, ..., n (see |List|).
118-
Non-numeric keys are not used to initialize
119-
the list. See also |lua-eval| for conversion
120-
rules. Example: >
121-
:lua t = {math.pi, false, say = 'hi'}
122-
:echo luaeval('vim.list(t)')
123-
:" [3.141593, 0], 'say' is ignored
124-
<
125-
vim.dict([arg]) Returns an empty dictionary or, if "arg" is a
126-
Lua table, returns a dict d such that d[k] =
127-
arg[k] for all string keys k in "arg" (see
128-
|Dictionary|). Number keys are converted to
129-
strings. Keys that are not strings are not
130-
used to initialize the dictionary. See also
131-
|lua-eval| for conversion rules. Example: >
132-
:lua t = {math.pi, false, say = 'hi'}
133-
:echo luaeval('vim.dict(t)')
134-
:" {'say': 'hi'}, numeric keys ignored
135-
<
136-
vim.funcref({name}) Returns a Funcref to function {name} (see
137-
|Funcref|). It is equivalent to Vim's
138-
"function". NOT IMPLEMENTED YET
113+
vim.list() Returns an empty list (see |List|).
114+
115+
vim.dict() Returns an empty dictionary (see |Dictionary|).
139116

140117
vim.buffer([arg]) If "arg" is a number, returns buffer with
141118
number "arg" in the buffer list or, if "arg"
@@ -154,9 +131,9 @@ Vim evaluation and command execution, and others.
154131

155132
vim.type({arg}) Returns the type of {arg}. It is equivalent to
156133
Lua's "type" function, but returns "list",
157-
"dict", "funcref", "buffer", or "window" if
158-
{arg} is a list, dictionary, funcref, buffer,
159-
or window, respectively. Examples: >
134+
"dict", "buffer", or "window" if {arg} is a
135+
list, dictionary, buffer, or window,
136+
respectively. Examples: >
160137
:lua l = vim.list()
161138
:lua print(type(l), vim.type(l))
162139
:" userdata list
@@ -252,40 +229,7 @@ Examples:
252229
<
253230

254231
==============================================================================
255-
5. Funcref userdata *lua-funcref*
256-
257-
Funcref userdata represent funcref variables in Vim. Funcrefs that were
258-
defined with a "dict" attribute need to be obtained as a dictionary key
259-
in order to have "self" properly assigned to the dictionary (see examples
260-
below.) A funcref "f" has the following properties:
261-
262-
Properties
263-
----------
264-
o "#f" is the name of the function referenced by "f"
265-
o "f(...)" calls the function referenced by "f" (with arguments)
266-
267-
Examples:
268-
>
269-
:function I(x)
270-
: return a:x
271-
: endfunction
272-
:let R = function('I')
273-
:lua i1 = vim.funcref('I')
274-
:lua i2 = vim.eval('R')
275-
:lua print(#i1, #i2) -- both 'I'
276-
:lua print(i1, i2, #i2(i1) == #i1(i2))
277-
:function Mylen() dict
278-
: return len(self.data)
279-
: endfunction
280-
:let mydict = {'data': [0, 1, 2, 3]}
281-
:lua d = vim.eval('mydict'); d.len = vim.funcref('Mylen')
282-
:echo mydict.len()
283-
:lua l = d.len -- assign d as 'self'
284-
:lua print(l())
285-
<
286-
287-
==============================================================================
288-
6. Buffer userdata *lua-buffer*
232+
5. Buffer userdata *lua-buffer*
289233

290234
Buffer userdata represent vim buffers. A buffer userdata "b" has the following
291235
properties and methods:
@@ -337,7 +281,7 @@ Examples:
337281
<
338282

339283
==============================================================================
340-
7. Window userdata *lua-window*
284+
6. Window userdata *lua-window*
341285

342286
Window objects represent vim windows. A window userdata "w" has the following
343287
properties and methods:
@@ -369,7 +313,7 @@ Examples:
369313
<
370314

371315
==============================================================================
372-
8. The luaeval function *lua-luaeval* *lua-eval*
316+
7. The luaeval function *lua-luaeval* *lua-eval*
373317

374318
The (dual) equivalent of "vim.eval" for passing Lua values to Vim is
375319
"luaeval". "luaeval" takes an expression string and an optional argument and
@@ -381,13 +325,7 @@ returns the result of the expression. It is semantically equivalent in Lua to:
381325
return chunk(arg) -- return typval
382326
end
383327
<
384-
Note that "_A" receives the argument to "luaeval". Lua numbers, strings, and
385-
list, dict, and funcref userdata are converted to their Vim respective types,
386-
while Lua booleans are converted to numbers. An error is thrown if conversion
387-
of any of the remaining Lua types, including userdata other than lists, dicts,
388-
and funcrefs, is attempted.
389-
390-
Examples: >
328+
Note that "_A" receives the argument to "luaeval". Examples: >
391329
392330
:echo luaeval('math.pi')
393331
:lua a = vim.list():add('newlist')

en/if_perl.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*if_perl.txt* For Vim version 7.4. Last change: 2013 Oct 05
1+
*if_perl.txt* For Vim version 7.4. Last change: 2012 Oct 25
22

33

44
VIM REFERENCE MANUAL by Sven Verdoolaege

0 commit comments

Comments
 (0)