Mercurial > vim

annotate runtime/doc/vimdiff-ja.UTF-8.1 @ 9731:f85d94eee05b v7.4.2141

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/ba96e9af388804364425185b47eed14988302865 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Aug 1 17:10:20 2016 +0200 patch 7.4.2141 Problem: Coverity reports bogus NULL check. Solution: When checking for a variable in the funccal scope don't pass the varname.
author Christian Brabandt <cb@256bit.org>
date Mon, 01 Aug 2016 17:15:06 +0200
parents 7a1b782ec64a
children 2a4a2dc35c55
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 名前
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
3 vimdiff \- 二つか三つか四つのファイルを Vim で開いて、その差分を表示する
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
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
7 [options] file1 file2 [file3 [file4]]
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
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
12 は、二つ (か三つか四つ) のファイルを
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 ファイルは個別のウィンドウで開かれ、差分が強調表示されます。
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
16 同じファイルの別のバージョン間で、変更を確認したり、変更を移動したりするのが
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
17 簡単になります。
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
18 .PP
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
19 Vim についての詳細は vim(1) を参照してください。
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
20 .PP
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
21 .B gvimdiff
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
22 という名前で起動された場合は GUI で起動します。
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
23 .PP
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
24 差分を強調表示するために、
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
25 それぞれのウィンドウの 'diff' オプションがオンに設定されます。
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
26 .br
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
27 テキストを見やすくするために、オプションの 'wrap' と 'scrollbind' もオンに設
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
28 定されます。
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
29 .br
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
30 'foldmethod' オプションは "diff" に設定され、変更されていない行は折り畳まれ
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
31 ます。
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
32 折り畳みの確認と開閉が簡単にできるように、'foldcolumn' は 2 に設定されます。
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
33 .SH オプション
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
34 行を並べて表示するために、"\-O" 引数を使ったときのように、ウィンドウは垂直分
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
35 割されます。
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
36 ウィンドウを水平分割したい場合は "\-o" 引数を使ってください。
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
37 .PP
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
38 その他の引数については vim(1) を参照してください。
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
39 .SH 関連項目
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
40 vim(1)
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
41 .SH 著者
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
42 .B Vim
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
43 のほとんどの機能は Bram Moolenaar が開発し、多くの人が協力しました。
7a1b782ec64a updated for version 7.4a.015
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
44 ":help credits" を参照してください。