Skip to content

Commit 7566335

Browse files
committed
start to catch up project
1 parent ccbf1c8 commit 7566335

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+2601
-974
lines changed

catchup-7.4.1194.md

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# 7.4.1194 に追いつくプロジェクト
2+
3+
ここらでいっちょ最新に追いつこうぜ、というプロジェクト。最低限、新機能のド
4+
キュメントを未翻訳のままでも、日本語ファイルに組み入れてしまう。
5+
6+
最近Vim本体の更新が激しいので、多少のズレはでてしまうが、まずは気にせず1194を
7+
ターゲットにする。
8+
9+
## 流れ
10+
11+
1. 英語ファイルを全部更新 (終わった!)
12+
2. 1の差分を見ながら、日本語ファイルに英文のまま反映 (最低限の目標)
13+
3. 2の差分を翻訳 (できたらココまでやりたい)
14+
4. このファイルを削除
15+
16+
## ファイル一覧
17+
18+
### 未作業
19+
20+
追いついたファイルは、下記の一覧から削除し、適切なセクションへ移動
21+
22+
doc/autocmd.jax
23+
doc/change.jax
24+
doc/cmdline.jax
25+
doc/develop.jax
26+
doc/editing.jax
27+
doc/eval.jax
28+
doc/filetype.jax
29+
doc/fold.jax
30+
doc/hangulin.jax
31+
doc/help.jax
32+
doc/if_lua.jax
33+
doc/if_mzsch.jax
34+
doc/if_perl.jax
35+
doc/if_pyth.jax
36+
doc/if_ruby.jax
37+
doc/if_tcl.jax
38+
doc/index.jax
39+
doc/insert.jax
40+
doc/map.jax
41+
doc/mlang.jax
42+
doc/netbeans.jax
43+
doc/options.jax
44+
doc/os_os2.jax
45+
doc/pattern.jax
46+
doc/pi_netrw.jax
47+
doc/quickfix.jax
48+
doc/quickref.jax
49+
doc/repeat.jax
50+
doc/spell.jax
51+
doc/syntax.jax
52+
doc/tagsrch.jax
53+
doc/term.jax
54+
doc/usr_02.jax
55+
doc/usr_03.jax
56+
doc/usr_29.jax
57+
doc/usr_41.jax
58+
doc/usr_43.jax
59+
doc/various.jax
60+
doc/vi_diff.jax
61+
doc/windows.jax
62+
63+
### 英文だけは反映済み
64+
65+
まだない
66+
67+
### 完訳!
68+
69+
まだない
70+
71+
### その他/深い事情があって断念したもの
72+
73+
まだない

en/autocmd.txt

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

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -506,6 +506,8 @@ ColorScheme After loading a color scheme. |:colorscheme|
506506
CompleteDone After Insert mode completion is done. Either
507507
when something was completed or abandoning
508508
completion. |ins-completion|
509+
The |v:completed_item| variable contains
510+
information about the completed item.
509511

510512
*CursorHold*
511513
CursorHold When the user doesn't press a key for the time
@@ -520,6 +522,11 @@ CursorHold When the user doesn't press a key for the time
520522
operator.
521523
While recording the CursorHold event is not
522524
triggered. |q|
525+
*<CursorHold>*
526+
Internally the autocommand is triggered by the
527+
<CursorHold> key. In an expression mapping
528+
|getchar()| may see this character.
529+
523530
Note: Interactive commands cannot be used for
524531
this event. There is no hit-enter prompt,
525532
the screen is updated directly (when needed).
@@ -952,6 +959,13 @@ WinLeave Before leaving a window. If the window to be
952959
==============================================================================
953960
6. Patterns *autocmd-patterns* *{pat}*
954961

962+
The {pat} argument can be a comma separated list. This works as if the
963+
command was given with each pattern separately. Thus this command: >
964+
:autocmd BufRead *.txt,*.info set et
965+
Is equivalent to: >
966+
:autocmd BufRead *.txt set et
967+
:autocmd BufRead *.info set et
968+
955969
The file pattern {pat} is tested for a match against the file name in one of
956970
two ways:
957971
1. When there is no '/' in the pattern, Vim checks for a match against only
@@ -1058,7 +1072,7 @@ Instead of a pattern buffer-local autocommands use one of these forms:
10581072
Examples: >
10591073
:au CursorHold <buffer> echo 'hold'
10601074
:au CursorHold <buffer=33> echo 'hold'
1061-
:au CursorHold <buffer=abuf> echo 'hold'
1075+
:au BufNewFile * au CursorHold <buffer=abuf> echo 'hold'
10621076
10631077
All the commands for autocommands also work with buffer-local autocommands,
10641078
simply use the special string instead of the pattern. Examples: >
@@ -1117,6 +1131,9 @@ name!
11171131
:aug[roup] {name} Define the autocmd group name for the
11181132
following ":autocmd" commands. The name "end"
11191133
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.
11201137

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

