diff --git a/doc/editing.jax b/doc/editing.jax index 1714a42f1..dad2d8bf8 100644 --- a/doc/editing.jax +++ b/doc/editing.jax @@ -1,4 +1,4 @@ -*editing.txt* For Vim バージョン 9.1. Last change: 2025 Sep 09 +*editing.txt* For Vim バージョン 9.1. Last change: 2025 Oct 14 VIMリファレンスマニュアル by Bram Moolenaar @@ -39,8 +39,8 @@ ファイルを切り替えることができる。ただし|:keepalt|を使ったときは代替ファイル名 は変わらない。代替ファイル名はウィンドウごとに記憶される。 - *:keepalt* *:keepa* -:keepalt {cmd} 現在の代替ファイル名を変えずに{cmd}を実行する。Note 間 + *:keepa* *:keepalt* +:keepa[lt] {cmd} 現在の代替ファイル名を変えずに{cmd}を実行する。Note 間 接的に呼び出されるコマンド(例えば関数によって)は代替 ファイル名を変えてしまう。 @@ -135,10 +135,9 @@ Vim は入力したファイル名のフルパス名を記憶している。フ ファイル名に 'backupext' を追加したものである。既定値は "~" という妙なものだが、 これはたまたま存在しているファイルに上書きするのを避けるためである。".bak" の 方がよければ、'backupext' を変更すること。MS-Window 機等で、MS-DOS 系のファイ -ルシステム (例えば、messydos や crossdos) が使われていることが検出されたとき -や、'shortname' がオンのときには、余分なドットは '_' に置き換えられる。 -'backupdir' を設定することで、バックアップファイルを他のディレクトリに置くこと -ができる。 +ルシステムが使われていることが検出されたときや、'shortname' がオンのときには、 +余分なドットは '_' に置き換えられる。'backupdir' を設定することで、バックアッ +プファイルを他のディレクトリに置くことができる。 *auto-shortname* 技術的情報: Amiga ではファイル名に 30 文字まで使える。しかし MS-DOS 互換のファ @@ -1403,7 +1402,7 @@ has("browsefilter") を使用する: > 動すると {path} の使用を止める。 *:lcd-* -:lcd[!] - 前のカレントディレクトリ (前にコマンド ":lcd {path}" で +:lc[d][!] - 前のカレントディレクトリ (前にコマンド ":lcd {path}" で 移った所) に移る。 *:lch* *:lchdir* diff --git a/en/editing.txt b/en/editing.txt index 022bdee1b..6141dcec1 100644 --- a/en/editing.txt +++ b/en/editing.txt @@ -1,4 +1,4 @@ -*editing.txt* For Vim version 9.1. Last change: 2025 Sep 09 +*editing.txt* For Vim version 9.1. Last change: 2025 Oct 14 VIM REFERENCE MANUAL by Bram Moolenaar @@ -40,8 +40,8 @@ the |CTRL-^| command to toggle between the current and the alternate file. However, the alternate file name is not changed when |:keepalt| is used. An alternate file name is remembered for each window. - *:keepalt* *:keepa* -:keepalt {cmd} Execute {cmd} while keeping the current alternate file + *:keepa* *:keepalt* +:keepa[lt] {cmd} Execute {cmd} while keeping the current alternate file name. Note that commands invoked indirectly (e.g., with a function) may still set the alternate file name. @@ -134,11 +134,11 @@ set, Vim renames or copies the original file before it will be overwritten. You can use this file if you discover that you need the original file. See also the 'patchmode' option. The name of the backup file is normally the same as the original file with 'backupext' appended. The default "~" is a bit -strange to avoid accidentally overwriting existing files. If you prefer ".bak" -change the 'backupext' option. Extra dots are replaced with '_' on MS-Windows -machines, when Vim has detected that an MS-DOS-like filesystem is being used -(e.g., messydos or crossdos) or when the 'shortname' option is on. The -backup file can be placed in another directory by setting 'backupdir'. +strange to avoid accidentally overwriting existing files. If you prefer +".bak" change the 'backupext' option. Extra dots are replaced with '_' on +MS-Windows machines, when Vim has detected that an MS-DOS-like filesystem is +being used, or when the 'shortname' option is on. +The backup file can be placed in another directory by setting 'backupdir'. *auto-shortname* 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 Mnemonic: "goto file". Uses the 'isfname' option to find out which characters are supposed to be in a file name. Trailing - punctuation characters ".,:;!" are ignored. Escaped + punctuation characters ".,:;!" are ignored. Escaped spaces "\ " are reduced to a single space. Uses the 'path' option as a list of directory names to look for the file. See the 'path' option for details @@ -335,7 +335,7 @@ CTRL-^ Edit the alternate file. Mostly the alternate file is the file. The file name and the number must be separated by a non-filename (see 'isfname') and non-numeric - character. " line " is also recognized, like it is + character. " line " is also recognized, like it is used in the output of `:verbose command UserCmd` White space between the filename, the separator and the number are ignored. @@ -387,7 +387,7 @@ is to use "path\[[]abc]", this matches the file "path\[abc]". *starstar-wildcard* Expanding "**" is possible on Unix, Win32, macOS and a few other systems (but -it may depend on your 'shell' setting on Unix and macOS. It's known to work +it may depend on your 'shell' setting on Unix and macOS. It's known to work correctly for zsh; for bash this requires at least bash version >= 4.X). This allows searching a directory tree. This goes up to 100 directories deep. Note there are some commands where this works slightly differently, see @@ -400,7 +400,7 @@ Finds files: a/b/c/d/ccc.txt ~ When non-wildcard characters are used right before or after "**" these are only matched in the top directory. They are not used for directories further -down in the tree. For example: > +down in the tree. For example: > :n /usr/inc**/types.h Finds files: /usr/include/types.h ~ @@ -418,9 +418,9 @@ argument, for example: > Vim will run the command in backticks using the 'shell' and use the standard output as argument for the given Vim command (error messages from the shell command will be discarded). -To see what shell command Vim is running, set the 'verbose' option to 4. When +To see what shell command Vim is running, set the 'verbose' option to 4. When the shell command returns a non-zero exit code, an error message will be -displayed and the Vim command will be aborted. To avoid this make the shell +displayed and the Vim command will be aborted. To avoid this make the shell always return zero like so: > :next `find . -name ver\\*.c -print \|\| true` @@ -669,7 +669,7 @@ list of the current window. [count] is used like with |:argadd|. If the current file cannot be |abandon|ed {name}s will still be added to the argument list, but won't be - edited. No check for duplicates is done. + edited. No check for duplicates is done. Also see |++opt| and |+cmd|. :[count]arga[dd] {name} ... *:arga* *:argadd* *E479* @@ -1418,7 +1418,7 @@ present in 'cpoptions' and "!" is not used in the command. to another window will stop using {path}. *:lcd-* -:lcd[!] - Change to the previous current directory, before the +:lc[d][!] - Change to the previous current directory, before the last ":lcd {path}" command. *:lch* *:lchdir* @@ -1429,7 +1429,7 @@ present in 'cpoptions' and "!" is not used in the command. Also see |getcwd()|. *:pwd-verbose* When 'verbose' is non-zero, |:pwd| will also display - what scope the current directory was set. Example: > + what scope the current directory was set. Example: > " Set by :cd :verbose pwd @@ -1459,8 +1459,8 @@ When a |:tcd| command has been used for a tab page, the specified directory becomes the current directory for the current tab page and the current window. The current directory of other tab pages is not affected. When jumping to another tab page, the current directory is changed to the last specified local -directory for that tab page. If the current tab has no local current directory -the global current directory is used. +directory for that tab page. If the current tab has no local current +directory the global current directory is used. When a |:cd| command is used, the current window and tab page will lose the 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: > has('crypt-blowfish') has('crypt-blowfish2') This works since Vim 7.4.1099 while blowfish support was added earlier. -Thus the condition failing doesn't mean blowfish is not supported. You can +Thus the condition failing doesn't mean blowfish is not supported. You can test for blowfish with: > v:version >= 703 And for blowfish2 with: > @@ -1652,7 +1652,7 @@ Notes: algorithm in detail. - The implementation of 'cryptmethod' "blowfish" has a flaw. It is possible to crack the first 64 bytes of a file and in some circumstances more of the - file. Use of it is not recommended, but it's still the strongest method + file. Use of it is not recommended, but it's still the strongest method supported by Vim 7.3 and 7.4. The "zip" method is even weaker. - Vim originates from the Netherlands. That is where the sources come from. Thus the encryption code is not exported from the USA. @@ -1744,24 +1744,24 @@ ask if you really want to overwrite the file: WARNING: The file has been changed since reading it!!! Do you really want to write to it (y/n)? -If you hit 'y' Vim will continue writing the file. If you hit 'n' the write is -aborted. If you used ":wq" or "ZZ" Vim will not exit, you will get another +If you hit 'y' Vim will continue writing the file. If you hit 'n' the write +is aborted. If you used ":wq" or "ZZ" Vim will not exit, you will get another chance to write the file. The message would normally mean that somebody has written to the file after the edit session started. This could be another person, in which case you probably want to check if your changes to the file and the changes from the -other person should be merged. Write the file under another name and check for -differences (the "diff" program can be used for this). +other person should be merged. Write the file under another name and check +for differences (the "diff" program can be used for this). It is also possible that you modified the file yourself, from another edit session or with another command (e.g., a filter command). Then you will know which version of the file you want to keep. The accuracy of the time check depends on the filesystem. On Unix it is -usually sub-second. With old file systems and on MS-Windows it is normally one -second. Use `has('nanotime')` to check if sub-second time stamp checks are -available. +usually sub-second. With old file systems and on MS-Windows it is normally +one second. Use `has('nanotime')` to check if sub-second time stamp checks +are available. There is one situation where you get the message while there is nothing wrong: 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: - It ONLY matches directories. - It matches up to 30 directories deep by default, so you can use it to search an entire directory tree - - The maximum number of levels matched can be given by appending a number - to '**'. + - The maximum number of levels matched can be given by appending a + number to '**'. Thus '/usr/**2' can match: > /usr /usr/include