Mercurial > vim

annotate runtime/doc/vimdiff-ja.UTF-8.1 @ 35507:1a7250350167 draft default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
runtime(doc): In builtin overview use {buf} as param for appendbufline/setbufline (#15089) Commit: https://github.com/vim/vim/commit/f0837ba0b9dba9d30e3dc2626d4f690a2d51103e Author: errael <errael@raelity.com> Date: Mon Jun 24 12:27:01 2024 -0700 runtime(doc): In builtin overview use {buf} as param for appendbufline/setbufline (https://github.com/vim/vim/issues/15089) Signed-off-by: Ernie Rael <errael@raelity.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Mon, 24 Jun 2024 21:30:08 +0200
parents b19230a8d40a
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5178
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
1 .TH VIMDIFF 1 "2001 March 30"
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
2 .SH 名前
27162
b19230a8d40a Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14372
diff changeset
3 vimdiff \- 2 個から 8 個のファイルを Vim で開いて、その差分を表示する
5178
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
4 .SH 書式
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
5 .br
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
6 .B vimdiff
27162
b19230a8d40a Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14372
diff changeset
7 [options] file1 file2 [file3 [file4 [file5 [file6 [file7 [file8]]]]]]
5178
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
8 .PP
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
9 .B gvimdiff
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
10 .SH 説明
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
11 .B Vimdiff
27162
b19230a8d40a Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 14372
diff changeset
12 は、2 個から 8 個のファイルを
5178
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
13 .B Vim
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
14 で開きます。
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
15 ファイルは個別のウィンドウで開かれ、差分が強調表示されます。
14372
2a4a2dc35c55 Update runtime files.
Christian Brabandt <cb@256bit.org>
parents: 5178
diff changeset
16 同じファイルの別のバージョン間で、変更を確認したり、変更を移動したりするのが簡単になります。
5178
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
17 .PP
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
18 Vim についての詳細は vim(1) を参照してください。
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
19 .PP
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
20 .B gvimdiff
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
21 という名前で起動された場合は GUI で起動します。
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
22 .PP
14372
2a4a2dc35c55 Update runtime files.
Christian Brabandt <cb@256bit.org>
parents: 5178
diff changeset
23 差分を強調表示するために、それぞれのウィンドウの 'diff' オプションがオンに設定されます。
5178
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
24 .br
14372
2a4a2dc35c55 Update runtime files.
Christian Brabandt <cb@256bit.org>
parents: 5178
diff changeset
25 テキストを見やすくするために、オプションの 'wrap' と 'scrollbind' もオンに設定されます。
5178
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
26 .br
14372
2a4a2dc35c55 Update runtime files.
Christian Brabandt <cb@256bit.org>
parents: 5178
diff changeset
27 'foldmethod' オプションは "diff" に設定され、変更されていない行は折り畳まれます。
5178
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
28 折り畳みの確認と開閉が簡単にできるように、'foldcolumn' は 2 に設定されます。
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
29 .SH オプション
14372
2a4a2dc35c55 Update runtime files.
Christian Brabandt <cb@256bit.org>
parents: 5178
diff changeset
30 行を並べて表示するために、"\-O" 引数を使ったときのように、ウィンドウは垂直分割されます。
5178
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
31 ウィンドウを水平分割したい場合は "\-o" 引数を使ってください。
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
32 .PP
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
33 その他の引数については vim(1) を参照してください。
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
34 .SH 関連項目
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
35 vim(1)
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
36 .SH 著者
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
37 .B Vim
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
38 のほとんどの機能は Bram Moolenaar が開発し、多くの人が協力しました。
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
39 ":help credits" を参照してください。