en/change.txt

Lines changed: 62 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*change.txt* For Vim version 7.4. Last change: 2015 Sep 06
1+
*change.txt* For Vim version 7.4. Last change: 2016 Jan 19
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -416,9 +416,14 @@ CTRL-X Subtract [count] from the number or alphabetic
416416
additional [count] (so effectively creating a [count]
417417
decrementing sequence). {not in Vi}
418418

419-
The CTRL-A and CTRL-X commands work for (signed) decimal numbers, unsigned
420-
octal and hexadecimal numbers and alphabetic characters. This depends on the
421-
'nrformats' option.
419+
The CTRL-A and CTRL-X commands can work for:
420+
- signed and unsigned decimal numbers
421+
- unsigned binary, octal and hexadecimal numbers
422+
- alphabetic characters
423+
424+
This depends on the 'nrformats' option:
425+
- When 'nrformats' includes "bin", Vim assumes numbers starting with '0b' or
426+
'0B' are binary.
422427
- When 'nrformats' includes "octal", Vim considers numbers starting with a '0'
423428
to be octal, unless the number includes a '8' or '9'. Other numbers are
424429
decimal and may have a preceding minus sign.
@@ -433,8 +438,8 @@ octal and hexadecimal numbers and alphabetic characters. This depends on the
433438
index.
434439

435440
For decimals a leading negative sign is considered for incrementing/
436-
decrementing, for octal and hex values, it won't be considered.
437-
To ignore the sign Visually select the number before using CTRL-A or CTRL-X.
441+
decrementing, for binary, octal and hex values, it won't be considered. To
442+
ignore the sign Visually select the number before using CTRL-A or CTRL-X.
438443

439444
For numbers with leading zeros (including all octal and hexadecimal numbers),
440445
Vim preserves the number of characters in the number when possible. CTRL-A on
@@ -447,6 +452,10 @@ octal number.
447452
Note that when 'nrformats' includes "octal", decimal numbers with leading
448453
zeros cause mistakes, because they can be confused with octal numbers.
449454

455+
Note similarly, when 'nrformats' includes "bin", binary numbers with a leading
456+
'0x' or '0X' can be interpreted as hexadecimal rather than binary since '0b'
457+
are valid hexadecimal digits.
458+
450459
The CTRL-A command is very useful in a macro. Example: Use the following
451460
steps to make a numbered list.
452461

@@ -863,6 +872,36 @@ either the first or second pattern in parentheses did not match, so either
863872
:s/\([ab]\)\|\([cd]\)/\1x/g modifies "a b c d" to "ax bx x x"
864873
<
865874

875+
*:sc* *:sce* *:scg* *:sci* *:scI* *:scl* *:scp* *:sg* *:sgc*
876+
*:sge* *:sgi* *:sgI* *:sgl* *:sgn* *:sgp* *:sgr* *:sI* *:si*
877+
*:sic* *:sIc* *:sie* *:sIe* *:sIg* *:sIl* *:sin* *:sIn* *:sIp*
878+
*:sip* *:sIr* *:sir* *:sr* *:src* *:srg* *:sri* *:srI* *:srl*
879+
*:srn* *:srp*
880+
2-letter and 3-letter :substitute commands ~
881+
882+
List of :substitute commands
883+
| c e g i I n p l r
884+
| c :sc :sce :scg :sci :scI :scn :scp :scl ---
885+
| e
886+
| g :sgc :sge :sg :sgi :sgI :sgn :sgp :sgl :sgr
887+
| i :sic :sie --- :si :siI :sin :sip --- :sir
888+
| I :sIc :sIe :sIg :sIi :sI :sIn :sIp :sIl :sIr
889+
| n
890+
| p
891+
| l
892+
| r :src --- :srg :sri :srI :srn :srp :srl :sr
893+
894+
Exceptions:
895+
:scr is `:scriptnames`
896+
:se is `:set`
897+
:sig is `:sign`
898+
:sil is `:silent`
899+
:sn is `:snext`
900+
:sp is `:split`
901+
:sl is `:sleep`
902+
:sre is `:srewind`
903+
904+
866905
Substitute with an expression *sub-replace-expression*
867906
*sub-replace-\=* *s/\=*
868907
When the substitute string starts with "\=" the remainder is interpreted as an
@@ -968,7 +1007,7 @@ inside of strings can change! Also see 'softtabstop' option. >
9681007

9691008
:reg[isters] {arg} Display the contents of the numbered and named
9701009
registers that are mentioned in {arg}. For example: >
971-
:dis 1a
1010+
:reg 1a
9721011
< to display registers '1' and 'a'. Spaces are allowed
9731012
in {arg}. {not in Vi}
9741013

@@ -1706,18 +1745,26 @@ Vim has a sorting function and a sorting command. The sorting function can be
17061745
found here: |sort()|, |uniq()|.
17071746

