Skip to content

Commit 516a0d1

Browse files
authored
Merge pull request #2367 from h-east/update-editing
Update editing.{txt,jax}
2 parents 3cf187e + f195c90 commit 516a0d1

File tree

2 files changed

+37
-38
lines changed

2 files changed

+37
-38
lines changed

doc/editing.jax

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*editing.txt* For Vim バージョン 9.1. Last change: 2025 Sep 09
1+
*editing.txt* For Vim バージョン 9.1. Last change: 2025 Oct 14
22

33

44
VIMリファレンスマニュアル by Bram Moolenaar
@@ -39,8 +39,8 @@
3939
ファイルを切り替えることができる。ただし|:keepalt|を使ったときは代替ファイル名
4040
は変わらない。代替ファイル名はウィンドウごとに記憶される。
4141

42-
*:keepalt* *:keepa*
43-
:keepalt {cmd} 現在の代替ファイル名を変えずに{cmd}を実行する。Note 間
42+
*:keepa* *:keepalt*
43+
:keepa[lt] {cmd} 現在の代替ファイル名を変えずに{cmd}を実行する。Note 間
4444
接的に呼び出されるコマンド(例えば関数によって)は代替
4545
ファイル名を変えてしまう。
4646

@@ -135,10 +135,9 @@ Vim は入力したファイル名のフルパス名を記憶している。フ
135135
ファイル名に 'backupext' を追加したものである。既定値は "~" という妙なものだが、
136136
これはたまたま存在しているファイルに上書きするのを避けるためである。".bak" の
137137
方がよければ、'backupext' を変更すること。MS-Window 機等で、MS-DOS 系のファイ
138-
ルシステム (例えば、messydos や crossdos) が使われていることが検出されたとき
139-
や、'shortname' がオンのときには、余分なドットは '_' に置き換えられる。
140-
'backupdir' を設定することで、バックアップファイルを他のディレクトリに置くこと
141-
ができる。
138+
ルシステムが使われていることが検出されたときや、'shortname' がオンのときには、
139+
余分なドットは '_' に置き換えられる。'backupdir' を設定することで、バックアッ
140+
プファイルを他のディレクトリに置くことができる。
142141

143142
*auto-shortname*
144143
技術的情報: Amiga ではファイル名に 30 文字まで使える。しかし MS-DOS 互換のファ
@@ -1403,7 +1402,7 @@ has("browsefilter") を使用する: >
14031402
動すると {path} の使用を止める。
14041403

