Skip to content

Commit fb88d19

Browse files
authored
Merge pull request #1152 from tsuyoshicho/update/20221009/diff
Update diff.{txt,jax}
2 parents 11f85b3 + 789b061 commit fb88d19

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

doc/diff.jax

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*diff.txt* For Vim バージョン 9.0. Last change: 2022 Jan 22
1+
*diff.txt* For Vim バージョン 9.0. Last change: 2022 Oct 01
22

33

44
VIMリファレンスマニュアル by Bram Moolenaar
@@ -373,6 +373,9 @@ g:diff_translations を 0 に設定する: >
373373
その上、'diffexpr''diffopt' オプションの "icase" と "iwhite" についても考
374374
慮するべきだろう。'diffexpr''lines''columns' の値を変更できない。
375375

376+
引数なしでの関数呼び出しを使用する利点は高速なことである、
377+
|expr-option-function| を参照のこと。
378+
376379
例 (これは 'diffexpr' が空の時とほぼ同じように働く): >
377380
378381
set diffexpr=MyDiff()
@@ -439,6 +442,9 @@ http://gnuwin32.sourceforge.net/packages/diffutils.htm.
439442
v:fname_diff パッチファイル
440443
v:fname_out パッチ適用結果を出力するファイル
441444

445+
引数なしでの関数呼び出しを使用する利点は高速なことである、
446+
|expr-option-function| を参照のこと。
447+
442448
例 (これは 'patchexpr' を空にしたのと同じ働きをする): >
443449
444450
set patchexpr=MyPatch()

en/diff.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*diff.txt* For Vim version 9.0. Last change: 2022 Jan 22
1+
*diff.txt* For Vim version 9.0. Last change: 2022 Oct 01
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -376,6 +376,9 @@ Additionally, 'diffexpr' should take care of "icase" and "iwhite" in the
376376
'diffopt' option. 'diffexpr' cannot change the value of 'lines' and
377377
'columns'.
378378

379+
The advantage of using a function call without arguments is that it is faster,
380+
see |expr-option-function|.
381+
379382
Example (this does almost the same as 'diffexpr' being empty): >
380383
381384
set diffexpr=MyDiff()
@@ -441,6 +444,9 @@ will have the same effect. These variables are set to the file names used:
441444
v:fname_diff patch file
442445
v:fname_out resulting patched file
443446

447+
The advantage of using a function call without arguments is that it is faster,
448+
see |expr-option-function|.
449+
444450
Example (this does the same as 'patchexpr' being empty): >
445451
446452
set patchexpr=MyPatch()

0 commit comments

Comments
 (0)