Remove vimdiff
While we're here: - Remove references to the '+diff' feature, which has since been made non-optional. - Update a few Vim instances with Nvim.
This commit is contained in:
Michael Reed
parent
054aabbe06
commit
7b98b4c442
|
|
@ -254,28 +254,22 @@ HTMLS = \
|
|||
|
||||
MANPAGES = \
|
||||
manpages/vim.man \
|
||||
manpages/vimdiff.man \
|
||||
manpages/vimtutor.man \
|
||||
manpages/xxd.man \
|
||||
manpages/de/vim-de.man \
|
||||
manpages/fr/vim-fr.man \
|
||||
manpages/fr/vimdiff-fr.man \
|
||||
manpages/fr/vimtutor-fr.man \
|
||||
manpages/fr/xxd-fr.man \
|
||||
manpages/pl/vim-pl.man \
|
||||
manpages/pl/vimdiff-pl.man \
|
||||
manpages/pl/vimtutor-pl.man \
|
||||
manpages/pl/xxd-pl.man \
|
||||
manpages/it/vim-it.man \
|
||||
manpages/it/vimdiff-it.man \
|
||||
manpages/it/vimtutor-it.man \
|
||||
manpages/it/xxd-it.man \
|
||||
manpages/ru/vim-ru.man \
|
||||
manpages/ru/vimdiff-ru.man \
|
||||
manpages/ru/vimtutor-ru.man \
|
||||
manpages/ru/xxd-ru.man \
|
||||
manpages/ja/vim-ja.man \
|
||||
manpages/ja/vimdiff-ja.man \
|
||||
manpages/ja/vimtutor-ja.man \
|
||||
manpages/ja/xxd-ja.man
|
||||
|
||||
|
|
|
|||
|
|
@ -1,39 +1,31 @@
|
|||
*diff.txt* For Vim version 7.4. Last change: 2014 May 20
|
||||
*diff.txt* For Vim version 7.4. Last change: 2015 Jan 19
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
|
||||
|
||||
*diff* *vimdiff* *gvimdiff* *diff-mode*
|
||||
This file describes the |+diff| feature: Showing differences between two,
|
||||
three or four versions of the same file.
|
||||
*diff* *diff-mode*
|
||||
This file describes |diff-mode|, which shows the differences between two,
|
||||
three, or four versions of the same file.
|
||||
|
||||
The basics are explained in section |08.7| of the user manual.
|
||||
|
||||
1. Starting diff mode |vimdiff|
|
||||
1. Starting diff mode |diff-mode|
|
||||
2. Viewing diffs |view-diffs|
|
||||
3. Jumping to diffs |jumpto-diffs|
|
||||
4. Copying diffs |copy-diffs|
|
||||
5. Diff options |diff-options|
|
||||
|
||||
{not in Vi}
|
||||
|
||||
==============================================================================
|
||||
1. Starting diff mode
|
||||
|
||||
The easiest way to start editing in diff mode is with the "vimdiff" command.
|
||||
This starts Vim as usual, and additionally sets up for viewing the differences
|
||||
between the arguments. >
|
||||
To start editing in diff mode, start Nvim with "nvim -d". This starts Nvim
|
||||
and sets up for viewing the differences between the arguments. >
|
||||
|
||||
vimdiff file1 file2 [file3 [file4]]
|
||||
$ nvim -d file1 file2 [file3 [file4]]
|
||||
|
||||
This is equivalent to: >
|
||||
|
||||
vim -d file1 file2 [file3 [file4]]
|
||||
|
||||
You may also use "gvimdiff" or "vim -d -g". The GUI is started then.
|
||||
You may also use "viewdiff" or "gviewdiff". Vim starts in readonly mode then.
|
||||
"r" may be prepended for restricted mode (see |-Z|).
|
||||
In addition to the |-d| argument, |-R| and |-Z| may be used for restricted
|
||||
mode and read only mode respectively.
|
||||
|
||||
The second and following arguments may also be a directory name. Vim will
|
||||
then append the file name of the first argument to the directory name to find
|
||||
|
|
@ -45,11 +37,11 @@ Diffs are local to the current tab page |tab-page|. You can't see diffs with
|
|||
a window in another tab page. This does make it possible to have several
|
||||
diffs at the same time, each in their own tab page.
|
||||
|
||||
What happens is that Vim opens a window for each of the files. This is like
|
||||
using the |-O| argument. This uses vertical splits. If you prefer horizontal
|
||||
splits add the |-o| argument: >
|
||||
What happens is that Nvim opens a window for each of the files. This is like
|
||||
using the |-O| argument. This uses vertical splits, but if you prefer
|
||||
horizontal splits add the |-o| argument instead: >
|
||||
|
||||
vimdiff -o file1 file2 [file3 [file4]]
|
||||
$ nvim -d -o file1 file2 [file3 [file4]]
|
||||
|
||||
If you always prefer horizontal splits include "horizontal" in 'diffopt'.
|
||||
|
||||
|
|
@ -87,20 +79,20 @@ While already in Vim you can start diff mode in three ways.
|
|||
|
||||
*E98*
|
||||
:diffs[plit] {filename} *:diffs* *:diffsplit*
|
||||
Open a new window on the file {filename}. The options are set
|
||||
as for "vimdiff" for the current and the newly opened window.
|
||||
Open a new window on the file {filename}. The options set for
|
||||
"nvim -d" are set for the current and the newly opened window.
|
||||
Also see 'diffexpr'.
|
||||
|
||||
*:difft* *:diffthis*
|
||||
:difft[his] Make the current window part of the diff windows. This sets
|
||||
the options like for "vimdiff".
|
||||
the options set for "nvim -d".
|
||||
|
||||
:diffp[atch] {patchfile} *E816* *:diffp* *:diffpatch*
|
||||
Use the current buffer, patch it with the diff found in
|
||||
{patchfile} and open a buffer on the result. The options are
|
||||
set as for "vimdiff".
|
||||
{patchfile} can be in any format that the "patch" program
|
||||
understands or 'patchexpr' can handle.
|
||||
{patchfile} and open a buffer on the result. This sets the
|
||||
options set for "nvim -d". {patchfile} can be in any format
|
||||
that the "patch" program understands or 'patchexpr' can
|
||||
handle.
|
||||
Note that {patchfile} should only contain a diff for one file,
|
||||
the current file. If {patchfile} contains diffs for other
|
||||
files as well, the results are unpredictable. Vim changes
|
||||
|
|
@ -172,7 +164,7 @@ possible to view the changes you have made to a buffer since the file was
|
|||
loaded. Since Vim doesn't allow having two buffers for the same file, you
|
||||
need another buffer. This command is useful: >
|
||||
command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_
|
||||
\ | diffthis | wincmd p | diffthis
|
||||
\ | diffthis | wincmd p | diffthis
|
||||
(this is in |vimrc_example.vim|). Use ":DiffOrig" to see the differences
|
||||
between the current buffer and the file it was loaded from.
|
||||
|
||||
|
|
|
|||
|
|
@ -1552,8 +1552,8 @@ v:profiling Normally zero. Set to one after using ":profile start".
|
|||
|
||||
*v:progname* *progname-variable*
|
||||
v:progname Contains the name (with path removed) with which Vim was
|
||||
invoked. Allows you to do special initialisations for |view|,
|
||||
|vimdiff|, etc., or any other name you might symlink to Vim.
|
||||
invoked. Allows you to do special initialisations for |view|,
|
||||
|rview|, or any other name you might symlink to Vim.
|
||||
Read-only.
|
||||
|
||||
*v:progpath* *progpath-variable*
|
||||
|
|
@ -6665,7 +6665,6 @@ cscope Compiled with |cscope| support.
|
|||
debug Compiled with "DEBUG" defined.
|
||||
dialog_con Compiled with console dialog support.
|
||||
dialog_gui Compiled with GUI dialog support.
|
||||
diff Compiled with |vimdiff| and 'diff' support.
|
||||
digraphs Compiled with support for digraphs.
|
||||
dnd Compiled with support for the "~ register |quote_~|.
|
||||
dos16 16 bits DOS version of Vim.
|
||||
|
|
|
|||
|
|
@ -156,7 +156,6 @@ sehr ähnlich zu Vi, selbst wenn eine VimRC\-Datei existiert.
|
|||
\-d
|
||||
Startet im diff\-Modus. Es sollten zwei, drei oder vier Dateinamen als
|
||||
Parameter übergeben werden. \fBVim\fP öffnet sie alle und zeigt die
|
||||
Unterschiede an. Arbeitet wie vimdiff(1).
|
||||
.TP
|
||||
\-d {Gerät}
|
||||
Öffnet das {Gerät}, um es als Terminal zu nutzen. Nur für AmigaOS. Beispiel:
|
||||
|
|
|
|||
|
|
@ -192,7 +192,6 @@ Démarre en mode Diff.
|
|||
Deux, trois ou quatre noms de fichiers doivent être spécifiés.
|
||||
.B Vim
|
||||
ouvrira alors tous les fichiers et affichera leurs différences.
|
||||
Fonctionne comme vimdiff(1).
|
||||
.TP
|
||||
\-d {périph}
|
||||
Ouvre {périph} pour l'utiliser comme terminal.
|
||||
|
|
|
|||
|
|
@ -1,54 +0,0 @@
|
|||
.TH VIMDIFF 1 "30 mars 2001"
|
||||
.SH NOM
|
||||
vimdiff \- ouvre deux, trois ou quatre versions d'un fichier dans Vim et
|
||||
affiche leurs différences
|
||||
.SH SYNOPSIS
|
||||
.br
|
||||
.B vimdiff
|
||||
[options] fichier1 fichier2 [fichier3 [fichier4]]
|
||||
.PP
|
||||
.B gvimdiff
|
||||
.SH DESCRIPTION
|
||||
.B Vimdiff
|
||||
démarre
|
||||
.B Vim
|
||||
avec deux (ou trois ou quatre) fichiers.
|
||||
Chaque fichier est ouvert dans sa propre fenêtre.
|
||||
Les différences entre ces fichiers sont mises en surbrillance.
|
||||
C'est un outil très pratique pour visualiser et reporter les
|
||||
changements entre deux versions d'un même fichier.
|
||||
.PP
|
||||
Consulter vim(1) pour des informations sur l'éditeur Vim lui-même.
|
||||
.PP
|
||||
Si
|
||||
.B gvimdiff
|
||||
est invoqué, l'IHM graphique est démarrée quand elle est disponible.
|
||||
.PP
|
||||
L'option 'diff' est activée dans chacune des fenêtres, ce qui provoque la mise
|
||||
en surbrillance des différences.
|
||||
.br
|
||||
Les options 'wrap' et 'scrollbind' sont activées pour donner un aspect
|
||||
agréable au texte.
|
||||
.br
|
||||
L'option 'foldmethod' est fixée à "diff", ce qui replie les lignes consécutives
|
||||
identiques. 'foldcolumn' est fixé à 2 pour trouver les replis rapidement et
|
||||
les ouvrir ou les fermer facilement.
|
||||
.SH ARGUMENTS
|
||||
La fenêtre de Vim est partagée verticalement afin d'afficher les lignes
|
||||
correspondantes les unes en face des autres, comme si l'argument "\-O" était
|
||||
spécifié. Utilisez l'argument "\-o" pour obtenir un partage horizontal à la
|
||||
place.
|
||||
.PP
|
||||
Pour connaître les autres arguments disponibles, consultez vim(1).
|
||||
.SH VOIR AUSSI
|
||||
vim(1)
|
||||
.SH AUTEUR
|
||||
La majeure partie de
|
||||
.B Vim
|
||||
a été écrite par Bram Moolenaar, avec l'aide de nombreux autres contributeurs.
|
||||
Voir ":help credits" dans
|
||||
.B Vim.
|
||||
.SH TRADUCTION
|
||||
Cette page de manuel a été traduite par David Blanchet
|
||||
<david.blanchet@free.fr> 2005-03-12.
|
||||
Mise à jour 2012-05-06, Dominique Pellé <dominique.pelle@gmail.com>
|
||||
|
|
@ -188,7 +188,6 @@ Inizia in Modo Diff [differenze].
|
|||
Dovrebbero esserci come argomenti due o tre o quattro nomi di file.
|
||||
.B Vim
|
||||
aprirà tutti i file evidenziando le differenze fra gli stessi.
|
||||
Funziona come vimdiff(1).
|
||||
.TP
|
||||
\-d {dispositivo}
|
||||
Apre {dispositivo} per usarlo come terminale.
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
.TH VIMDIFF 1 "30 marzo 2001"
|
||||
.SH NOME
|
||||
vimdiff \- modifica due, tre o quattro versioni di un file con Vim,
|
||||
visualizzando le differenze
|
||||
.SH SINTASSI
|
||||
.br
|
||||
.B vimdiff
|
||||
[opzioni] file1 file2 [file3 [file4]]
|
||||
.PP
|
||||
.B gvimdiff
|
||||
.SH DESCRIZIONE
|
||||
.B Vimdiff
|
||||
inizia
|
||||
.B Vim
|
||||
per due (o tre o quattro) file.
|
||||
Ogni file ha una sua finestra.
|
||||
Le differenze fra file sono evidenziate.
|
||||
È una maniera elegante per controllare modifiche e portare modifiche
|
||||
verso un'altra versione dello stesso file.
|
||||
.PP
|
||||
Vedere vim(1) per dettagli su Vim in generale.
|
||||
.PP
|
||||
Se iniziato con
|
||||
.B gvimdiff
|
||||
la GUI sarà utilizzata, se disponibile.
|
||||
.PP
|
||||
In ogni finestra l'opzione 'diff' è impostata, evidenziando così le
|
||||
differenze.
|
||||
.br
|
||||
Le opzioni 'wrap' e 'scrollbind' sono impostate per migliorare la
|
||||
visibilità del testo.
|
||||
.br
|
||||
L'opzione 'foldmethod' è impostata al valore "diff", che mette gruppi di
|
||||
linee uguali fra i diversi file in una piegatura. 'foldcolumn' è impostato
|
||||
a due per poter facilmente visualizzare le piegature, aprirle e chiuderle.
|
||||
.SH OPZIONI
|
||||
Lo schermo è diviso verticalmente, come se aveste usato l'opzione "\-O".
|
||||
Per dividerlo orizzontalmente, usare l'opzione "\-o".
|
||||
.PP
|
||||
Per tutte le altre opzioni, vedere vim(1).
|
||||
.SH VEDERE ANCHE
|
||||
vim(1)
|
||||
.SH AUTORE
|
||||
Buona parte di
|
||||
.B Vim
|
||||
è stato scritto da Bram Moolenaar, con molto aiuto da altri.
|
||||
Vedere ":help credits" in
|
||||
.B Vim.
|
||||
|
|
@ -164,7 +164,6 @@ Note: "+" と "\-c" は合わせて 10 個まで指定できます。
|
|||
差分モードで起動します。
|
||||
二つか三つの四つのファイルを引数に指定してください。
|
||||
指定されたファイルが開かれ、それらのファイルの差分が表示されます。
|
||||
vimdiff(1) と同様の動作です。
|
||||
.TP
|
||||
\-d {device}
|
||||
{device} を端末として開きます。
|
||||
|
|
|
|||
|
|
@ -1,44 +0,0 @@
|
|||
.TH VIMDIFF 1 "2001 March 30"
|
||||
.SH 名前
|
||||
vimdiff \- 二つか三つか四つのファイルを Vim で開いて、その差分を表示する
|
||||
.SH 書式
|
||||
.br
|
||||
.B vimdiff
|
||||
[options] file1 file2 [file3 [file4]]
|
||||
.PP
|
||||
.B gvimdiff
|
||||
.SH 説明
|
||||
.B Vimdiff
|
||||
は、二つ (か三つか四つ) のファイルを
|
||||
.B Vim
|
||||
で開きます。
|
||||
ファイルは個別のウィンドウで開かれ、差分が強調表示されます。
|
||||
同じファイルの別のバージョン間で、変更を確認したり、変更を移動したりするのが
|
||||
簡単になります。
|
||||
.PP
|
||||
Vim についての詳細は vim(1) を参照してください。
|
||||
.PP
|
||||
.B gvimdiff
|
||||
という名前で起動された場合は GUI で起動します。
|
||||
.PP
|
||||
差分を強調表示するために、
|
||||
それぞれのウィンドウの 'diff' オプションがオンに設定されます。
|
||||
.br
|
||||
テキストを見やすくするために、オプションの 'wrap' と 'scrollbind' もオンに設
|
||||
定されます。
|
||||
.br
|
||||
'foldmethod' オプションは "diff" に設定され、変更されていない行は折り畳まれ
|
||||
ます。
|
||||
折り畳みの確認と開閉が簡単にできるように、'foldcolumn' は 2 に設定されます。
|
||||
.SH オプション
|
||||
行を並べて表示するために、"\-O" 引数を使ったときのように、ウィンドウは垂直分
|
||||
割されます。
|
||||
ウィンドウを水平分割したい場合は "\-o" 引数を使ってください。
|
||||
.PP
|
||||
その他の引数については vim(1) を参照してください。
|
||||
.SH 関連項目
|
||||
vim(1)
|
||||
.SH 著者
|
||||
.B Vim
|
||||
のほとんどの機能は Bram Moolenaar が開発し、多くの人が協力しました。
|
||||
":help credits" を参照してください。
|
||||
|
|
@ -186,7 +186,6 @@ Uruchom w trybie diff.
|
|||
Powinno się użyć dwóch, trzech lub czterech nazwy plików jako argumentów.
|
||||
.B Vim
|
||||
otworzy wszystkie te pliki i pokaże różnice między nimi.
|
||||
Działa jak vimdiff(1).
|
||||
.TP
|
||||
\-d {urządzenie}
|
||||
Otwórz {urządzenie} by używać jako terminal.
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
.TH VIMDIFF 1 "2001 Mar 30"
|
||||
.SH NAZWA
|
||||
vimdiff \- edytuj dwie, trzy lub cztery wersje pliku w Vimie i zobacz różnice
|
||||
.SH SYNOPSIS
|
||||
.br
|
||||
.B vimdiff
|
||||
[opcje] plik1 plik2 [plik3 [plik4]]
|
||||
.PP
|
||||
.B gvimdiff
|
||||
.SH OPIS
|
||||
.B Vimdiff
|
||||
uruchomi
|
||||
.B Vima
|
||||
z dwoma (trzema lub czterema plikami), każdy z nich we własnym oknie.
|
||||
Różnice między plikami zostaną podświetlone.
|
||||
Jest to dobry sposób by przeanalizować różnice i przenieść zmiany z jednej
|
||||
wersji pliku do innej.
|
||||
.PP
|
||||
Zobacz vim(1) by poznać więcej szczegółów o samym Vimie.
|
||||
.PP
|
||||
Kiedy uruchomiony jako
|
||||
.B gvimdiff
|
||||
zostanie uruchomione GUI (jeśli dostępne).
|
||||
.PP
|
||||
W każdym oknie zostanie ustawiona opcja 'diff', która spowoduje
|
||||
podświetlenie różnic.
|
||||
.br
|
||||
Opcje 'wrap' i 'scrollbind' zostaną ustawione by tekst się
|
||||
wygodnie przeglądało.
|
||||
.br
|
||||
Opcja 'foldmethod' zostanie ustawiona na "diff", dzięki czemu
|
||||
niezmienione linie zostaną zwinięte. 'foldcolumn' będzie równe 2 aby
|
||||
łatwo wyszukiwać, otwierać i zamykać zwinięcia.
|
||||
.SH OPCJE
|
||||
Pionowy podział zostanie użyty do wyrównania linii, tak jakby użyto
|
||||
opcji "\-O". Aby uzyskać poziomy podział użyj opcji "\-o".
|
||||
.PP
|
||||
Aby poznać inne opcje zobacz vim(1).
|
||||
.SH ZOBACZ TAKŻE
|
||||
vim(1)
|
||||
.SH AUTOR
|
||||
Większość
|
||||
.B Vima
|
||||
została napisana przez Brama Moolenaara przy pomocy wielu innych osób.
|
||||
Zobacz ":help credits w
|
||||
.B Vimie.
|
||||
|
|
@ -173,7 +173,6 @@ rvim rview rgvim rgview
|
|||
Должно быть указано два или три имени файла.
|
||||
.B Vim
|
||||
откроет все файлы и покажет различия между ними
|
||||
(как vimdiff(1)).
|
||||
.TP
|
||||
\-d {устройство}
|
||||
Открыть {устройство} для использования в качестве терминала (только на Amiga).
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
.TH VIMDIFF 1 "2001 March 30"
|
||||
.SH ИМЯ
|
||||
vimdiff \- позволяет редактировать две или три версии файла с помощью Vim
|
||||
с отображением различий.
|
||||
.SH КОМАНДНАЯ СТРОКА
|
||||
.br
|
||||
.B vimdiff
|
||||
[ключи] файл1 файл2 [файл3]
|
||||
.PP
|
||||
.B gvimdiff
|
||||
.SH ОПИСАНИЕ
|
||||
Команда
|
||||
.B vimdiff
|
||||
загружает в
|
||||
.B Vim
|
||||
два (или три) файла. Каждый файл открывается в собственном окне.
|
||||
Различия между файлами отображаются с помощью подсветки синтаксиса.
|
||||
Эта команда позволяет наглядно отображать внесённые изменения и переносить
|
||||
различающиеся фрагменты из одной версии файла в другую.
|
||||
.PP
|
||||
Подробнее о Vim см. на странице справочника vim(1).
|
||||
.PP
|
||||
При запуске с помощью команды
|
||||
.B gvimdiff
|
||||
редактор запускается в режиме графического интерфейса, если это возможно.
|
||||
.PP
|
||||
В каждом окне включается опция 'diff', что позволяет использовать подсветку
|
||||
синтаксиса для отображения различий между файлами.
|
||||
.br
|
||||
Для улучшения работы с файлами в режиме отображения отличий также включаются
|
||||
опции 'wrap' и 'scrollbind'.
|
||||
.br
|
||||
Значение опции 'foldmethod' устанавливается равным "diff", что позволяет
|
||||
прятать в складку области текста, которые не отличаются в различных версиях файла.
|
||||
Значение опции 'foldcolumn' устанавливается равным 2, чтобы было проще
|
||||
находить, открывать и закрывать такие складки.
|
||||
.SH КЛЮЧИ ЗАПУСКА
|
||||
Для выравнивания строк между окнами используется вертикальное разделение окон,
|
||||
как если бы использовался ключ "\-O". Для того, чтобы использовать разделение
|
||||
окон по горизонтали, следует указать в командной строке ключ "\-o".
|
||||
.PP
|
||||
Остальные ключи командной строки рассматриваются на странице справочника vim(1).
|
||||
.SH СМОТРИ ТАКЖЕ
|
||||
vim(1)
|
||||
.SH АВТОРЫ
|
||||
Большая часть
|
||||
.B Vim
|
||||
создана Брамом Мооленааром (Bram Moolenaar), которому помогает огромное
|
||||
количество людей. См. ":help credits" в
|
||||
.B Vim.
|
||||
|
|
@ -179,10 +179,7 @@ behave mostly like Vi, even though a .vimrc file exists.
|
|||
.TP
|
||||
\-d
|
||||
Start in diff mode.
|
||||
There should be two, three or four file name arguments.
|
||||
.B Vim
|
||||
will open all the files and show differences between them.
|
||||
Works like vimdiff(1).
|
||||
There should be two, three, or four file name arguments.
|
||||
.TP
|
||||
\-D
|
||||
Debugging. Go to debugging mode when executing the first command from a
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
.TH VIMDIFF 1 "2001 March 30"
|
||||
.SH NAME
|
||||
vimdiff \- edit two, three or four versions of a file with Vim and show differences
|
||||
.SH SYNOPSIS
|
||||
.br
|
||||
.B vimdiff
|
||||
[options] file1 file2 [file3 [file4]]
|
||||
.PP
|
||||
.B gvimdiff
|
||||
.SH DESCRIPTION
|
||||
.B Vimdiff
|
||||
starts
|
||||
.B Vim
|
||||
on two (or three or four) files.
|
||||
Each file gets its own window.
|
||||
The differences between the files are highlighted.
|
||||
This is a nice way to inspect changes and to move changes from one version
|
||||
to another version of the same file.
|
||||
.PP
|
||||
See vim(1) for details about Vim itself.
|
||||
.PP
|
||||
When started as
|
||||
.B gvimdiff
|
||||
the GUI will be started, if available.
|
||||
.PP
|
||||
In each window the 'diff' option will be set, which causes the differences
|
||||
to be highlighted.
|
||||
.br
|
||||
The 'wrap' and 'scrollbind' options are set to make the text look good.
|
||||
.br
|
||||
The 'foldmethod' option is set to "diff", which puts ranges of lines without
|
||||
changes in a fold. 'foldcolumn' is set to two to make it easy to spot the
|
||||
folds and open or close them.
|
||||
.SH OPTIONS
|
||||
Vertical splits are used to align the lines, as if the "\-O" argument was used.
|
||||
To use horizontal splits instead, use the "\-o" argument.
|
||||
.PP
|
||||
For all other arguments see vim(1).
|
||||
.SH SEE ALSO
|
||||
vim(1)
|
||||
.SH AUTHOR
|
||||
Most of
|
||||
.B Vim
|
||||
was made by Bram Moolenaar, with a lot of help from others.
|
||||
See ":help credits" in
|
||||
.B Vim.
|
||||
|
|
@ -2382,17 +2382,13 @@ A jump table for the options with a short description can be found at |Q_op|.
|
|||
'diff' boolean (default off)
|
||||
local to window
|
||||
{not in Vi}
|
||||
{not available when compiled without the |+diff|
|
||||
feature}
|
||||
Join the current window in the group of windows that shows differences
|
||||
between files. See |vimdiff|.
|
||||
between files. See |diff-mode|.
|
||||
|
||||
*'dex'* *'diffexpr'*
|
||||
'diffexpr' 'dex' string (default "")
|
||||
global
|
||||
{not in Vi}
|
||||
{not available when compiled without the |+diff|
|
||||
feature}
|
||||
Expression which is evaluated to obtain an ed-style diff file from two
|
||||
versions of a file. See |diff-diffexpr|.
|
||||
This option cannot be set from a |modeline| or in the |sandbox|, for
|
||||
|
|
@ -2402,8 +2398,6 @@ A jump table for the options with a short description can be found at |Q_op|.
|
|||
'diffopt' 'dip' string (default "filler")
|
||||
global
|
||||
{not in Vi}
|
||||
{not available when compiled without the |+diff|
|
||||
feature}
|
||||
Option settings for diff mode. It can consist of the following items.
|
||||
All are optional. Items must be separated by a comma.
|
||||
|
||||
|
|
@ -5274,8 +5268,6 @@ A jump table for the options with a short description can be found at |Q_op|.
|
|||
'patchexpr' 'pex' string (default "")
|
||||
global
|
||||
{not in Vi}
|
||||
{not available when compiled without the |+diff|
|
||||
feature}
|
||||
Expression which is evaluated to apply a patch to a file and generate
|
||||
the resulting new version of the file. See |diff-patchexpr|.
|
||||
|
||||
|
|
|
|||
|
|
@ -1134,7 +1134,7 @@ Context-sensitive completion on the command-line:
|
|||
|-e| -e Ex mode, start vim in Ex mode
|
||||
|-R| -R Read-only mode, implies -n
|
||||
|-m| -m modifications not allowed (resets 'write' option)
|
||||
|-d| -d diff mode |diff|
|
||||
|-d| -d |diff-mode|
|
||||
|-b| -b binary mode
|
||||
|-l| -l lisp mode
|
||||
|-A| -A Arabic mode ('arabic' is set)
|
||||
|
|
|
|||
|
|
@ -568,8 +568,8 @@ following procedure is recommended:
|
|||
|
||||
When the Myspell files are updated you can merge the differences:
|
||||
1. Obtain the new Myspell files as xx_YY.new.aff and xx_UU.new.dic.
|
||||
2. Use Vimdiff to see what changed: >
|
||||
vimdiff xx_YY.orig.dic xx_YY.new.dic
|
||||
2. Use |diff-mode| to see what changed: >
|
||||
nvim -d xx_YY.orig.dic xx_YY.new.dic
|
||||
3. Take over the changes you like in xx_YY.dic.
|
||||
You may also need to change xx_YY.aff.
|
||||
4. Rename xx_YY.new.dic to xx_YY.orig.dic and xx_YY.new.aff to xx_YY.new.aff.
|
||||
|
|
|
|||
|
|
@ -99,8 +99,6 @@ rvim vim -Z Like "vim", but in restricted mode (see |-Z|) *rvim*
|
|||
rview vim -RZ Like "view", but in restricted mode. *rview*
|
||||
rgvim vim -gZ Like "gvim", but in restricted mode. *rgvim*
|
||||
rgview vim -RgZ Like "gview", but in restricted mode. *rgview*
|
||||
vimdiff vim -d Start in diff mode |diff-mode|
|
||||
gvimdiff vim -gd Start in diff mode |diff-mode|
|
||||
|
||||
Additional characters may follow, they are ignored. For example, you can have
|
||||
"gvim-5" to start the GUI. You must have an executable by that name then, of
|
||||
|
|
@ -397,9 +395,7 @@ argument.
|
|||
of terminal you are using. (See |terminal-info|.) {not in Vi}
|
||||
|
||||
*-d*
|
||||
-d Start in diff mode, like |vimdiff|.
|
||||
{not in Vi} {not available when compiled without the |+diff|
|
||||
feature}
|
||||
-d Start in |diff-mode|.
|
||||
|
||||
*-f*
|
||||
-f GUI: Do not disconnect from the program that started Vim.
|
||||
|
|
|
|||
|
|
@ -1882,9 +1882,6 @@ In gvim the backspace key produces a backspace character, but on Linux the
|
|||
VERASE key is Delete. Set VERASE to Backspace? (patch by Stephane Chazelas,
|
||||
2007 Oct 16)
|
||||
|
||||
TermResponse autocommand isn't always triggered when using vimdiff. (Aron
|
||||
Griffis, 2007 Sep 19)
|
||||
|
||||
Create a gvimtutor.1 file and change Makefiles to install it.
|
||||
|
||||
When 'encoding' is utf-8 typing text at the end of the line causes previously
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ side by side. All this is possible with split windows.
|
|||
|08.4| Vertical splits
|
||||
|08.5| Moving windows
|
||||
|08.6| Commands for all windows
|
||||
|08.7| Viewing differences with vimdiff
|
||||
|08.7| Viewing differences with diff mode
|
||||
|08.8| Various
|
||||
|08.9| Tab pages
|
||||
|
||||
|
|
@ -335,15 +335,15 @@ The "-O" argument is used to get vertically split windows.
|
|||
file in the argument list. ":vertical all" does it with vertical splits.
|
||||
|
||||
==============================================================================
|
||||
*08.7* Viewing differences with vimdiff
|
||||
*08.7* Viewing differences with diff mode
|
||||
|
||||
There is a special way to start Vim, which shows the differences between two
|
||||
There is a special way to start Nvim, which shows the differences between two
|
||||
files. Let's take a file "main.c" and insert a few characters in one line.
|
||||
Write this file with the 'backup' option set, so that the backup file
|
||||
"main.c~" will contain the previous version of the file.
|
||||
Type this command in a shell (not in Vim): >
|
||||
Type the following in a shell to start Nvim in diff mode: >
|
||||
|
||||
vimdiff main.c~ main.c
|
||||
$ nvim -d main.c~ main.c
|
||||
|
||||
Vim will start, with two windows side by side. You will only see the line
|
||||
in which you added characters, and a few lines above and below it.
|
||||
|
|
@ -367,8 +367,7 @@ in which you added characters, and a few lines above and below it.
|
|||
| |
|
||||
+-----------------------------------------+
|
||||
|
||||
(This picture doesn't show the highlighting, use the vimdiff command for a
|
||||
better look.)
|
||||
(This picture doesn't show the highlighting, use "nvim -d" for that.)
|
||||
|
||||
The lines that were not modified have been collapsed into one line. This is
|
||||
called a closed fold. They are indicated in the picture with "<- fold". Thus
|
||||
|
|
@ -472,7 +471,7 @@ Since there are no changes left now, Vim puts all text in a closed fold.
|
|||
"do" stands for "diff obtain". "dg" would have been better, but that already
|
||||
has a different meaning ("dgg" deletes from the cursor until the first line).
|
||||
|
||||
For details about diff mode, see |vimdiff|.
|
||||
For details about diff mode, see |diff-mode|.
|
||||
|
||||
==============================================================================
|
||||
*08.8* Various
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ To be on the safe side, write this file under another name: >
|
|||
:write help.txt.recovered
|
||||
|
||||
Compare the file with the original file to check if you ended up with what you
|
||||
expected. Vimdiff is very useful for this |08.7|. For example: >
|
||||
expected. Diff mode is very useful for this |08.7|. For example: >
|
||||
|
||||
:write help.txt.recovered
|
||||
:edit #
|
||||
|
|
|
|||
|
|
@ -376,7 +376,7 @@ More about folding by expression in the reference manual: |fold-expr|
|
|||
*28.9* Folding unchanged lines
|
||||
|
||||
This is useful when you set the 'diff' option in the same window. The
|
||||
|vimdiff| command does this for you. Example: >
|
||||
|-d| argument does this for you. Example: >
|
||||
|
||||
:setlocal diff foldmethod=diff scrollbind nowrap foldlevel=1
|
||||
|
||||
|
|
|
|||
|
|
@ -438,7 +438,6 @@ example for when "/usr/local" was used as the root: >
|
|||
rm /usr/local/bin/gview
|
||||
rm /usr/local/bin/gvim
|
||||
rm /usr/local/bin/gvim
|
||||
rm /usr/local/bin/gvimdiff
|
||||
rm /usr/local/bin/rgview
|
||||
rm /usr/local/bin/rgvim
|
||||
rm /usr/local/bin/rview
|
||||
|
|
@ -446,20 +445,17 @@ example for when "/usr/local" was used as the root: >
|
|||
rm /usr/local/bin/rvim
|
||||
rm /usr/local/bin/view
|
||||
rm /usr/local/bin/vim
|
||||
rm /usr/local/bin/vimdiff
|
||||
rm /usr/local/bin/vimtutor
|
||||
rm /usr/local/bin/xxd
|
||||
rm /usr/local/man/man1/ex.1
|
||||
rm /usr/local/man/man1/gview.1
|
||||
rm /usr/local/man/man1/gvim.1
|
||||
rm /usr/local/man/man1/gvimdiff.1
|
||||
rm /usr/local/man/man1/rgview.1
|
||||
rm /usr/local/man/man1/rgvim.1
|
||||
rm /usr/local/man/man1/rview.1
|
||||
rm /usr/local/man/man1/rvim.1
|
||||
rm /usr/local/man/man1/view.1
|
||||
rm /usr/local/man/man1/vim.1
|
||||
rm /usr/local/man/man1/vimdiff.1
|
||||
rm /usr/local/man/man1/vimtutor.1
|
||||
rm /usr/local/man/man1/xxd.1
|
||||
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ Read this from start to end to learn the essential commands.
|
|||
|08.4| Vertical splits
|
||||
|08.5| Moving windows
|
||||
|08.6| Commands for all windows
|
||||
|08.7| Viewing differences with vimdiff
|
||||
|08.7| Viewing differences with diff mode
|
||||
|08.8| Various
|
||||
|
||||
|usr_09.txt| Using the GUI
|
||||
|
|
|
|||
|
|
@ -325,7 +325,6 @@ m *+debug* Compiled for debugging.
|
|||
N *+dialog_gui* Support for |:confirm| with GUI dialog.
|
||||
N *+dialog_con* Support for |:confirm| with console dialog.
|
||||
N *+dialog_con_gui* Support for |:confirm| with GUI and console dialog.
|
||||
N *+diff* |vimdiff| and 'diff'
|
||||
N *+digraphs* |digraphs| *E196*
|
||||
*+dnd* Support for DnD into the "~ register |quote_~|.
|
||||
B *+emacs_tags* |emacs-tags| files
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ Folding. |folding|
|
|||
Folds can be created manually, from the syntax of the file, by indent,
|
||||
etc.
|
||||
|
||||
Diff mode. |diff|
|
||||
Diff mode. |diff-mode|
|
||||
Vim can show two versions of a file with the differences highlighted.
|
||||
Parts of the text that are equal are folded away. Commands can be
|
||||
used to move text from one version to the other.
|
||||
|
|
@ -826,7 +826,7 @@ Only Vim is able to accept options in between and after the file names.
|
|||
loading the edit buffer.
|
||||
Vim: allow up to 10 "-c" arguments
|
||||
|
||||
-d Vim: start with 'diff' set. |vimdiff|
|
||||
-d Vim: start with 'diff' set. |diff-mode|
|
||||
|
||||
-D Vim: debug mode.
|
||||
|
||||
|
|
|
|||
|
|
@ -6828,7 +6828,7 @@ void unblock_autocmds(void)
|
|||
|
||||
/* When v:termresponse was set while autocommands were blocked, trigger
|
||||
* the autocommands now. Esp. useful when executing a shell command
|
||||
* during startup (vimdiff). */
|
||||
* during startup (nvim -d). */
|
||||
if (autocmd_blocked == 0
|
||||
&& get_vim_var_str(VV_TERMRESPONSE) != old_termresponse)
|
||||
apply_autocmds(EVENT_TERMRESPONSE, NULL, NULL, FALSE, curbuf);
|
||||
|
|
|
|||
|
|
@ -204,7 +204,7 @@ int main(int argc, char **argv)
|
|||
|
||||
/*
|
||||
* Figure out the way to work from the command name argv[0].
|
||||
* "vimdiff" starts diff mode, "rvim" sets "restricted", etc.
|
||||
* "view" sets "readonlymode", "rvim" sets "restricted", etc.
|
||||
*/
|
||||
parse_command_name(¶ms);
|
||||
|
||||
|
|
@ -454,7 +454,7 @@ int main(int argc, char **argv)
|
|||
edit_buffers(¶ms);
|
||||
|
||||
if (params.diff_mode) {
|
||||
/* set options in each window for "vimdiff". */
|
||||
/* set options in each window for "nvim -d". */
|
||||
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
|
||||
diff_win_options(wp, TRUE);
|
||||
}
|
||||
|
|
@ -867,11 +867,10 @@ static void init_locale(void)
|
|||
#endif
|
||||
|
||||
/*
|
||||
* Check for: [r][g][vi|vim|view][diff][ex[im]]
|
||||
* Check for: [r][g][vi|vim|view][ex[im]]
|
||||
* If the executable name starts with "r" we disable shell commands.
|
||||
* If the next character is "g" we run the GUI version.
|
||||
* If the next characters are "view" we start in readonly mode.
|
||||
* If the next characters are "diff" or "vimdiff" we start in diff mode.
|
||||
* If the next characters are "ex" we start in Ex mode. If it's followed
|
||||
* by "im" use improved Ex mode.
|
||||
*/
|
||||
|
|
@ -902,10 +901,6 @@ static void parse_command_name(mparm_T *parmp)
|
|||
parse_string(&initstr, "vim", 3); /* consume "vim" if it's there */
|
||||
}
|
||||
|
||||
/* Catch "[r][g]vimdiff" and "[r][g]viewdiff". */
|
||||
if (parse_string(&initstr, "diff", 4))
|
||||
parmp->diff_mode = TRUE;
|
||||
|
||||
if (parse_string(&initstr, "ex", 2)) {
|
||||
if (parse_string(&initstr, "im", 2))
|
||||
exmode_active = EXMODE_VIM;
|
||||
|
|
@ -2076,7 +2071,7 @@ static void usage(void)
|
|||
mch_msg(_(" -e Ex mode (like \"ex\")\n"));
|
||||
mch_msg(_(" -E Improved Ex mode\n"));
|
||||
mch_msg(_(" -s Silent (batch) mode (only for \"ex\")\n"));
|
||||
mch_msg(_(" -d Diff mode (like \"vimdiff\")\n"));
|
||||
mch_msg(_(" -d Diff mode\n"));
|
||||
mch_msg(_(" -R Readonly mode (like \"view\")\n"));
|
||||
mch_msg(_(" -Z Restricted mode (like \"rvim\")\n"));
|
||||
mch_msg(_(" -m Modifications (writing files) not allowed\n"));
|
||||
|
|
|
|||
|
|
@ -59,7 +59,6 @@ static char *(features[]) = {
|
|||
"+cursorbind",
|
||||
"+cursorshape",
|
||||
"+dialog_con",
|
||||
"+diff",
|
||||
"+digraphs",
|
||||
"-dnd",
|
||||
"-ebcdic",
|
||||
|
|
|
|||
Loading…
Reference in New Issue