14051404
*:lcd-*
1406-
:lcd[!] - 前のカレントディレクトリ (前にコマンド ":lcd {path}" で
1405+
:lc[d][!] - 前のカレントディレクトリ (前にコマンド ":lcd {path}" で
14071406
移った所) に移る。
14081407

14091408
*:lch* *:lchdir*

en/editing.txt

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*editing.txt* For Vim version 9.1. Last change: 2025 Sep 09
1+
*editing.txt* For Vim version 9.1. Last change: 2025 Oct 14
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -40,8 +40,8 @@ the |CTRL-^| command to toggle between the current and the alternate file.
4040
However, the alternate file name is not changed when |:keepalt| is used.
4141
An alternate file name is remembered for each window.
4242

43-
*:keepalt* *:keepa*
44-
:keepalt {cmd} Execute {cmd} while keeping the current alternate file
43+
*:keepa* *:keepalt*
44+
:keepa[lt] {cmd} Execute {cmd} while keeping the current alternate file
4545
name. Note that commands invoked indirectly (e.g.,
4646
with a function) may still set the alternate file
4747
name.
@@ -134,11 +134,11 @@ set, Vim renames or copies the original file before it will be overwritten.
134134
You can use this file if you discover that you need the original file. See
135135
also the 'patchmode' option. The name of the backup file is normally the same
136136
as the original file with 'backupext' appended. The default "~" is a bit
137-
strange to avoid accidentally overwriting existing files. If you prefer ".bak"
138-
change the 'backupext' option. Extra dots are replaced with '_' on MS-Windows
139-
machines, when Vim has detected that an MS-DOS-like filesystem is being used
140-
(e.g., messydos or crossdos) or when the 'shortname' option is on. The
141-
backup file can be placed in another directory by setting 'backupdir'.
137+
strange to avoid accidentally overwriting existing files. If you prefer
138+
".bak" change the 'backupext' option. Extra dots are replaced with '_' on
139+
MS-Windows machines, when Vim has detected that an MS-DOS-like filesystem is
140+
being used, or when the 'shortname' option is on.
141+
The backup file can be placed in another directory by setting 'backupdir'.
142142

143143
*auto-shortname*
144144
Technical: On the Amiga you can use 30 characters for a file name. But on an
@@ -297,7 +297,7 @@ CTRL-^ Edit the alternate file. Mostly the alternate file is
297297
Mnemonic: "goto file".
298298
Uses the 'isfname' option to find out which characters
299299
are supposed to be in a file name. Trailing
300-
punctuation characters ".,:;!" are ignored. Escaped
300+
punctuation characters ".,:;!" are ignored. Escaped
301301
spaces "\ " are reduced to a single space.
302302
Uses the 'path' option as a list of directory names to
303303
look for the file. See the 'path' option for details
@@ -335,7 +335,7 @@ CTRL-^ Edit the alternate file. Mostly the alternate file is
335335
the file.
336336
The file name and the number must be separated by a
337337
non-filename (see 'isfname') and non-numeric
338-
character. " line " is also recognized, like it is
338+
character. " line " is also recognized, like it is
339339
used in the output of `:verbose command UserCmd`
340340
White space between the filename, the separator and
341341
the number are ignored.
@@ -387,7 +387,7 @@ is to use "path\[[]abc]", this matches the file "path\[abc]".
387387

388388
*starstar-wildcard*
389389
Expanding "**" is possible on Unix, Win32, macOS and a few other systems (but
390-
it may depend on your 'shell' setting on Unix and macOS. It's known to work
390+
it may depend on your 'shell' setting on Unix and macOS. It's known to work
391391
correctly for zsh; for bash this requires at least bash version >= 4.X).
392392
This allows searching a directory tree. This goes up to 100 directories deep.
393393
Note there are some commands where this works slightly differently, see
@@ -400,7 +400,7 @@ Finds files:
400400
a/b/c/d/ccc.txt ~
401401
When non-wildcard characters are used right before or after "**" these are
402402
only matched in the top directory. They are not used for directories further
403-
down in the tree. For example: >
403+
down in the tree. For example: >
404404
:n /usr/inc**/types.h
405405
Finds files:
406406
/usr/include/types.h ~
@@ -418,9 +418,9 @@ argument, for example: >
418418
Vim will run the command in backticks using the 'shell' and use the standard
419419
output as argument for the given Vim command (error messages from the shell
420420
command will be discarded).
421-
To see what shell command Vim is running, set the 'verbose' option to 4. When
421+
To see what shell command Vim is running, set the 'verbose' option to 4. When
422422
the shell command returns a non-zero exit code, an error message will be
423-
displayed and the Vim command will be aborted. To avoid this make the shell
423+
displayed and the Vim command will be aborted. To avoid this make the shell
424424
always return zero like so: >
425425
:next `find . -name ver\\*.c -print \|\| true`
426426
@@ -669,7 +669,7 @@ list of the current window.
669669
[count] is used like with |:argadd|.
670670
If the current file cannot be |abandon|ed {name}s will
671671
still be added to the argument list, but won't be
672-
edited. No check for duplicates is done.
672+
edited. No check for duplicates is done.
673673
Also see |++opt| and |+cmd|.
674674

675675
:[count]arga[dd] {name} ... *:arga* *:argadd* *E479*
@@ -1418,7 +1418,7 @@ present in 'cpoptions' and "!" is not used in the command.
14181418
to another window will stop using {path}.
14191419

14201420
*:lcd-*
1421-
:lcd[!] - Change to the previous current directory, before the
1421+
:lc[d][!] - Change to the previous current directory, before the
14221422
last ":lcd {path}" command.
14231423

14241424
*:lch* *:lchdir*
@@ -1429,7 +1429,7 @@ present in 'cpoptions' and "!" is not used in the command.
14291429
Also see |getcwd()|.
14301430
*:pwd-verbose*
14311431
When 'verbose' is non-zero, |:pwd| will also display
1432-
what scope the current directory was set. Example: >
1432+
what scope the current directory was set. Example: >
14331433
14341434
" Set by :cd
14351435
:verbose pwd
@@ -1459,8 +1459,8 @@ When a |:tcd| command has been used for a tab page, the specified directory
14591459
becomes the current directory for the current tab page and the current window.
14601460
The current directory of other tab pages is not affected. When jumping to
14611461
another tab page, the current directory is changed to the last specified local
1462-
directory for that tab page. If the current tab has no local current directory
1463-
the global current directory is used.
1462+
directory for that tab page. If the current tab has no local current
1463+
directory the global current directory is used.
14641464

14651465
When a |:cd| command is used, the current window and tab page will lose the
14661466
local current directory and will use the global current directory from now on.
@@ -1588,7 +1588,7 @@ To test for blowfish support you can use these conditions: >
15881588
has('crypt-blowfish')
15891589
has('crypt-blowfish2')
15901590
This works since Vim 7.4.1099 while blowfish support was added earlier.
1591-
Thus the condition failing doesn't mean blowfish is not supported. You can
1591+
Thus the condition failing doesn't mean blowfish is not supported. You can
15921592
test for blowfish with: >
15931593
v:version >= 703
15941594
And for blowfish2 with: >
@@ -1652,7 +1652,7 @@ Notes:
16521652
algorithm in detail.
16531653
- The implementation of 'cryptmethod' "blowfish" has a flaw. It is possible
16541654
to crack the first 64 bytes of a file and in some circumstances more of the
1655-
file. Use of it is not recommended, but it's still the strongest method
1655+
file. Use of it is not recommended, but it's still the strongest method
16561656
supported by Vim 7.3 and 7.4. The "zip" method is even weaker.
16571657
- Vim originates from the Netherlands. That is where the sources come from.
16581658
Thus the encryption code is not exported from the USA.
@@ -1744,24 +1744,24 @@ ask if you really want to overwrite the file:
17441744
WARNING: The file has been changed since reading it!!!
17451745
Do you really want to write to it (y/n)?
17461746

1747-
If you hit 'y' Vim will continue writing the file. If you hit 'n' the write is
1748-
aborted. If you used ":wq" or "ZZ" Vim will not exit, you will get another
1747+
If you hit 'y' Vim will continue writing the file. If you hit 'n' the write
1748+
is aborted. If you used ":wq" or "ZZ" Vim will not exit, you will get another
17491749
chance to write the file.
17501750

17511751
The message would normally mean that somebody has written to the file after
17521752
the edit session started. This could be another person, in which case you
17531753
probably want to check if your changes to the file and the changes from the
1754-
other person should be merged. Write the file under another name and check for
1755-
differences (the "diff" program can be used for this).
1754+
other person should be merged. Write the file under another name and check
1755+
for differences (the "diff" program can be used for this).
17561756

17571757
It is also possible that you modified the file yourself, from another edit
17581758
session or with another command (e.g., a filter command). Then you will know
17591759
which version of the file you want to keep.
17601760

17611761
The accuracy of the time check depends on the filesystem. On Unix it is
1762-
usually sub-second. With old file systems and on MS-Windows it is normally one
1763-
second. Use `has('nanotime')` to check if sub-second time stamp checks are
1764-
available.
1762+
usually sub-second. With old file systems and on MS-Windows it is normally
1763+
one second. Use `has('nanotime')` to check if sub-second time stamp checks
1764+
are available.
17651765

17661766
There is one situation where you get the message while there is nothing wrong:
17671767
On a Win32 system on the day daylight saving time starts. There is something
@@ -1791,8 +1791,8 @@ There are three different types of searching:
17911791
- It ONLY matches directories.
17921792
- It matches up to 30 directories deep by default, so you can use it to
17931793
search an entire directory tree
1794-
- The maximum number of levels matched can be given by appending a number
1795-
to '**'.
1794+
- The maximum number of levels matched can be given by appending a
1795+
number to '**'.
17961796
Thus '/usr/**2' can match: >
17971797
/usr
17981798
/usr/include

0 commit comments

Comments
 (0)