17081747
*:sor* *:sort*
1709-
:[range]sor[t][!] [i][u][r][n][x][o] [/{pattern}/]
1748+
:[range]sor[t][!] [b][f][i][n][o][r][u][x] [/{pattern}/]
17101749
Sort lines in [range]. When no range is given all
17111750
lines are sorted.
17121751

17131752
With [!] the order is reversed.
17141753

17151754
With [i] case is ignored.
17161755

1756+
Options [n][f][x][o][b] are mutually exclusive.
1757+
17171758
With [n] sorting is done on the first decimal number
17181759
in the line (after or inside a {pattern} match).
17191760
One leading '-' is included in the number.
17201761

1762+
With [f] sorting is done on the Float in the line.
1763+
The value of Float is determined similar to passing
1764+
the text (after or inside a {pattern} match) to
1765+
str2float() function. This option is available only
1766+
if Vim was compiled with Floating point support.
1767+
17211768
With [x] sorting is done on the first hexadecimal
17221769
number in the line (after or inside a {pattern}
17231770
match). A leading "0x" or "0X" is ignored.
@@ -1726,10 +1773,13 @@ found here: |sort()|, |uniq()|.
17261773
With [o] sorting is done on the first octal number in
17271774
the line (after or inside a {pattern} match).
17281775

1729-
With [u] only keep the first of a sequence of
1730-
identical lines (ignoring case when [i] is used).
1731-
Without this flag, a sequence of identical lines
1732-
will be kept in their original order.
1776+
With [b] sorting is done on the first binary number in
1777+
the line (after or inside a {pattern} match).
1778+
1779+
With [u] (u stands for unique) only keep the first of
1780+
a sequence of identical lines (ignoring case when [i]
1781+
is used). Without this flag, a sequence of identical
1782+
lines will be kept in their original order.
17331783
Note that leading and trailing white space may cause
17341784
lines to be different.
17351785

en/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).

en/develop.txt

Lines changed: 43 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*develop.txt* For Vim version 7.4. Last change: 2014 Mar 27
1+
*develop.txt* For Vim version 7.4. Last change: 2016 Jan 19
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -166,12 +166,27 @@ This list is not complete. Look in the source code for more examples.
166166
MAKING CHANGES *style-changes*
167167

168168
The basic steps to make changes to the code:
169-
1. Adjust the documentation. Doing this first gives you an impression of how
169+
1. Get the code from github. That makes it easier to keep your changed
170+
version in sync with the main code base (it may be a while before your
171+
changes will be included). You do need to spend some time learning git,
172+
it's not the most user friendly tool.
173+
2. Adjust the documentation. Doing this first gives you an impression of how
170174
your changes affect the user.
171-
2. Make the source code changes.
172-
3. Check ../doc/todo.txt if the change affects any listed item.
173-
4. Make a patch with "diff -c" against the unmodified code and docs.
174-
5. Make a note about what changed and include it with the patch.
175+
3. Make the source code changes.
176+
4. Check ../doc/todo.txt if the change affects any listed item.
177+
5. Make a patch with "git diff". You can also create a pull request on
178+
github, but it's the diff that matters.
179+
6. Make a note about what changed, preferably mentioning the problem and the
180+
solution. Send an email to the vim-dev maillist with an explanation and
181+
include the diff. Or create a pull request on github.
182+
183+
184+
C COMPILER *style-compiler*
185+
186+
The minimal C compiler version supported is C89, also known as ANSI C.
187+
Later standards don't add much and C89 is the widest supported.
188+
189+
One restriction that this implies: no // comments, only /* comments */.
175190

176191

177192
USE OF COMMON FUNCTIONS *style-functions*
@@ -197,7 +212,7 @@ NAMES *style-names*
197212

198213
Function names can not be more than 31 characters long (because of VMS).
199214

200-
Don't use "delete" as a variable name, C++ doesn't like it.
215+
Don't use "delete" or "this" as a variable name, C++ doesn't like it.
201216

202217
Because of the requirement that Vim runs on as many systems as possible, we
203218
need to avoid using names that are already defined by the system. This is a
@@ -288,6 +303,24 @@ OK: do
288303
a = 1;
289304
while (cond);
290305

306+
Wrong: if (cond) {
307+
cmd;
308+
cmd;
309+
} else {
310+
cmd;
311+
cmd;
312+
}
313+
314+
OK: if (cond)
315+
{
316+
cmd;
317+
cmd;
318+
}
319+
else
320+
{
321+
cmd;
322+
cmd;
323+
}
291324

292325
Functions start with:
293326

@@ -299,9 +332,9 @@ OK: /*
299332
* Return value explanation.
300333
*/
301334
int
302-
function_name(arg1, arg2)
303-
int arg1; /* short comment about arg1 */
304-
int arg2; /* short comment about arg2 */
335+
function_name(
336+
int arg1, /* short comment about arg1 */
337+
int arg2) /* short comment about arg2 */
305338
{
306339
int local; /* comment about local */
307340

0 commit comments

Comments
 (0)