Skip to content

Commit

Permalink
Generated by GitHub workflow 8031593417
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Feb 24, 2024
1 parent 37ef37d commit acfd285
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 2 deletions.
2 changes: 1 addition & 1 deletion builtin.html
Original file line number Diff line number Diff line change
Expand Up @@ -2131,7 +2131,7 @@
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:echo diff(readfile(<span class="MissingTag">'oldfile'</span>), readfile(<span class="MissingTag">'newfile'</span>))<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:echo diff(getbufline(5, 1, '$'), getbufline(6, 1, '$'))<br>
<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;その他の例については、<span class="MissingTag">diff-func-examples</span>&nbsp;を参照<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;その他の例については、<a class="Identifier" href="diff.html#diff-func-examples">diff-func-examples</a>&nbsp;を参照<br>
<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="Identifier" href="eval.html#method">method</a>&nbsp;としても使用できる:&nbsp;&gt;<br>
<div class="helpExample">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;GetFromList-&gt;diff(to_list)</div>
Expand Down
46 changes: 45 additions & 1 deletion diff.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
helpname: 'diff'
---
<div id='vimCodeElement'>
<a class="Constant" href="diff.html" name="diff.txt">diff.txt</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;For&nbsp;<span class="Identifier">Vim バージョン 9.1.</span>&nbsp;&nbsp;Last change: 2023 Apr 04<br>
<a class="Constant" href="diff.html" name="diff.txt">diff.txt</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;For&nbsp;<span class="Identifier">Vim バージョン 9.1.</span>&nbsp;&nbsp;Last change: 2024 Feb 01<br>
<br>
<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="Identifier">VIMリファレンスマニュアル&nbsp;&nbsp;&nbsp;&nbsp;by Bram Moolenaar</span><br>
Expand Down Expand Up @@ -480,5 +480,49 @@
その結果スクリプトローカルな要素を使用できる。<br>
<br>
<br>
<span class="Statement">diff 関数の例</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a class="Constant" href="diff.html#diff-func-examples" name="diff-func-examples">diff-func-examples</a><br>
<br>
<a class="Identifier" href="builtin.html#diff()">diff()</a>&nbsp;関数を使用して 2 つの文字列のリスト間の差分インデックスを計算する例を<br>
以下に示す。<br>
&gt;<br>
<div class="helpExample">&nbsp;&nbsp;&quot; いくつかの行が変更された<br>
&nbsp;&nbsp;:echo diff(['abc', 'def', 'ghi'], ['abx', 'rrr', 'xhi'], {'output': 'indices'})<br>
&nbsp;&nbsp; [{'from_idx': 0, 'from_count': 3, 'to_idx': 0, 'to_count': 3}]</div>
<br>
<div class="helpExample">&nbsp;&nbsp;&quot; 冒頭に数行を追加した<br>
&nbsp;&nbsp;:echo diff(['ghi'], ['abc', 'def', 'ghi'], {'output': 'indices'})<br>
&nbsp;&nbsp; [{'from_idx': 0, 'from_count': 0, 'to_idx': 0, 'to_count': 2}]</div>
<br>
<div class="helpExample">&nbsp;&nbsp;&quot; 冒頭から数行を削除した<br>
&nbsp;&nbsp;:echo diff(['abc', 'def', 'ghi'], ['ghi'], {'output': 'indices'})<br>
&nbsp;&nbsp; [{'from_idx': 0, 'from_count': 2, 'to_idx': 0, 'to_count': 0}]</div>
<br>
<div class="helpExample">&nbsp;&nbsp;&quot; 途中に数行を追加した<br>
&nbsp;&nbsp;:echo diff(['abc', 'jkl'], ['abc', 'def', 'ghi', 'jkl'], {'output': 'indices'})<br>
&nbsp;&nbsp; [{'from_idx': 1, 'from_count': 0, 'to_idx': 1, 'to_count': 2}]</div>
<br>
<div class="helpExample">&nbsp;&nbsp;&quot; 途中の数行を削除した<br>
&nbsp;&nbsp;:echo diff(['abc', 'def', 'ghi', 'jkl'], ['abc', 'jkl'], {'output': 'indices'})<br>
&nbsp;&nbsp; [{'from_idx': 1, 'from_count': 2, 'to_idx': 1, 'to_count': 0}]</div>
<br>
<div class="helpExample">&nbsp;&nbsp;&quot; 末尾に数行を追加した<br>
&nbsp;&nbsp;:echo diff(['abc'], ['abc', 'def', 'ghi'], {'output': 'indices'})<br>
&nbsp;&nbsp; [{'from_idx': 1, 'from_count': 0, 'to_idx': 1, 'to_count': 2}]</div>
<br>
<div class="helpExample">&nbsp;&nbsp;&quot; 末尾から数行を削除した<br>
&nbsp;&nbsp;:echo diff(['abc', 'def', 'ghi'], ['abc'], {'output': 'indices'})<br>
&nbsp;&nbsp; [{'from_idx': 1, 'from_count': 2, 'to_idx': 1, 'to_count': 0}]</div>
<br>
<div class="helpExample">&nbsp;&nbsp;&quot; ばらばらな変更<br>
&nbsp;&nbsp;:echo diff(['ab', 'def', 'ghi', 'jkl'], ['abc', 'def', 'ghi', 'jk'], {'output': 'indices', 'context': 0})<br>
&nbsp;&nbsp; [{'from_idx': 0, 'from_count': 1, 'to_idx': 0, 'to_count': 1},<br>
&nbsp;&nbsp;&nbsp;&nbsp;{'from_idx': 3, 'from_count': 1, 'to_idx': 3, 'to_count': 1}]</div>
<br>
<div class="helpExample">&nbsp;&nbsp;&quot; コンテキスト長 1 のばらばらな変更<br>
&nbsp;&nbsp;:echo diff(['ab', 'def', 'ghi', 'jkl'], ['abc', 'def', 'ghi', 'jk'], {'output': 'indices', 'context': 1})<br>
&nbsp;&nbsp; [{'from_idx': 0, 'from_count': 4, 'to_idx': 0, 'to_count': 4}]</div>
<br>
&lt;<br>
<br>
&nbsp;vim:tw=78:ts=8:noet:ft=help:norl:<br>
</div>
1 change: 1 addition & 0 deletions tags.html
Original file line number Diff line number Diff line change
Expand Up @@ -6660,6 +6660,7 @@
<a class="Identifier" href="diff.html#diff">diff</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;diff.jax<br>
<a class="Identifier" href="builtin.html#diff()">diff()</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;builtin.jax<br>
<a class="Identifier" href="diff.html#diff-diffexpr">diff-diffexpr</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; diff.jax<br>
<a class="Identifier" href="diff.html#diff-func-examples">diff-func-examples</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;diff.jax<br>
<a class="Identifier" href="diff.html#diff-mode">diff-mode</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; diff.jax<br>
<a class="Identifier" href="diff.html#diff-options">diff-options</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;diff.jax<br>
<a class="Identifier" href="diff.html#diff-original-file">diff-original-file</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;diff.jax<br>
Expand Down

0 comments on commit acfd285

Please sign in to comment.