diff options
Diffstat (limited to 'runtime/doc')
31 files changed, 91 insertions, 596 deletions
diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile index 1f2affe829..2b338cc565 100644 --- a/runtime/doc/Makefile +++ b/runtime/doc/Makefile @@ -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 diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 0ee5878341..4aea7b4968 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -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. > - - vimdiff file1 file2 [file3 [file4]] - -This is equivalent to: > +To start editing in diff mode, run "nvim -d". This starts Nvim as usual, and +additionally sets up for viewing the differences between the arguments. > - vim -d file1 file2 [file3 [file4]] + nvim -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, |-Z| and |-R| may be used for restricted +mode and readonly 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 use 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'. @@ -88,17 +80,17 @@ 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. + as for "nvim -d" 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 as 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} and open a buffer on the result. This sets the + options as 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, @@ -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. diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index d8dee5726b..456cd5dff6 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -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. diff --git a/runtime/doc/manpages/de/vim-de.1 b/runtime/doc/manpages/de/vim-de.1 index 3b26550072..d958372012 100644 --- a/runtime/doc/manpages/de/vim-de.1 +++ b/runtime/doc/manpages/de/vim-de.1 @@ -156,7 +156,7 @@ 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). +Unterschiede an. .TP \-d {Gerät} Öffnet das {Gerät}, um es als Terminal zu nutzen. Nur für AmigaOS. Beispiel: diff --git a/runtime/doc/manpages/fr/vim-fr.1 b/runtime/doc/manpages/fr/vim-fr.1 index 0559f5714b..2b2a50765f 100644 --- a/runtime/doc/manpages/fr/vim-fr.1 +++ b/runtime/doc/manpages/fr/vim-fr.1 @@ -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. diff --git a/runtime/doc/manpages/fr/vimdiff-fr.1 b/runtime/doc/manpages/fr/vimdiff-fr.1 deleted file mode 100644 index 3b44a3dd58..0000000000 --- a/runtime/doc/manpages/fr/vimdiff-fr.1 +++ /dev/null @@ -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> diff --git a/runtime/doc/manpages/it/vim-it.1 b/runtime/doc/manpages/it/vim-it.1 index 4d17025dc3..36ece8fb0b 100644 --- a/runtime/doc/manpages/it/vim-it.1 +++ b/runtime/doc/manpages/it/vim-it.1 @@ -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. diff --git a/runtime/doc/manpages/it/vimdiff-it.1 b/runtime/doc/manpages/it/vimdiff-it.1 deleted file mode 100644 index 090892fa93..0000000000 --- a/runtime/doc/manpages/it/vimdiff-it.1 +++ /dev/null @@ -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. diff --git a/runtime/doc/manpages/ja/vim-ja.1 b/runtime/doc/manpages/ja/vim-ja.1 index 714ad0ae78..9a9111a69f 100644 --- a/runtime/doc/manpages/ja/vim-ja.1 +++ b/runtime/doc/manpages/ja/vim-ja.1 @@ -164,7 +164,6 @@ Note: "+" と "\-c" は合わせて 10 個まで指定できます。 差分モードで起動します。 二つか三つの四つのファイルを引数に指定してください。 指定されたファイルが開かれ、それらのファイルの差分が表示されます。 -vimdiff(1) と同様の動作です。 .TP \-d {device} {device} を端末として開きます。 diff --git a/runtime/doc/manpages/ja/vimdiff-ja.1 b/runtime/doc/manpages/ja/vimdiff-ja.1 deleted file mode 100644 index 56fadfef6e..0000000000 --- a/runtime/doc/manpages/ja/vimdiff-ja.1 +++ /dev/null @@ -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" を参照してください。 diff --git a/runtime/doc/manpages/pl/vim-pl.1 b/runtime/doc/manpages/pl/vim-pl.1 index 97d28f3a78..e92c3fd35f 100644 --- a/runtime/doc/manpages/pl/vim-pl.1 +++ b/runtime/doc/manpages/pl/vim-pl.1 @@ -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. diff --git a/runtime/doc/manpages/pl/vimdiff-pl.1 b/runtime/doc/manpages/pl/vimdiff-pl.1 deleted file mode 100644 index d66fdc9c03..0000000000 --- a/runtime/doc/manpages/pl/vimdiff-pl.1 +++ /dev/null @@ -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. diff --git a/runtime/doc/manpages/ru/vim-ru.1 b/runtime/doc/manpages/ru/vim-ru.1 index ef527213e3..c48fb6691a 100644 --- a/runtime/doc/manpages/ru/vim-ru.1 +++ b/runtime/doc/manpages/ru/vim-ru.1 @@ -173,7 +173,6 @@ rvim rview rgvim rgview Должно быть указано два или три имени файла. .B Vim откроет все файлы и покажет различия между ними -(как vimdiff(1)). .TP \-d {устройство} Открыть {устройство} для использования в качестве терминала (только на Amiga). diff --git a/runtime/doc/manpages/ru/vimdiff-ru.1 b/runtime/doc/manpages/ru/vimdiff-ru.1 deleted file mode 100644 index 2f17e9c2e5..0000000000 --- a/runtime/doc/manpages/ru/vimdiff-ru.1 +++ /dev/null @@ -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. diff --git a/runtime/doc/manpages/vim.1 b/runtime/doc/manpages/vim.1 index 678170f6e1..c35fa78f0d 100644 --- a/runtime/doc/manpages/vim.1 +++ b/runtime/doc/manpages/vim.1 @@ -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 diff --git a/runtime/doc/manpages/vimdiff.1 b/runtime/doc/manpages/vimdiff.1 deleted file mode 100644 index bed2b32889..0000000000 --- a/runtime/doc/manpages/vimdiff.1 +++ /dev/null @@ -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. diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 6c14d8e8fd..928a98066f 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -45,8 +45,7 @@ achieve special effects. These options come in three forms: :se[t] inv{option} Toggle option: Invert value. {not in Vi} *:set-default* *:set-&* *:set-&vi* *:set-&vim* -:se[t] {option}& Reset option to its default value. May depend on the - current value of 'compatible'. {not in Vi} +:se[t] {option}& Reset option to its default value. {not in Vi} :se[t] {option}&vi Reset option to its Vi default value. {not in Vi} :se[t] {option}&vim Reset option to its Vim default value. {not in Vi} @@ -63,8 +62,7 @@ achieve special effects. These options come in three forms: (hex and octal are only available for machines which have the strtol() function). The old value can be inserted by typing 'wildchar' (by - default this is a <Tab> or CTRL-E if 'compatible' is - set). See |cmdline-completion|. + default this is a <Tab>). See |cmdline-completion|. White space between {option} and '=' is allowed and will be ignored. White space between '=' and {value} is not allowed. @@ -121,8 +119,6 @@ set all" or ":verbose set" without an argument. When the option was set by hand there is no "Last set" message. When the option was set while executing a function, user command or autocommand, the script in which it was defined is reported. -Note that an option may also have been set as a side effect of setting -'compatible'. A few special texts: Last set from modeline ~ Option was set in a |modeline|. @@ -587,10 +583,6 @@ an abbreviation if there is one. Both forms may be used. In this document when a boolean option is "set" that means that ":set option" is entered. When an option is "reset", ":set nooption" is used. -For some options there are two default values: The "Vim default", which is -used when 'compatible' is not set, and the "Vi default", which is used when -'compatible' is set. - Most options are the same in all windows and buffers. There are a few that are specific to how the text is presented in a window. These can be set to a different value in each window. For example the 'list' option can be set in @@ -654,7 +646,6 @@ A jump table for the options with a short description can be found at |Q_op|. avoid that users that accidentally type CTRL-_ instead of SHIFT-_ get into reverse Insert mode, and don't know how to get out. See 'revins'. - NOTE: This option is reset when 'compatible' is set. *'altkeymap'* *'akm'* *'noaltkeymap'* *'noakm'* 'altkeymap' 'akm' boolean (default off) @@ -901,7 +892,6 @@ A jump table for the options with a short description can be found at |Q_op|. 2 same as ":set backspace=indent,eol,start" See |:fixdel| if your <BS> or <Del> key does not do what you want. - NOTE: This option is set to "" when 'compatible' is set. *'backup'* *'bk'* *'nobackup'* *'nobk'* 'backup' 'bk' boolean (default off) @@ -917,7 +907,6 @@ A jump table for the options with a short description can be found at |Q_op|. When the 'backupskip' pattern matches, a backup is not made anyway. When 'patchmode' is set, the backup may be renamed to become the oldest version of a file. - NOTE: This option is reset when 'compatible' is set. *'backupcopy'* *'bkc'* 'backupcopy' 'bkc' string (Vi default for Unix: "yes", otherwise: "auto") @@ -1358,13 +1347,12 @@ A jump table for the options with a short description can be found at |Q_op|. (parts of 'cdpath' can be passed to the shell to expand file names). *'cedit'* -'cedit' string (Vi default: "", Vim default: CTRL-F) +'cedit' string (Vim default: CTRL-F, Vi default: "") global {not in Vi} {not available when compiled without the |+vertsplit| feature} The key used in Command-line Mode to open the command-line window. - The default is CTRL-F when 'compatible' is off. Only non-printable keys are allowed. The key can be specified as a single character, but it is difficult to type. The preferred way is to use the <> notation. Examples: > @@ -1432,7 +1420,6 @@ A jump table for the options with a short description can be found at |Q_op|. When you don't like the way 'cindent' works, try the 'smartindent' option or 'indentexpr'. This option is not used when 'paste' is set. - NOTE: This option is reset when 'compatible' is set. *'cinkeys'* *'cink'* 'cinkeys' 'cink' string (default "0{,0},0),:,0#,!^F,o,O,e") @@ -1633,94 +1620,10 @@ A jump table for the options with a short description can be found at |Q_op|. |fold-marker|. *'compatible'* *'cp'* *'nocompatible'* *'nocp'* -'compatible' 'cp' boolean (default on, off when a |vimrc| or |gvimrc| - file is found) - global - {not in Vi} - This option has the effect of making Vim either more Vi-compatible, or - make Vim behave in a more useful way. - This is a special kind of option, because when it's set or reset, - other options are also changed as a side effect. CAREFUL: Setting or - resetting this option can have a lot of unexpected effects: Mappings - are interpreted in another way, undo behaves differently, etc. If you - set this option in your vimrc file, you should probably put it at the - very start. - By default this option is on and the Vi defaults are used for the - options. This default was chosen for those people who want to use Vim - just like Vi, and don't even (want to) know about the 'compatible' - option. - When a |vimrc| or |gvimrc| file is found while Vim is starting up, - this option is switched off, and all options that have not been - modified will be set to the Vim defaults. Effectively, this means - that when a |vimrc| or |gvimrc| file exists, Vim will use the Vim - defaults, otherwise it will use the Vi defaults. (Note: This doesn't - happen for the system-wide vimrc or gvimrc file, nor for a file given - with the |-u| argument). Also see |compatible-default| and - |posix-compliance|. - You can also set this option with the "-C" argument, and reset it with - "-N". See |-C| and |-N|. - Switching this option off makes the Vim defaults be used for options - that have a different Vi and Vim default value. See the options - marked with a '+' below. Other options are not modified. - At the moment this option is set, several other options will be set - or reset to make Vim as Vi-compatible as possible. See the table - below. This can be used if you want to revert to Vi compatible - editing. - See also 'cpoptions'. - - option + set value effect ~ - - 'allowrevins' off no CTRL-_ command - 'backupcopy' Unix: "yes" backup file is a copy - others: "auto" copy or rename backup file - 'backspace' "" normal backspace - 'backup' off no backup file - 'cindent' off no C code indentation - 'cedit' + "" no key to open the |cmdwin| - 'cpoptions' + (all flags) Vi-compatible flags - 'cscopetag' off don't use cscope for ":tag" - 'cscopetagorder' 0 see |cscopetagorder| - 'cscopeverbose' off see |cscopeverbose| - 'digraph' off no digraphs - 'esckeys' + off no <Esc>-keys in Insert mode - 'expandtab' off tabs not expanded to spaces - 'fileformats' + "" no automatic file format detection, - "dos,unix" except for DOS and Windows - 'formatoptions' + "vt" Vi compatible formatting - 'gdefault' off no default 'g' flag for ":s" - 'history' + 0 no commandline history - 'hkmap' off no Hebrew keyboard mapping - 'hkmapp' off no phonetic Hebrew keyboard mapping - 'hlsearch' off no highlighting of search matches - 'incsearch' off no incremental searching - 'indentexpr' "" no indenting by expression - 'insertmode' off do not start in Insert mode - 'iskeyword' + "@,48-57,_" keywords contain alphanumeric - characters and '_' - 'joinspaces' on insert 2 spaces after period - 'modeline' + off no modelines - 'more' + off no pauses in listings - 'revins' off no reverse insert - 'ruler' off no ruler - 'scrolljump' 1 no jump scroll - 'scrolloff' 0 no scroll offset - 'shiftround' off indent not rounded to shiftwidth - 'shortmess' + "" no shortening of messages - 'showcmd' + off command characters not shown - 'showmode' + off current mode not shown - 'smartcase' off no automatic ignore case switch - 'smartindent' off no smart indentation - 'smarttab' off no smart tab size - 'softtabstop' 0 tabs are always 'tabstop' positions - 'startofline' on goto startofline with some commands - 'tagrelative' + off tag file names are not relative - 'textwidth' 0 no automatic line wrap - 'tildeop' off tilde is not an operator - 'ttimeout' off no terminal timeout - 'whichwrap' + "" left-right movements don't wrap - 'wildchar' + CTRL-E only when the current value is <Tab> - use CTRL-E for cmdline completion - 'writebackup' on or off depends on the |+writebackup| feature +'compatible' 'cp' Removed. {Nvim} + + Support for Vi-compatible mode has been removed. "set nocp" is + ignored, and "set cp" is an error. *'complete'* *'cpt'* *E535* 'complete' 'cpt' string (default: ".,w,b,u,t,i") @@ -1881,12 +1784,11 @@ A jump table for the options with a short description can be found at |Q_op|. existing line. 'expandtab' has no effect on these characters, a Tab remains a Tab. If the new indent is greater than on the existing line, the remaining space is filled in the normal manner. - NOTE: 'copyindent' is reset when 'compatible' is set. - Also see 'preserveindent'. + See 'preserveindent'. *'cpoptions'* *'cpo'* 'cpoptions' 'cpo' string (Vim default: "aABceFs", - Vi default: all flags) + Vi default: all flags) global {not in Vi} A sequence of single character flags. When a character is present @@ -1896,8 +1798,6 @@ A jump table for the options with a short description can be found at |Q_op|. Commas can be added for readability. To avoid problems with flags that are added in the future, use the "+=" and "-=" feature of ":set" |add-option-flags|. - NOTE: This option is set to the Vi default value when 'compatible' is - set and to the Vim default value when 'compatible' is reset. NOTE: This option is set to the POSIX default value at startup when the Vi default value would be used and the $VIM_POSIX environment variable exists |posix|. This means Vim tries to behave like the @@ -2242,7 +2142,6 @@ A jump table for the options with a short description can be found at |Q_op|. feature} {not in Vi} Use cscope for tag commands. See |cscope-options|. - NOTE: This option is reset when 'compatible' is set. *'cscopetagorder'* *'csto'* 'cscopetagorder' 'csto' number (default 0) @@ -2252,7 +2151,6 @@ A jump table for the options with a short description can be found at |Q_op|. {not in Vi} Determines the order in which ":cstag" performs a search. See |cscopetagorder|. - NOTE: This option is set to 0 when 'compatible' is set. *'cscopeverbose'* *'csverb'* *'nocscopeverbose'* *'nocsverb'* @@ -2262,7 +2160,6 @@ A jump table for the options with a short description can be found at |Q_op|. feature} {not in Vi} Give messages when adding a cscope database. See |cscopeverbose|. - NOTE: This option is reset when 'compatible' is set. *'cursorbind'* *'crb'* *'nocursorbind'* *'nocrb'* 'cursorbind' 'crb' boolean (default off) @@ -2382,17 +2279,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 +2295,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. @@ -2452,7 +2343,6 @@ A jump table for the options with a short description can be found at |Q_op|. feature} Enable the entering of digraphs in Insert mode with {char1} <BS> {char2}. See |digraphs|. - NOTE: This option is reset when 'compatible' is set. *'directory'* *'dir'* 'directory' 'dir' string (default for MS-DOS and Win32: ".,$TEMP,c:\tmp,c:\temp", @@ -2689,8 +2579,6 @@ A jump table for the options with a short description can be found at |Q_op|. try changing the values for 'timeoutlen' and 'ttimeoutlen'. Note that when 'esckeys' is off, you can still map anything, but the cursor keys won't work by default. - NOTE: This option is set to the Vi default value when 'compatible' is - set and to the Vim default value when 'compatible' is reset. *'eventignore'* *'ei'* 'eventignore' 'ei' string (default "") @@ -2712,7 +2600,6 @@ A jump table for the options with a short description can be found at |Q_op|. <Tab>. Spaces are used in indents with the '>' and '<' commands and when 'autoindent' is on. To insert a real tab when 'expandtab' is on, use CTRL-V<Tab>. See also |:retab| and |ins-expandtab|. - NOTE: This option is reset when 'compatible' is set. *'exrc'* *'ex'* *'noexrc'* *'noex'* 'exrc' 'ex' boolean (default off) @@ -2863,10 +2750,9 @@ A jump table for the options with a short description can be found at |Q_op|. *'fileformats'* *'ffs'* 'fileformats' 'ffs' string (default: - Vim+Vi MS-DOS and MS-Windows: "dos,unix", + Vim+Vi Win32: "dos,unix", Vim Unix: "unix,dos", Vim Mac: "mac,unix,dos", - Vi Cygwin: "unix,dos", Vi others: "") global {not in Vi} @@ -2915,8 +2801,6 @@ A jump table for the options with a short description can be found at |Q_op|. <CR> in front of it, Dos format is used, otherwise Unix format is used. Also see |file-formats|. - NOTE: This option is set to the Vi default value when 'compatible' is - set and to the Vim default value when 'compatible' is reset. *'fileignorecase'* *'fic'* *'nofileignorecase'* *'nofic'* 'fileignorecase' 'fic' boolean (default on for systems where case in file @@ -3202,8 +3086,6 @@ A jump table for the options with a short description can be found at |Q_op|. be inserted for readability. To avoid problems with flags that are added in the future, use the "+=" and "-=" feature of ":set" |add-option-flags|. - NOTE: This option is set to the Vi default value when 'compatible' is - set and to the Vim default value when 'compatible' is reset. *'formatlistpat'* *'flp'* 'formatlistpat' 'flp' string (default: "^\s*\d\+[\]:.)}\t ]\s*") @@ -3298,8 +3180,6 @@ A jump table for the options with a short description can be found at |Q_op|. :s///g subst. one subst. all :s///gg subst. all subst. one - NOTE: This option is reset when 'compatible' is set. - *'grepformat'* *'gfm'* 'grepformat' 'gfm' string (default "%f:%l:%m,%f:%l%m,%f %l%m") global @@ -3784,17 +3664,16 @@ A jump table for the options with a short description can be found at |Q_op|. *'highlight'* *'hl'* 'highlight' 'hl' string (default (as a single string): - "8:SpecialKey,@:NonText,d:Directory, - e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg, - M:ModeMsg,n:LineNr,N:CursorLineNr, - r:Question,s:StatusLine,S:StatusLineNC, - c:VertSplit, t:Title,v:Visual, - w:WarningMsg,W:WildMenu, - f:Folded,F:FoldColumn,A:DiffAdd, - C:DiffChange,D:DiffDelete,T:DiffText, - >:SignColumn,B:SpellBad,P:SpellCap, - R:SpellRare,L:SpellLocal,-:Conceal, - +:Pmenu,=:PmenuSel, + "8:SpecialKey,~:EndOfBuffer,@:NonText,i + d:Directory,e:ErrorMsg,i:IncSearch, + l:Search,m:MoreMsg,M:ModeMsg,n:LineNr, + N:CursorLineNr,r:Question,s:StatusLine, + S:StatusLineNC,c:VertSplit,t:Title, + v:Visual,w:WarningMsg,W:WildMenu,f:Folded, + F:FoldColumn,A:DiffAdd,C:DiffChange, + D:DiffDelete,T:DiffText,>:SignColumn, + B:SpellBad,P:SpellCap,R:SpellRare, + L:SpellLocal,-:Conceal,+:Pmenu,=:PmenuSel, x:PmenuSbar,X:PmenuThumb") global {not in Vi} @@ -3803,7 +3682,8 @@ A jump table for the options with a short description can be found at |Q_op|. first character in a pair gives the occasion, the second the mode to use for that occasion. The occasions are: |hl-SpecialKey| 8 Meta and special keys listed with ":map" - |hl-NonText| @ '~' and '@' at the end of the window and + |hl-EndOfBuffer| ~ lines after the last line in the buffer + |hl-NonText| @ '@' at the end of the window and characters from 'showbreak' |hl-Directory| d directories in CTRL-D listing and other special things in listings @@ -3887,7 +3767,6 @@ A jump table for the options with a short description can be found at |Q_op|. drawn may not continue in a newly drawn line. You can specify whether the highlight status is restored on startup with the 'h' flag in 'viminfo' |viminfo-h|. - NOTE: This option is reset when 'compatible' is set. *'history'* *'hi'* 'history' 'hi' number (Vim default: 50, Vi default: 0) @@ -3897,8 +3776,6 @@ A jump table for the options with a short description can be found at |Q_op|. is remembered. This option decides how many entries may be stored in each of these histories (see |cmdline-editing|). The maximum value is 10000. - NOTE: This option is set to the Vi default value when 'compatible' is - set and to the Vim default value when 'compatible' is reset. *'hkmap'* *'hk'* *'nohkmap'* *'nohk'* 'hkmap' 'hk' boolean (default off) @@ -3909,7 +3786,6 @@ A jump table for the options with a short description can be found at |Q_op|. When on, the keyboard is mapped for the Hebrew character set. Normally you would set 'allowrevins' and use CTRL-_ in insert mode to toggle this option. See |rileft.txt|. - NOTE: This option is reset when 'compatible' is set. *'hkmapp'* *'hkp'* *'nohkmapp'* *'nohkp'* 'hkmapp' 'hkp' boolean (default off) @@ -3920,7 +3796,6 @@ A jump table for the options with a short description can be found at |Q_op|. When on, phonetic keyboard mapping is used. 'hkmap' must also be on. This is useful if you have a non-Hebrew keyboard. See |rileft.txt|. - NOTE: This option is reset when 'compatible' is set. *'icon'* *'noicon'* 'icon' boolean (default off, on when title can be restored) @@ -4166,7 +4041,6 @@ A jump table for the options with a short description can be found at |Q_op|. converted to lowercase. CTRL-R CTRL-W can be used to add the word at the end of the current match, excluding the characters that were already typed. - NOTE: This option is reset when 'compatible' is set. *'indentexpr'* *'inde'* 'indentexpr' 'inde' string (default "") @@ -4197,7 +4071,6 @@ A jump table for the options with a short description can be found at |Q_op|. < Error messages will be suppressed, unless the 'debug' option contains "msg". See |indent-expression|. - NOTE: This option is made empty when 'compatible' is set. The expression will be evaluated in the |sandbox| when set from a modeline, see |sandbox-option|. @@ -4256,8 +4129,6 @@ A jump table for the options with a short description can be found at |Q_op|. mappings with 'insertmode' set or not set. When executing commands with |:normal| 'insertmode' is not used. - NOTE: This option is reset when 'compatible' is set. - *'isfname'* *'isf'* 'isfname' 'isf' string (default for MS-DOS and Win32: "@,48-57,/,\,.,-,_,+,,,#,$,%,{,},[,],:,@-@,!,~,=" @@ -4326,10 +4197,10 @@ A jump table for the options with a short description can be found at |Q_op|. expand "$HOME/.viminfo". Maybe you should change 'iskeyword' instead. *'iskeyword'* *'isk'* -'iskeyword' 'isk' string (Vim default for MS-DOS and Win32: - "@,48-57,_,128-167,224-235" - otherwise: "@,48-57,_,192-255" - Vi default: "@,48-57,_") +'iskeyword' 'isk' string (Vim default for + Win32: @,48-57,_,128-167,224-235 + otherwise: @,48-57,_,192-255 + Vi default: @,48-57,_) local to buffer {not in Vi} Keywords are used in searching and recognizing with many commands: @@ -4340,8 +4211,6 @@ A jump table for the options with a short description can be found at |Q_op|. '*', '"' and '|' (so that CTRL-] on a command finds the help for that command). When the 'lisp' option is on the '-' character is always included. - NOTE: This option is set to the Vi default value when 'compatible' is - set and to the Vim default value when 'compatible' is reset. *'isprint'* *'isp'* 'isprint' 'isp' string (default for MS-DOS, Win32, and Macintosh: @@ -4382,7 +4251,6 @@ A jump table for the options with a short description can be found at |Q_op|. Insert two spaces after a '.', '?' and '!' with a join command. When 'cpoptions' includes the 'j' flag, only do this after a '.'. Otherwise only one space is inserted. - NOTE: This option is set when 'compatible' is set. *'key'* 'key' Removed. {Nvim} @@ -4888,8 +4756,6 @@ A jump table for the options with a short description can be found at |Q_op|. If 'modeline' is on 'modelines' gives the number of lines that is checked for set commands. If 'modeline' is off or 'modelines' is zero no lines are checked. See |modeline|. - NOTE: 'modeline' is set to the Vi default value when 'compatible' is - set and to the Vim default value when 'compatible' is reset. *'modifiable'* *'ma'* *'nomodifiable'* *'noma'* 'modifiable' 'ma' boolean (default on) @@ -4929,8 +4795,6 @@ A jump table for the options with a short description can be found at |Q_op|. When on, listings pause when the whole screen is filled. You will get the |more-prompt|. When this option is off there are no pauses, the listing continues until finished. - NOTE: This option is set to the Vi default value when 'compatible' is - set and to the Vim default value when 'compatible' is reset. *'mouse'* *E538* 'mouse' string (default "", "a" for GUI, MS-DOS and Win32) @@ -5121,7 +4985,7 @@ A jump table for the options with a short description can be found at |Q_op|. local to window Print the line number in front of each line. When the 'n' option is excluded from 'cpoptions' a wrapped line will not use the column of - line numbers (this is the default when 'compatible' isn't set). + line numbers. The 'numberwidth' option can be used to set the room used for the line number. When a long, wrapped line doesn't start with the first character, '-' @@ -5157,7 +5021,6 @@ A jump table for the options with a short description can be found at |Q_op|. is set. Thus with the Vim default of 4 there is room for a line number up to 999. When the buffer has 1000 lines five columns will be used. The minimum value is 1, the maximum value is 10. - NOTE: 'numberwidth' is reset to 8 when 'compatible' is set. *'omnifunc'* *'ofu'* 'omnifunc' 'ofu' string (default: empty) @@ -5274,8 +5137,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|. @@ -5368,7 +5229,6 @@ A jump table for the options with a short description can be found at |Q_op|. a Tab. NOTE: When using ">>" multiple times the resulting indent is a mix of tabs and spaces. You might not like this. - NOTE: 'preserveindent' is reset when 'compatible' is set. Also see 'copyindent'. Use |:retab| to clean up white space. @@ -5537,8 +5397,7 @@ A jump table for the options with a short description can be found at |Q_op|. having to calculate it yourself. Especially useful in combination with other commands (e.g. y d c < > gq gw =). When the 'n' option is excluded from 'cpoptions' a wrapped - line will not use the column of line numbers (this is the default when - 'compatible' isn't set). + line will not use the column of line numbers. The 'numberwidth' option can be used to set the room used for the line number. When a long, wrapped line doesn't start with the first character, '-' @@ -5594,7 +5453,7 @@ A jump table for the options with a short description can be found at |Q_op|. Inserting characters in Insert mode will work backwards. See "typing backwards" |ins-reverse|. This option can be toggled with the CTRL-_ command in Insert mode, when 'allowrevins' is set. - NOTE: This option is reset when 'compatible' or 'paste' is set. + NOTE: This option is reset when 'paste' is set. *'rightleft'* *'rl'* *'norightleft'* *'norl'* 'rightleft' 'rl' boolean (default off) @@ -5653,7 +5512,6 @@ A jump table for the options with a short description can be found at |Q_op|. This option is reset when the 'paste' option is set. If you don't want to see the ruler all the time but want to know where you are, use "g CTRL-G" |g_CTRL-G|. - NOTE: This option is reset when 'compatible' is set. *'rulerformat'* *'ruf'* 'rulerformat' 'ruf' string (default empty) @@ -5771,7 +5629,6 @@ A jump table for the options with a short description can be found at |Q_op|. When set to a negative number from -1 to -100 this is used as the percentage of the window height. Thus -50 scrolls half the window height. - NOTE: This option is set to 1 when 'compatible' is set. *'scrolloff'* *'so'* 'scrolloff' 'so' number (default 0) @@ -5783,7 +5640,6 @@ A jump table for the options with a short description can be found at |Q_op|. in the middle of the window (except at the start or end of the file or when long lines wrap). For scrolling horizontally see 'sidescrolloff'. - NOTE: This option is set to 0 when 'compatible' is set. *'scrollopt'* *'sbo'* 'scrollopt' 'sbo' string (default "ver,jump") @@ -6064,7 +5920,7 @@ A jump table for the options with a short description can be found at |Q_op|. if exists('+shellslash') < *'shelltemp'* *'stmp'* *'noshelltemp'* *'nostmp'* -'shelltemp' 'stmp' boolean (Vi default off, Vim default on) +'shelltemp' 'stmp' boolean (Vim default on, Vi default off) global {not in Vi} When on, use temp files for shell commands. When off use a pipe. @@ -6120,7 +5976,6 @@ A jump table for the options with a short description can be found at |Q_op|. Round indent to multiple of 'shiftwidth'. Applies to > and < commands. CTRL-T and CTRL-D in Insert mode always round the indent to a multiple of 'shiftwidth' (this is Vi compatible). - NOTE: This option is reset when 'compatible' is set. *'shiftwidth'* *'sw'* 'shiftwidth' 'sw' number (default 8) @@ -6180,9 +6035,6 @@ A jump table for the options with a short description can be found at |Q_op|. shm=a Abbreviation, but no loss of information. shm=at Abbreviation, and truncate message when necessary. - NOTE: This option is set to the Vi default value when 'compatible' is - set and to the Vim default value when 'compatible' is reset. - *'shortname'* *'sn'* *'noshortname'* *'nosn'* 'shortname' 'sn' Removed. {Nvim} @@ -6208,8 +6060,8 @@ A jump table for the options with a short description can be found at |Q_op|. "n" flag to 'cpoptions'. *'showcmd'* *'sc'* *'noshowcmd'* *'nosc'* -'showcmd' 'sc' boolean (Vim default: on, off for Unix, Vi default: - off) +'showcmd' 'sc' boolean (Vim default: on (off for Unix), + Vi default: off) global {not in Vi} {not available when compiled without the @@ -6223,8 +6075,6 @@ A jump table for the options with a short description can be found at |Q_op|. - When selecting more than one line, the number of lines. - When selecting a block, the size in screen characters: {lines}x{columns}. - NOTE: This option is set to the Vi default value when 'compatible' is - set and to the Vim default value when 'compatible' is reset. *'showfulltag'* *'sft'* *'noshowfulltag'* *'nosft'* 'showfulltag' 'sft' boolean (default off) @@ -6267,8 +6117,6 @@ A jump table for the options with a short description can be found at |Q_op|. When |XIM| may be used the message will include "XIM". But this doesn't mean XIM is really active, especially when 'imactivatekey' is not set. - NOTE: This option is set to the Vi default value when 'compatible' is - set and to the Vim default value when 'compatible' is reset. *'showtabline'* *'stal'* 'showtabline' 'stal' number (default 1) @@ -6308,7 +6156,6 @@ A jump table for the options with a short description can be found at |Q_op|. to a large value (like 999) has the effect of keeping the cursor horizontally centered in the window, as long as one does not come too close to the beginning of the line. - NOTE: This option is set to 0 when 'compatible' is set. Example: Try this together with 'sidescroll' and 'listchars' as in the following example to never allow the cursor to move @@ -6328,7 +6175,6 @@ A jump table for the options with a short description can be found at |Q_op|. ":g" and ":s". Not used for "*", "#", "gd", tag search, etc. After "*" and "#" you can make 'smartcase' used by doing a "/" command, recalling the search pattern from history and hitting <Enter>. - NOTE: This option is reset when 'compatible' is set. *'smartindent'* *'si'* *'nosmartindent'* *'nosi'* 'smartindent' 'si' boolean (default off) @@ -6355,8 +6201,7 @@ A jump table for the options with a short description can be found at |Q_op|. mapping: ":inoremap # X^H#", where ^H is entered with CTRL-V CTRL-H. When using the ">>" command, lines starting with '#' are not shifted right. - NOTE: 'smartindent' is reset when 'compatible' is set. When 'paste' - is set smart indenting is disabled. + NOTE: When 'paste' is set smart indenting is disabled. *'smarttab'* *'sta'* *'nosmarttab'* *'nosta'* 'smarttab' 'sta' boolean (default off) @@ -6372,7 +6217,6 @@ A jump table for the options with a short description can be found at |Q_op|. What gets inserted (a <Tab> or spaces) depends on the 'expandtab' option. Also see |ins-expandtab|. When 'expandtab' is not set, the number of spaces is minimized by using <Tab>s. - NOTE: This option is reset when 'compatible' is set. *'softtabstop'* *'sts'* 'softtabstop' 'sts' number (default 0) @@ -6391,7 +6235,6 @@ A jump table for the options with a short description can be found at |Q_op|. spaces is minimized by using <Tab>s. The 'L' flag in 'cpoptions' changes how tabs are used when 'list' is set. - NOTE: This option is set to 0 when 'compatible' is set. *'spell'* *'nospell'* 'spell' boolean (default off) @@ -6585,7 +6428,6 @@ A jump table for the options with a short description can be found at |Q_op|. only has a line number, e.g., ":25" or ":+". In case of buffer changing commands the cursor is placed at the column where it was the last time the buffer was edited. - NOTE: This option is set when 'compatible' is set. *'statusline'* *'stl'* *E540* *E542* 'statusline' 'stl' string (default empty) @@ -6998,8 +6840,6 @@ A jump table for the options with a short description can be found at |Q_op|. {not in Vi} If on and using a tags file in another directory, file names in that tags file are relative to the directory where the tags file is. - NOTE: This option is set to the Vi default value when 'compatible' is - set and to the Vim default value when 'compatible' is reset. *'tags'* *'tag'* *E433* 'tags' 'tag' string (default "./tags,tags", when compiled with @@ -7124,7 +6964,6 @@ A jump table for the options with a short description can be found at |Q_op|. 'textwidth' is zero, 'wrapmargin' may be used. See also 'formatoptions' and |ins-textwidth|. When 'formatexpr' is set it will be used to break the line. - NOTE: This option is set to 0 when 'compatible' is set. *'thesaurus'* *'tsr'* 'thesaurus' 'tsr' string (default "") @@ -7150,7 +6989,6 @@ A jump table for the options with a short description can be found at |Q_op|. global {not in Vi} When on: The tilde command "~" behaves like an operator. - NOTE: This option is reset when 'compatible' is set. *'timeout'* *'to'* *'notimeout'* *'noto'* 'timeout' 'to' boolean (default on) @@ -7184,8 +7022,6 @@ A jump table for the options with a short description can be found at |Q_op|. sequences not timing out in 1 second, set the 'ttimeout' option and reset the 'timeout' option. - NOTE: 'ttimeout' is reset when 'compatible' is set. - *'timeoutlen'* *'tm'* 'timeoutlen' 'tm' number (default 1000) global @@ -7361,16 +7197,7 @@ A jump table for the options with a short description can be found at |Q_op|. xterm entries...). *'ttyfast'* *'tf'* *'nottyfast'* *'notf'* -'ttyfast' 'tf' boolean (default on) - global - {not in Vi} - Indicates a fast terminal connection. More characters will be sent to - the screen for redrawing, instead of using insert/delete line - commands. Improves smoothness of redrawing when there are multiple - windows and the terminal does not support a scrolling region. - Also enables the extra writing of characters at the end of each screen - line for lines that wrap. This helps when using copy/paste with the - mouse in an xterm and other terminals. +'ttyfast' 'tf' Removed. {Nvim} *'ttymouse'* *'ttym'* 'ttymouse' 'ttym' string (default depends on 'term') @@ -7611,9 +7438,10 @@ A jump table for the options with a short description can be found at |Q_op|. but the Windows version of Vim can source unix format scripts. *'viminfo'* *'vi'* *E526* *E527* *E528* -'viminfo' 'vi' string (Vi default: "", Vim default for MS-DOS, - Windows: '100,<50,s10,h,rA:,rB:, - for others: '100,<50,s10,h) +'viminfo' 'vi' string (Vim default for + Win32: '100,<50,s10,h,rA:,rB: + others: '100,<50,s10,h + Vi default: "") global {not in Vi} {not available when compiled without the |+viminfo| @@ -7811,8 +7639,6 @@ A jump table for the options with a short description can be found at |Q_op|. When 'l' is included and it is used after an operator at the end of a line then it will not move to the next line. This makes "dl", "cl", "yl" etc. work normally. - NOTE: This option is set to the Vi default value when 'compatible' is - set and to the Vim default value when 'compatible' is reset. *'wildchar'* *'wc'* 'wildchar' 'wc' number (Vim default: <Tab>, Vi default: CTRL-E) @@ -7825,8 +7651,7 @@ A jump table for the options with a short description can be found at |Q_op|. 'wildcharm' for that. Although 'wc' is a number option, you can set it to a special key: > :set wc=<Esc> -< NOTE: This option is set to the Vi default value when 'compatible' is - set and to the Vim default value when 'compatible' is reset. +< *'wildcharm'* *'wcm'* 'wildcharm' 'wcm' number (default: none (0)) @@ -8161,8 +7986,6 @@ A jump table for the options with a short description can be found at |Q_op|. fail (and make sure not to exit Vim until the write was successful). See |backup-table| for another explanation. When the 'backupskip' pattern matches, a backup is not made anyway. - NOTE: This option is set to the default value when 'compatible' is - set. *'writedelay'* *'wd'* 'writedelay' 'wd' number (default 0) diff --git a/runtime/doc/os_unix.txt b/runtime/doc/os_unix.txt index 49f19c6661..73e955e834 100644 --- a/runtime/doc/os_unix.txt +++ b/runtime/doc/os_unix.txt @@ -30,8 +30,7 @@ can be changed at compile time. Because terminal updating under Unix is often slow (e.g. serial line terminal, shell window in suntools), the 'showcmd' and 'ruler' options -are default off. If you have a fast terminal, try setting them on. You might -also want to set 'ttyfast'. +are off by default. When using Vim in an xterm the mouse clicks can be used by Vim by setting 'mouse' to "a". If there is access to an X-server gui style copy/paste will diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index 5cde4685fc..3b3214456b 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -911,7 +911,6 @@ Short explanation of each option: *option-list* 'ttimeout' time out on mappings 'ttimeoutlen' 'ttm' time out time for key codes in milliseconds 'ttybuiltin' 'tbi' use built-in termcap before external termcap -'ttyfast' 'tf' indicates a fast terminal connection 'ttymouse' 'ttym' type of mouse codes generated 'ttyscroll' 'tsl' maximum number of lines for a scroll 'ttytype' 'tty' alias for 'term' @@ -1134,7 +1133,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) diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index 65533cab66..78d7b5477f 100644 --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -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. diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index 502d122a7c..39cb522002 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -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. @@ -988,10 +984,10 @@ vimrc file. These commands will write ":map" and ":set" commands to a file, in such a way that when these commands are executed, the current key mappings and options will be set to the same values. The options 'columns', 'endofline', -'fileformat', 'lines', 'modified', 'scroll', 'term', 'ttyfast' and 'ttymouse' -are not included, because these are terminal or file dependent. Note that the -options 'binary', 'paste' and 'readonly' are included, this might not always -be what you want. +'fileformat', 'lines', 'modified', 'scroll', 'term', and 'ttymouse' are not +included, because these are terminal or file dependent. Note that the options +'binary', 'paste' and 'readonly' are included, this might not always be what +you want. When special keys are used in mappings, The 'cpoptions' option will be temporarily set to its Vim default, to avoid the mappings to be diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 1841f83214..c1f7e06f0e 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -4761,6 +4761,9 @@ DiffChange diff mode: Changed line |diff.txt| DiffDelete diff mode: Deleted line |diff.txt| *hl-DiffText* DiffText diff mode: Changed text within a changed line |diff.txt| + *hl-EndOfBuffer* +EndOfBuffer filler lines (~) after the end of the buffer. + By default, this is highlighted like |hl-NonText|. *hl-ErrorMsg* ErrorMsg error messages on the command line *hl-VertSplit* @@ -4789,10 +4792,10 @@ ModeMsg 'showmode' message (e.g., "-- INSERT --") *hl-MoreMsg* MoreMsg |more-prompt| *hl-NonText* -NonText '~' and '@' at the end of the window, characters from - 'showbreak' and other characters that do not really exist in - the text (e.g., ">" displayed when a double-wide character - doesn't fit at the end of the line). +NonText '@' at the end of the window, characters from 'showbreak' + and other characters that do not really exist in the text + (e.g., ">" displayed when a double-wide character doesn't + fit at the end of the line). See also |hl-EndOfBuffer|. *hl-Normal* Normal normal text *hl-Pmenu* diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt index ea272031d6..49eb429319 100644 --- a/runtime/doc/term.txt +++ b/runtime/doc/term.txt @@ -537,11 +537,6 @@ If the characters from the terminal are arriving with more than 1 second between them you might want to set the 'timeout' and/or 'ttimeout' option. See the "Options" chapter |options|. -If your terminal does not support a scrolling region, but it does support -insert/delete line commands, scrolling with multiple windows may make the -lines jump up and down. If you don't want this set the 'ttyfast' option. -This will redraw the window instead of scroll it. - If your terminal scrolls very slowly, but redrawing is not slow, set the 'ttyscroll' option to a small number, e.g., 3. This will make Vim redraw the screen instead of scrolling, when there are more than 3 lines to be scrolled. diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index bfe67c2757..6f35118fa8 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -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 diff --git a/runtime/doc/usr_08.txt b/runtime/doc/usr_08.txt index ef26b46eb7..d1f3fbd49d 100644 --- a/runtime/doc/usr_08.txt +++ b/runtime/doc/usr_08.txt @@ -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 this command 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 diff --git a/runtime/doc/usr_11.txt b/runtime/doc/usr_11.txt index ec404f3301..2a810af6c2 100644 --- a/runtime/doc/usr_11.txt +++ b/runtime/doc/usr_11.txt @@ -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 # diff --git a/runtime/doc/usr_28.txt b/runtime/doc/usr_28.txt index 46db1b90af..d29b384437 100644 --- a/runtime/doc/usr_28.txt +++ b/runtime/doc/usr_28.txt @@ -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| option does this for you. Example: > :setlocal diff foldmethod=diff scrollbind nowrap foldlevel=1 diff --git a/runtime/doc/usr_90.txt b/runtime/doc/usr_90.txt index 3579e1f430..4be0e93718 100644 --- a/runtime/doc/usr_90.txt +++ b/runtime/doc/usr_90.txt @@ -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 diff --git a/runtime/doc/usr_toc.txt b/runtime/doc/usr_toc.txt index 9e4bf5ca93..2a72e6ea86 100644 --- a/runtime/doc/usr_toc.txt +++ b/runtime/doc/usr_toc.txt @@ -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 diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index 2e61079805..ced0c24434 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -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 diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt index 9ce94696e4..b4e621e516 100644 --- a/runtime/doc/vi_diff.txt +++ b/runtime/doc/vi_diff.txt @@ -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. |