diff options
63 files changed, 631 insertions, 1338 deletions
diff --git a/runtime/doc/arabic.txt b/runtime/doc/arabic.txt index 2f0be512e7..08d1b722a2 100644 --- a/runtime/doc/arabic.txt +++ b/runtime/doc/arabic.txt @@ -6,8 +6,6 @@ Arabic Language support (options & mappings) for Vim *Arabic* -{Vi does not have any of these commands} - *E800* In order to use right-to-left and Arabic mapping support, it is necessary to compile VIM with the |+arabic| feature. diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index f771c225f4..9224151cee 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -20,9 +20,6 @@ For a basic explanation, see section |40.3| in the user manual. 10. Using autocommands |autocmd-use| 11. Disabling autocommands |autocmd-disable| -{Vi does not have any of these commands} -{only when the |+autocmd| feature has not been disabled at compile time} - ============================================================================== 1. Introduction *autocmd-intro* diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index 2453cd2caf..9a67361915 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -33,7 +33,7 @@ For inserting text see |insert.txt|. The <Del> key does not take a [count]. Instead, it deletes the last character of the count. See |'whichwrap'| for deleting a line break (join - lines). {Vi does not support <Del>} + lines). *X* *dh* ["x]X Delete [count] characters before the cursor [into @@ -58,7 +58,7 @@ For inserting text see |insert.txt|. {Visual}["x]x or *v_x* *v_d* *v_<Del>* {Visual}["x]d or {Visual}["x]<Del> Delete the highlighted text [into register x] (for - {Visual} see |Visual-mode|). {not in Vi} + {Visual} see |Visual-mode|). {Visual}["x]CTRL-H or *v_CTRL-H* *v_<BS>* {Visual}["x]<BS> When in Select mode: Delete the highlighted text [into @@ -68,7 +68,7 @@ For inserting text see |insert.txt|. {Visual}["x]D Delete the highlighted lines [into register x] (for {Visual} see |Visual-mode|). In Visual block mode, "D" deletes the highlighted text plus all text until - the end of the line. {not in Vi} + the end of the line. *:d* *:de* *:del* *:delete* *:dl* *:dp* :[range]d[elete] [x] Delete [range] lines (default: current line) [into @@ -113,16 +113,15 @@ J Join [count] lines, with a minimum of two lines. *v_J* {Visual}J Join the highlighted lines, with a minimum of two lines. Remove the indent and insert up to two spaces - (see below). {not in Vi} + (see below). *gJ* gJ Join [count] lines, with a minimum of two lines. - Don't insert or remove any spaces. {not in Vi} + Don't insert or remove any spaces. *v_gJ* {Visual}gJ Join the highlighted lines, with a minimum of two - lines. Don't insert or remove any spaces. {not in - Vi} + lines. Don't insert or remove any spaces. *:j* *:join* :[range]j[oin][!] [flags] @@ -131,7 +130,6 @@ gJ Join [count] lines, with a minimum of two lines. If a [range] has equal start and end values, this command does nothing. The default behavior is to join the current line with the line below it. - {not in Vi: !} See |ex-flags| for [flags]. :[range]j[oin][!] {count} [flags] @@ -139,7 +137,6 @@ gJ Join [count] lines, with a minimum of two lines. current line |cmdline-ranges|). Same as "J", except with [!] the join does not insert or delete any spaces. - {not in Vi: !} See |ex-flags| for [flags]. These commands delete the <EOL> between lines. This has the effect of joining @@ -208,8 +205,7 @@ gR Enter Virtual Replace mode: Each character you type {Visual}["x]c or *v_c* *v_s* {Visual}["x]s Delete the highlighted text [into register x] and - start insert (for {Visual} see |Visual-mode|). {not - in Vi} + start insert (for {Visual} see |Visual-mode|). *v_r* {Visual}["x]r{char} Replace all selected characters by {char}. @@ -217,14 +213,14 @@ gR Enter Virtual Replace mode: Each character you type *v_C* {Visual}["x]C Delete the highlighted lines [into register x] and start insert. In Visual block mode it works - differently |v_b_C|. {not in Vi} + differently |v_b_C|. *v_S* {Visual}["x]S Delete the highlighted lines [into register x] and - start insert (for {Visual} see |Visual-mode|). {not - in Vi} + start insert (for {Visual} see |Visual-mode|). + *v_R* {Visual}["x]R Currently just like {Visual}["x]S. In a next version - it might work differently. {not in Vi} + it might work differently. Notes: - You can end Insert and Replace mode with <Esc>. @@ -269,8 +265,6 @@ r{char} Replace the character under the cursor with {char}. If {char} is a <CR> or <NL>, a line break replaces the character. To replace with a real <CR>, use CTRL-V <CR>. CTRL-V <NL> replaces with a <Nul>. - {Vi: CTRL-V <CR> still replaces with a line break, - cannot replace something with a <CR>} If {char} is CTRL-E or CTRL-Y the character from the line below or above is used, just like with |i_CTRL-E| @@ -313,28 +307,26 @@ The following commands change the case of letters. The currently active *~* ~ 'notildeop' option: Switch case of the character under the cursor and move the cursor to the right. - If a [count] is given, do that many characters. {Vi: - no count} + If a [count] is given, do that many characters. -~{motion} 'tildeop' option: switch case of {motion} text. {Vi: - tilde cannot be used as an operator} +~{motion} 'tildeop' option: switch case of {motion} text. *g~* -g~{motion} Switch case of {motion} text. {not in Vi} +g~{motion} Switch case of {motion} text. g~g~ *g~g~* *g~~* -g~~ Switch case of current line. {not in Vi}. +g~~ Switch case of current line. *v_~* {Visual}~ Switch case of highlighted text (for {Visual} see - |Visual-mode|). {not in Vi} + |Visual-mode|). *v_U* {Visual}U Make highlighted text uppercase (for {Visual} see - |Visual-mode|). {not in Vi} + |Visual-mode|). *gU* *uppercase* -gU{motion} Make {motion} text uppercase. {not in Vi} +gU{motion} Make {motion} text uppercase. Example: > :map! <C-F> <Esc>gUiw`]a < This works in Insert mode: press CTRL-F to make the @@ -343,27 +335,27 @@ gU{motion} Make {motion} text uppercase. {not in Vi} gUgU *gUgU* *gUU* -gUU Make current line uppercase. {not in Vi}. +gUU Make current line uppercase. *v_u* {Visual}u Make highlighted text lowercase (for {Visual} see - |Visual-mode|). {not in Vi} + |Visual-mode|). *gu* *lowercase* -gu{motion} Make {motion} text lowercase. {not in Vi} +gu{motion} Make {motion} text lowercase. gugu *gugu* *guu* -guu Make current line lowercase. {not in Vi}. +guu Make current line lowercase. *g?* *rot13* -g?{motion} Rot13 encode {motion} text. {not in Vi} +g?{motion} Rot13 encode {motion} text. *v_g?* {Visual}g? Rot13 encode the highlighted text (for {Visual} see - |Visual-mode|). {not in Vi} + |Visual-mode|). g?g? *g?g?* *g??* -g?? Rot13 encode current line. {not in Vi}. +g?? Rot13 encode current line. To turn one line into title caps, make every first letter of a word uppercase: > @@ -373,11 +365,11 @@ uppercase: > Adding and subtracting ~ *CTRL-A* CTRL-A Add [count] to the number or alphabetic character at - or after the cursor. {not in Vi} + or after the cursor. *CTRL-X* CTRL-X Subtract [count] from the number or alphabetic - character at or after the cursor. {not in Vi} + character at or after the cursor. The CTRL-A and CTRL-X commands work for (signed) decimal numbers, unsigned octal and hexadecimal numbers and alphabetic characters. This depends on the @@ -428,8 +420,7 @@ SHIFTING LINES LEFT OR RIGHT *shift-left-right* *v_<* {Visual}[count]< Shift the highlighted lines [count] 'shiftwidth' - leftwards (for {Visual} see |Visual-mode|). {not in - Vi} + leftwards (for {Visual} see |Visual-mode|). *>* >{motion} Shift {motion} lines one 'shiftwidth' rightwards. @@ -439,8 +430,7 @@ SHIFTING LINES LEFT OR RIGHT *shift-left-right* *v_>* {Visual}[count]> Shift the highlighted lines [count] 'shiftwidth' - rightwards (for {Visual} see |Visual-mode|). {not in - Vi} + rightwards (for {Visual} see |Visual-mode|). *:<* :[range]< Shift [range] lines one 'shiftwidth' left. Repeat '<' @@ -451,7 +441,7 @@ SHIFTING LINES LEFT OR RIGHT *shift-left-right* Repeat '<' for shifting multiple 'shiftwidth's. :[range]le[ft] [indent] left align lines in [range]. Sets the indent in the - lines to [indent] (default 0). {not in Vi} + lines to [indent] (default 0). *:>* :[range]> [flags] Shift {count} [range] lines one 'shiftwidth' right. @@ -517,7 +507,6 @@ with ".". Vim does not recognize a comment (starting with '"') after the *v_!* {Visual}!{filter} Filter the highlighted lines through the external program {filter} (for {Visual} see |Visual-mode|). - {not in Vi} :{range}![!]{filter} [!][arg] *:range!* Filter {range} lines through the external program @@ -551,7 +540,6 @@ with ".". Vim does not recognize a comment (starting with '"') after the *v_=* {Visual}= Filter the highlighted lines like with ={motion}. - {not in Vi} *tempfile* *setuid* @@ -612,15 +600,13 @@ g& Synonym for `:%s//~/&` (repeat last substitute with For example, when you first do a substitution with `:s/pattern/repl/flags` and then `/search` for something else, `g&` will do `:%s/search/repl/flags`. - Mnemonic: global substitute. {not in Vi} + Mnemonic: global substitute. *:snomagic* *:sno* :[range]sno[magic] ... Same as `:substitute`, but always use 'nomagic'. - {not in Vi} *:smagic* *:sm* :[range]sm[agic] ... Same as `:substitute`, but always use 'magic'. - {not in Vi} *:s_flags* The flags that you can use for the substitute commands: @@ -630,7 +616,6 @@ The flags that you can use for the substitute commands: :&& :s/this/that/& < Note that `:s` and `:&` don't keep the flags. - {not in Vi} [c] Confirm each substitution. Vim highlights the matching string (with |hl-IncSearch|). You can type: *:s_c* @@ -638,13 +623,10 @@ The flags that you can use for the substitute commands: 'l' to substitute this match and then quit ("last") 'n' to skip this match <Esc> to quit substituting - 'a' to substitute this and all remaining matches {not in Vi} - 'q' to quit substituting {not in Vi} - CTRL-E to scroll the screen up {not in Vi, not available when - compiled without the |+insert_expand| feature} - CTRL-Y to scroll the screen down {not in Vi, not available when - compiled without the |+insert_expand| feature} - {not in Vi: highlighting of the match, other responses than 'y' or 'n'} + 'a' to substitute this and all remaining matches + 'q' to quit substituting + CTRL-E to scroll the screen up + CTRL-Y to scroll the screen down [e] When the search pattern fails, do not issue an error message and, in particular, continue in maps as if no error occurred. This is most @@ -655,7 +637,6 @@ The flags that you can use for the substitute commands: No previous substitute regular expression Trailing characters Interrupted - {not in Vi} [g] Replace all occurrences in the line. Without this argument, replacement occurs only for the first occurrence in each line. If the @@ -664,11 +645,9 @@ The flags that you can use for the substitute commands: [i] Ignore case for the pattern. The 'ignorecase' and 'smartcase' options are not used. - {not in Vi} [I] Don't ignore case for the pattern. The 'ignorecase' and 'smartcase' options are not used. - {not in Vi} [n] Report the number of matches, do not actually substitute. The [c] flag is ignored. The matches are reported as if 'report' is zero. @@ -698,7 +677,6 @@ The flags that you can use for the substitute commands: /green :& < The last command will replace "blue" with "red". - {not in Vi} Note that there is no flag to change the "magicness" of the pattern. A different command is used instead, or you can use |/\v| and friends. The @@ -889,7 +867,6 @@ This replaces each 'E' character with a euro sign. Read more in |<Char->|. this (that's a good habit anyway). `:retab!` may also change a sequence of spaces by <Tab> characters, which can mess up a printf(). - {not in Vi} Not available when |+ex_extra| feature was disabled at compile time. @@ -915,17 +892,16 @@ inside of strings can change! Also see 'softtabstop' option. > :reg[isters] Display the contents of all numbered and named registers. If a register is written to for |:redir| it will not be listed. - {not in Vi} :reg[isters] {arg} Display the contents of the numbered and named registers that are mentioned in {arg}. For example: > :dis 1a < to display registers '1' and 'a'. Spaces are allowed - in {arg}. {not in Vi} + in {arg}. *:di* *:display* -:di[splay] [arg] Same as :registers. {not in Vi} +:di[splay] [arg] Same as :registers. *y* *yank* ["x]y{motion} Yank {motion} text [into register x]. When no @@ -944,11 +920,11 @@ inside of strings can change! Also see 'softtabstop' option. > *v_y* {Visual}["x]y Yank the highlighted text [into register x] (for - {Visual} see |Visual-mode|). {not in Vi} + {Visual} see |Visual-mode|). *v_Y* {Visual}["x]Y Yank the highlighted lines [into register x] (for - {Visual} see |Visual-mode|). {not in Vi} + {Visual} see |Visual-mode|). *:y* *:yank* *E850* :[range]y[ank] [x] Yank [range] lines [into register x]. Yanking to the @@ -962,11 +938,11 @@ inside of strings can change! Also see 'softtabstop' option. > *p* *put* *E353* ["x]p Put the text [from register x] after the cursor - [count] times. {Vi: no count} + [count] times. *P* ["x]P Put the text [from register x] before the cursor - [count] times. {Vi: no count} + [count] times. *<MiddleMouse>* ["x]<MiddleMouse> Put the text from a register before the cursor [count] @@ -975,7 +951,6 @@ inside of strings can change! Also see 'softtabstop' option. > Leaves the cursor at the end of the new text. Using the mouse only works when 'mouse' contains 'n' or 'a'. - {not in Vi} If you have a scrollwheel and often accidentally paste text, you can use these mappings to disable the pasting with the middle mouse button: > @@ -986,11 +961,11 @@ inside of strings can change! Also see 'softtabstop' option. > *gp* ["x]gp Just like "p", but leave the cursor just after the new - text. {not in Vi} + text. *gP* ["x]gP Just like "P", but leave the cursor just after the new - text. {not in Vi} + text. *:pu* *:put* :[line]pu[t] [x] Put the text [from register x] after [line] (default @@ -1018,14 +993,14 @@ inside of strings can change! Also see 'softtabstop' option. > ["x]]p or *]p* *]<MiddleMouse>* ["x]]<MiddleMouse> Like "p", but adjust the indent to the current line. Using the mouse only works when 'mouse' contains 'n' - or 'a'. {not in Vi} + or 'a'. ["x][P or *[P* ["x]]P or *]P* ["x][p or *[p* *[<MiddleMouse>* ["x][<MiddleMouse> Like "P", but adjust the indent to the current line. Using the mouse only works when 'mouse' contains 'n' - or 'a'. {not in Vi} + or 'a'. You can use these commands to copy text from one place to another. Do this by first getting the text into a register with a yank, delete or change @@ -1110,7 +1085,6 @@ Vim uses the contents of the unnamed register for any put command (p or P) which does not specify a register. Additionally you can access it with the name '"'. This means you have to type two double quotes. Writing to the "" register writes to register "0. -{Vi: register contents are lost when changing files, no '"'} 2. Numbered registers "0 to "9 *quote_number* *quote0* *quote1* *quote2* *quote3* *quote4* *quote9* @@ -1128,13 +1102,10 @@ plugin. With each successive deletion or change, Vim shifts the previous contents of register 1 into register 2, 2 into 3, and so forth, losing the previous contents of register 9. -{Vi: numbered register contents are lost when changing files; register 0 does -not exist} 3. Small delete register "- *quote_-* *quote-* This register contains text from commands that delete less than one line, except when the command specifies a register with ["x]. -{not in Vi} 4. Named registers "a to "z or "A to "Z *quote_alpha* *quotea* Vim fills these registers only when you say so. Specify them as lowercase @@ -1144,7 +1115,7 @@ a line break is inserted before the appended text. 5. Read-only registers ":, "., "% and "# These are '%', '#', ':' and '.'. You can use them only with the "p", "P", -and ":put" commands and with CTRL-R. {not in Vi} +and ":put" commands and with CTRL-R. *quote_.* *quote.* *E29* ". Contains the last inserted text (the same as what is inserted with the insert mode commands CTRL-A and CTRL-@). Note: this @@ -1183,13 +1154,13 @@ an error message (use string() to convert). If the "= register is used for the "p" command, the String is split up at <NL> characters. If the String ends in a <NL>, it is regarded as a linewise -register. {not in Vi} +register. 7. Selection and drop registers "*, "+ and "~ Use these registers for storing and retrieving the selected text for the GUI. See |quotestar| and |quoteplus|. When the clipboard is not available or not working, the unnamed register is used instead. For Unix systems the clipboard -is only available when the |+xterm_clipboard| feature is present. {not in Vi} +is only available when the |+xterm_clipboard| feature is present. Note that there is only a distinction between "* and "+ for X11 systems. For an explanation of the difference, see |x11-selection|. Under MS-Windows, use @@ -1200,7 +1171,7 @@ The read-only "~ register stores the dropped text from the last drag'n'drop operation. When something has been dropped onto Vim, the "~ register is filled in and the <Drop> pseudo key is sent for notification. You can remap this key if you want; the default action (for all modes) is to insert the -contents of the "~ register at the cursor position. {not in Vi} +contents of the "~ register at the cursor position. {only available when compiled with the |+dnd| feature, currently only with the GTK GUI} @@ -1210,7 +1181,7 @@ Drag'n'drop of URI lists is handled internally. 8. Black hole register "_ *quote_* When writing to this register, nothing happens. This can be used to delete text without affecting the normal registers. When reading from this register, -nothing is returned. {not in Vi} +nothing is returned. 9. Last search pattern register "/ *quote_/* *quote/* Contains the most recent search-pattern. This is used for "n" and 'hlsearch'. @@ -1219,7 +1190,6 @@ other matches without actually searching. You can't yank or delete into this register. The search direction is available in |v:searchforward|. Note that the valued is restored when returning from a function |function-search-undo|. -{not in Vi} *@/* You can write to a register with a `:let` command |:let-@|. Example: > @@ -1250,21 +1220,19 @@ The next three commands always work on whole lines. :[range]ce[nter] [width] *:ce* *:center* Center lines in [range] between [width] columns (default 'textwidth' or 80 when 'textwidth' is 0). - {not in Vi} Not available when |+ex_extra| feature was disabled at compile time. :[range]ri[ght] [width] *:ri* *:right* Right-align lines in [range] at [width] columns (default 'textwidth' or 80 when 'textwidth' is 0). - {not in Vi} Not available when |+ex_extra| feature was disabled at compile time. *:le* *:left* :[range]le[ft] [indent] Left-align lines in [range]. Sets the indent in the - lines to [indent] (default 0). {not in Vi} + lines to [indent] (default 0). Not available when |+ex_extra| feature was disabled at compile time. @@ -1293,24 +1261,24 @@ gq{motion} Format the lines that {motion} moves over. gqgq *gqgq* *gqq* gqq Format the current line. With a count format that - many lines. {not in Vi} + many lines. *v_gq* {Visual}gq Format the highlighted text. (for {Visual} see - |Visual-mode|). {not in Vi} + |Visual-mode|). *gw* gw{motion} Format the lines that {motion} moves over. Similar to |gq| but puts the cursor back at the same position in the text. However, 'formatprg' and 'formatexpr' are - not used. {not in Vi} + not used. gwgw *gwgw* *gww* -gww Format the current line as with "gw". {not in Vi} +gww Format the current line as with "gw". *v_gw* {Visual}gw Format the highlighted text as with "gw". (for - {Visual} see |Visual-mode|). {not in Vi} + {Visual} see |Visual-mode|). Example: To format the current paragraph use: *gqap* > gqap diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index 2b0edc235c..88d0c31f96 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -27,7 +27,6 @@ Basic command line editing is explained in chapter 20 of the user manual Normally characters are inserted in front of the cursor position. You can move around in the command-line with the left and right cursor keys. With the <Insert> key, you can toggle between inserting and overstriking characters. -{Vi: can only alter the last character in the line} Note that if your keyboard does not have working cursor keys or any of the other special keys, you can use ":cnoremap" to define another key for them. @@ -66,8 +65,6 @@ Notes: - All searches are put in the search history, including the ones that come from commands like "*" and "#". But for a mapping, only the last search is remembered (to avoid that long mappings trash the history). -{Vi: no history} -{not available when compiled without the |+cmdline_hist| feature} There is an automatic completion of names on the command-line; see |cmdline-completion|. @@ -117,12 +114,12 @@ CTRL-U Remove all characters between the cursor position and :cnoremap <C-U> <C-E><C-U> < *c_<Insert>* *c_Insert* -<Insert> Toggle between insert and overstrike. {not in Vi} +<Insert> Toggle between insert and overstrike. {char1} <BS> {char2} or *c_digraph* CTRL-K {char1} {char2} *c_CTRL-K* enter digraph (see |digraphs|). When {char1} is a special - key, the code for that key is inserted in <> form. {not in Vi} + key, the code for that key is inserted in <> form. CTRL-R {0-9a-z"%#:-=.} *c_CTRL-R* *c_<C-R>* Insert the contents of a numbered or named register. Between @@ -158,7 +155,7 @@ CTRL-R {0-9a-z"%#:-=.} *c_CTRL-R* *c_<C-R>* too. When the result is a Float it's automatically converted to a String. - See |registers| about registers. {not in Vi} + See |registers| about registers. Implementation detail: When using the |expression| register and invoking setcmdpos(), this sets the position before inserting the resulting string. Use CTRL-R CTRL-R to set the @@ -179,10 +176,6 @@ CTRL-R CTRL-A *c_CTRL-R_CTRL-A* *c_<C-R>_<C-A>* currently displayed match is used. With CTRL-W the part of the word that was already typed is not inserted again. - {not in Vi} - CTRL-F and CTRL-P: {only when |+file_in_path| feature is - included} - *c_CTRL-R_CTRL-R* *c_<C-R>_<C-R>* *c_CTRL-R_CTRL-O* *c_<C-R>_<C-O>* CTRL-R CTRL-R {0-9a-z"%#:-=. CTRL-F CTRL-P CTRL-W CTRL-A} @@ -303,11 +296,9 @@ CTRL-^ Toggle the use of language |:lmap| mappings and/or Input off, since you are expected to type a command. After switching it on with CTRL-^, the new state is not used again for the next command or Search pattern. - {not in Vi} *c_CTRL-]* -CTRL-] Trigger abbreviation, without inserting a character. {not in - Vi} +CTRL-] Trigger abbreviation, without inserting a character. For Emacs-style editing on the command-line see |emacs-keys|. @@ -322,7 +313,6 @@ terminals) *:his* *:history* :his[tory] Print the history of last entered commands. - {not in Vi} {not available when compiled without the |+cmdline_hist| feature} @@ -334,7 +324,6 @@ terminals) i[nput] or @ input line history d[ebug] or > debug command history a[ll] all of the above - {not in Vi} If the numbers {first} and/or {last} are given, the respective range of entries from a history is listed. These numbers can diff --git a/runtime/doc/debugger.txt b/runtime/doc/debugger.txt index 206eab5b85..7806419d4e 100644 --- a/runtime/doc/debugger.txt +++ b/runtime/doc/debugger.txt @@ -10,8 +10,6 @@ Debugger Support Features *debugger-support* 2. Vim Compile Options |debugger-compilation| 3. Integrated Debuggers |debugger-integration| -{Vi does not have any of these features} - ============================================================================== 1. Debugger Features *debugger-features* diff --git a/runtime/doc/digraph.txt b/runtime/doc/digraph.txt index 2be73da5b9..84024fd1b3 100644 --- a/runtime/doc/digraph.txt +++ b/runtime/doc/digraph.txt @@ -18,8 +18,6 @@ An alternative is using the 'keymap' option. 2. Using digraphs |digraphs-use| 3. Default digraphs |digraphs-default| -{Vi does not have any of these commands} - ============================================================================== 1. Defining digraphs *digraphs-define* diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index 7c7628cd78..ed0a4e56fa 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -44,14 +44,14 @@ An alternate file name is remembered for each window. :keepalt {cmd} Execute {cmd} while keeping the current alternate file name. Note that commands invoked indirectly (e.g., with a function) may still set the alternate file - name. {not in Vi} + name. All file names are remembered in the buffer list. When you enter a file name, for editing (e.g., with ":e filename") or writing (e.g., with ":w filename"), the file name is added to the list. You can use the buffer list to remember which files you edited and to quickly switch from one file to another (e.g., to copy text) with the |CTRL-^| command. First type the number of the file -and then hit CTRL-^. {Vi: only one alternate file name is remembered} +and then hit CTRL-^. CTRL-G or *CTRL-G* *:f* *:fi* *:file* @@ -60,14 +60,13 @@ CTRL-G or *CTRL-G* *:f* *:fi* *:file* option is set), and the file status (readonly, modified, read errors, new file). See the 'shortmess' option about how to make this message shorter. - {Vi does not include column number} :f[ile]! like |:file|, but don't truncate the name even when 'shortmess' indicates this. {count}CTRL-G Like CTRL-G, but prints the current file name with full path. If the count is higher than 1 the current - buffer number is also given. {not in Vi} + buffer number is also given. *g_CTRL-G* *word-count* *byte-count* g CTRL-G Prints the current position of the cursor in five @@ -78,7 +77,7 @@ g CTRL-G Prints the current position of the cursor in five than one position on the screen (<Tab> or special character), both the "real" column and the screen column are shown, separated with a dash. - See also 'ruler' option. {not in Vi} + See also 'ruler' option. *v_g_CTRL-G* {Visual}g CTRL-G Similar to "g CTRL-G", but Word, Character, Line, and @@ -86,7 +85,6 @@ g CTRL-G Prints the current position of the cursor in five displayed. In Blockwise mode, Column count is also shown. (For {Visual} see |Visual-mode|.) - {not in VI} *:file_f* :f[ile][!] {name} Sets the current file name to {name}. The optional ! @@ -96,14 +94,12 @@ g CTRL-G Prints the current position of the cursor in five to hold the old name. *:0file* :0f[ile][!] Remove the name of the current buffer. The optional ! - avoids truncating the message, as with |:file|. {not - in Vi} + avoids truncating the message, as with |:file|. :buffers :files :ls List all the currently known file names. See - 'windows.txt' |:files| |:buffers| |:ls|. {not in - Vi} + 'windows.txt' |:files| |:buffers| |:ls|. Vim will remember the full path name of a file name that you enter. In most cases when the file name is displayed only the name you typed is shown, but @@ -185,7 +181,6 @@ If you want to keep the changed buffer without saving it, switch on the buffer and 'autowriteall' isn't set or the file can't be written. Also see |++opt| and |+cmd|. - {Vi: no ++opt} *:edit!* *discard* :e[dit]! [++opt] [+cmd] @@ -193,7 +188,6 @@ If you want to keep the changed buffer without saving it, switch on the the current buffer. This is useful if you want to start all over again. Also see |++opt| and |+cmd|. - {Vi: no ++opt} *:edit_f* :e[dit] [++opt] [+cmd] {file} @@ -202,14 +196,12 @@ If you want to keep the changed buffer without saving it, switch on the buffer, unless 'hidden' is set or 'autowriteall' is set and the file can be written. Also see |++opt| and |+cmd|. - {Vi: no ++opt} *:edit!_f* :e[dit]! [++opt] [+cmd] {file} Edit {file} always. Discard any changes to the current buffer. Also see |++opt| and |+cmd|. - {Vi: no ++opt} :e[dit] [++opt] [+cmd] #[count] Edit the [count]th buffer (as shown by |:files|). @@ -217,7 +209,6 @@ If you want to keep the changed buffer without saving it, switch on the #" doesn't work if the alternate buffer doesn't have a file name, while CTRL-^ still works then. Also see |++opt| and |+cmd|. - {Vi: no ++opt} *:ene* *:enew* :ene[w] Edit a new, unnamed buffer. This fails when changes @@ -227,19 +218,15 @@ If you want to keep the changed buffer without saving it, switch on the If 'fileformats' is not empty, the first format given will be used for the new buffer. If 'fileformats' is empty, the 'fileformat' of the current buffer is used. - {not in Vi} *:ene!* *:enew!* :ene[w]! Edit a new, unnamed buffer. Discard any changes to the current buffer. Set 'fileformat' like |:enew|. - {not in Vi} *:fin* *:find* :fin[d][!] [++opt] [+cmd] {file} Find {file} in 'path' and then |:edit| it. - {not in Vi} {not available when the |+file_in_path| - feature was disabled at compile time} :{count}fin[d][!] [++opt] [+cmd] {file} Just like ":find", but use the {count} match in @@ -261,7 +248,7 @@ If you want to keep the changed buffer without saving it, switch on the :vie[w][!] [++opt] [+cmd] file When used in Ex mode: Leave |Ex mode|, go back to Normal mode. Otherwise same as |:edit|, but set - 'readonly' option for this buffer. {not in Vi} + 'readonly' option for this buffer. *CTRL-^* *CTRL-6* CTRL-^ Edit the alternate file. Mostly the alternate file is @@ -280,7 +267,6 @@ CTRL-^ Edit the alternate file. Mostly the alternate file is ":e #[count]"). This is a quick way to switch between files. See |CTRL-^| above for further details. - {not in Vi} [count]]f *]f* *[f* [count][f Same as "gf". Deprecated. @@ -313,9 +299,6 @@ CTRL-^ Edit the alternate file. Mostly the alternate file is For Unix the '~' character is expanded, like in "~user/file". Environment variables are expanded too |expand-env|. - {not in Vi} - {not available when the |+file_in_path| feature was - disabled at compile time} *v_gf* {Visual}[count]gf Same as "gf", but the highlighted text is used as the @@ -323,7 +306,6 @@ CTRL-^ Edit the alternate file. Mostly the alternate file is Leading blanks are skipped, otherwise all blanks and special characters are included in the file name. (For {Visual} see |Visual-mode|.) - {not in VI} *gF* [count]gF Same as "gf", except if a number follows the file @@ -567,14 +549,12 @@ list of the current window. the first one. This fails when changes have been made and Vim does not want to |abandon| the current buffer. Also see |++opt| and |+cmd|. - {Vi: no ++opt} :ar[gs]! [++opt] [+cmd] {arglist} *:args_f!* Define {arglist} as the new argument list and edit the first one. Discard any changes to the current buffer. Also see |++opt| and |+cmd|. - {Vi: no ++opt} :[count]arge[dit][!] [++opt] [+cmd] {name} *:arge* *:argedit* Add {name} to the argument list and edit it. @@ -587,7 +567,6 @@ list of the current window. [!] is required if the current file cannot be |abandon|ed. Also see |++opt| and |+cmd|. - {not in Vi} :[count]arga[dd] {name} .. *:arga* *:argadd* *E479* Add the {name}s to the argument list. @@ -604,8 +583,6 @@ list of the current window. There is no check for duplicates, it is possible to add a file to the argument list twice. The currently edited file is not changed. - {not in Vi} {not available when compiled without the - |+listcmds| feature} Note: you can also use this method: > :args ## x < This will add the "x" item and sort the new list. @@ -619,16 +596,12 @@ list of the current window. when it's deleted from the argument list. Example: > :argdel *.obj -< {not in Vi} {not available when compiled without the - |+listcmds| feature} :{range}argd[elete] Delete the {range} files from the argument list. When the last number in the range is too high, up to the last argument is deleted. Example: > :10,1000argdel < Deletes arguments 10 and further, keeping 1-9. - {not in Vi} {not available when compiled without the - |+listcmds| feature} *:argu* *:argument* :[count]argu[ment] [count] [++opt] [+cmd] @@ -637,27 +610,21 @@ list of the current window. when changes have been made and Vim does not want to |abandon| the current buffer. Also see |++opt| and |+cmd|. - {not in Vi} {not available when compiled without the - |+listcmds| feature} :[count]argu[ment]! [count] [++opt] [+cmd] Edit file [count] in the argument list, discard any changes to the current buffer. When [count] is omitted the current entry is used. Also see |++opt| and |+cmd|. - {not in Vi} {not available when compiled without the - |+listcmds| feature} :[count]n[ext] [++opt] [+cmd] *:n* *:ne* *:next* *E165* *E163* Edit [count] next file. This fails when changes have been made and Vim does not want to |abandon| the - current buffer. Also see |++opt| and |+cmd|. {Vi: no - count or ++opt}. + current buffer. Also see |++opt| and |+cmd|. :[count]n[ext]! [++opt] [+cmd] Edit [count] next file, discard any changes to the - buffer. Also see |++opt| and |+cmd|. {Vi: no count - or ++opt}. + buffer. Also see |++opt| and |+cmd|. :n[ext] [++opt] [+cmd] {arglist} *:next_f* Same as |:args_f|. @@ -669,65 +636,63 @@ list of the current window. Edit [count] previous file in argument list. This fails when changes have been made and Vim does not want to |abandon| the current buffer. - Also see |++opt| and |+cmd|. {Vi: no count or ++opt}. + Also see |++opt| and |+cmd|. :[count]N[ext]! [count] [++opt] [+cmd] Edit [count] previous file in argument list. Discard any changes to the buffer. Also see |++opt| and - |+cmd|. {Vi: no count or ++opt}. + |+cmd|. :[count]prev[ious] [count] [++opt] [+cmd] *:prev* *:previous* - Same as :Next. Also see |++opt| and |+cmd|. {Vi: - only in some versions} + Same as :Next. Also see |++opt| and |+cmd|. *:rew* *:rewind* :rew[ind] [++opt] [+cmd] Start editing the first file in the argument list. This fails when changes have been made and Vim does not want to |abandon| the current buffer. - Also see |++opt| and |+cmd|. {Vi: no ++opt} + Also see |++opt| and |+cmd|. :rew[ind]! [++opt] [+cmd] Start editing the first file in the argument list. Discard any changes to the buffer. Also see |++opt| - and |+cmd|. {Vi: no ++opt} + and |+cmd|. *:fir* *:first* :fir[st][!] [++opt] [+cmd] - Other name for ":rewind". {not in Vi} + Other name for ":rewind". *:la* *:last* :la[st] [++opt] [+cmd] Start editing the last file in the argument list. This fails when changes have been made and Vim does not want to |abandon| the current buffer. - Also see |++opt| and |+cmd|. {not in Vi} + Also see |++opt| and |+cmd|. :la[st]! [++opt] [+cmd] Start editing the last file in the argument list. Discard any changes to the buffer. Also see |++opt| - and |+cmd|. {not in Vi} + and |+cmd|. *:wn* *:wnext* :[count]wn[ext] [++opt] Write current file and start editing the [count] - next file. Also see |++opt| and |+cmd|. {not in Vi} + next file. Also see |++opt| and |+cmd|. :[count]wn[ext] [++opt] {file} Write current file to {file} and start editing the [count] next file, unless {file} already exists and the 'writeany' option is off. Also see |++opt| and - |+cmd|. {not in Vi} + |+cmd|. :[count]wn[ext]! [++opt] {file} Write current file to {file} and start editing the - [count] next file. Also see |++opt| and |+cmd|. {not - in Vi} + [count] next file. Also see |++opt| and |+cmd|. :[count]wN[ext][!] [++opt] [file] *:wN* *:wNext* :[count]wp[revious][!] [++opt] [file] *:wp* *:wprevious* Same as :wnext, but go to previous file instead of - next. {not in Vi} + next. The [count] in the commands above defaults to one. For some commands it is possible to use two counts. The last one (rightmost one) is used. @@ -768,9 +733,6 @@ fourth file in the argument list. This happens when you do ":e file". LOCAL ARGUMENT LIST -{not in Vi} -{not available when compiled without the |+windows| or |+listcmds| features} - *:arglocal* :argl[ocal] Make a local copy of the global argument list. Doesn't start editing another file. @@ -821,8 +783,6 @@ USING THE ARGUMENT LIST autocommand event is disabled by adding it to 'eventignore'. This considerably speeds up editing each file. - {not in Vi} {not available when compiled without the - |+listcmds| feature} Also see |:windo|, |:tabdo| and |:bufdo|. Example: > @@ -910,24 +870,22 @@ used, for example, when the write fails and you want to try again later with When 'filetype' is empty filetype detection is done with the new name, before the file is written. When the write was successful 'readonly' is reset. - {not in Vi} *:up* *:update* :[range]up[date][!] [++opt] [>>] [file] Like ":write", but only write when the buffer has been - modified. {not in Vi} + modified. WRITING WITH MULTIPLE BUFFERS *buffer-write* *:wa* *:wall* :wa[ll] Write all changed buffers. Buffers without a file - name or which are readonly are not written. {not in - Vi} + name or which are readonly are not written. :wa[ll]! Write all changed buffers, even the ones that are readonly. Buffers without a file name are not - written. {not in Vi} + written. Vim will warn you if you try to overwrite a file that has been changed @@ -1056,14 +1014,14 @@ The names can be in upper- or lowercase. :conf[irm] q[uit] Quit, but give prompt when changes have been made, or the last file in the argument list has not been - edited. See |:confirm| and 'confirm'. {not in Vi} + edited. See |:confirm| and 'confirm'. :q[uit]! Quit without writing, also when visible buffers have changes. Does not exit when there are changed hidden buffers. Use ":qall!" to exit always. :cq[uit] Quit always, without writing, and return an error - code. See |:cq|. {not in Vi} + code. See |:cq|. *:wq* :wq [++opt] Write the current file and quit. Writing fails when @@ -1101,7 +1059,6 @@ ZZ Write current file, if modified, and quit (same as *ZQ* ZQ Quit without checking for changes (same as ":q!"). - {not in Vi} MULTIPLE WINDOWS AND BUFFERS *window-exit* @@ -1109,35 +1066,34 @@ MULTIPLE WINDOWS AND BUFFERS *window-exit* :qa[ll] Exit Vim, unless there are some buffers which have been changed. (Use ":bmod" to go to the next modified buffer). When 'autowriteall' is set all changed buffers will be - written, like |:wqall|. {not in Vi} + written, like |:wqall|. :conf[irm] qa[ll] Exit Vim. Bring up a prompt when some buffers have been - changed. See |:confirm|. {not in Vi} + changed. See |:confirm|. -:qa[ll]! Exit Vim. Any changes to buffers are lost. {not in Vi} +:qa[ll]! Exit Vim. Any changes to buffers are lost. Also see |:cquit|, it does the same but exits with a non-zero value. *:quita* *:quitall* -:quita[ll][!] Same as ":qall". {not in Vi} +:quita[ll][!] Same as ":qall". :wqa[ll] [++opt] *:wqa* *:wqall* *:xa* *:xall* :xa[ll] Write all changed buffers and exit Vim. If there are buffers without a file name, which are readonly or which cannot be - written for another reason, Vim will not quit. {not in Vi} + written for another reason, Vim will not quit. :conf[irm] wqa[ll] [++opt] :conf[irm] xa[ll] Write all changed buffers and exit Vim. Bring up a prompt when some buffers are readonly or cannot be written for - another reason. See |:confirm|. {not in Vi} + another reason. See |:confirm|. :wqa[ll]! [++opt] :xa[ll]! Write all changed buffers, even the ones that are readonly, and exit Vim. If there are buffers without a file name or which cannot be written for another reason, Vim will not quit. - {not in Vi} ============================================================================== 6. Dialogs *edit-dialogs* @@ -1260,7 +1216,7 @@ present in 'cpoptions' and "!" is not used in the command. < *:cd-* *E186* :cd[!] - Change to the previous current directory (before the - previous ":cd {path}" command). {not in Vi} + previous ":cd {path}" command). *:chd* *:chdir* :chd[ir][!] [path] Same as |:cd|. @@ -1268,13 +1224,13 @@ present in 'cpoptions' and "!" is not used in the command. *:lc* *:lcd* :lc[d][!] {path} Like |:cd|, but only set the current directory for the current window. The current directory for other - windows is not changed. {not in Vi} + windows is not changed. *:lch* *:lchdir* -:lch[dir][!] Same as |:lcd|. {not in Vi} +:lch[dir][!] Same as |:lcd|. *:pw* *:pwd* *E187* -:pw[d] Print the current directory name. {Vi: no pwd} +:pw[d] Print the current directory name. Also see |getcwd()|. So long as no |:lcd| command has been used, all windows share the same current @@ -1323,8 +1279,7 @@ There are a few things to remember when editing binary files: file. Otherwise both <CR> <NL> and <NL> are considered to end a line and when the file is written the <NL> will be replaced with <CR> <NL>. - <Nul> characters are shown on the screen as ^@. You can enter them with - "CTRL-V CTRL-@" or "CTRL-V 000" {Vi cannot handle <Nul> characters in the - file} + "CTRL-V CTRL-@" or "CTRL-V 000". - To insert a <NL> character in the file split up a line. When writing the buffer to a file a <NL> will be written for the <EOL>. - Vim normally appends an <EOL> at the end of the file if there is none. diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 349805a267..3865175a1f 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -30,8 +30,6 @@ done, the features in this document are not available. See |+eval| and 11. The sandbox |eval-sandbox| 12. Textlock |textlock| -{Vi does not have any of these commands} - ============================================================================== 1. Variables *variables* @@ -4033,7 +4031,7 @@ jobsend({job}, {data}) {Nvim} *jobsend()* jobstart({cmd}[, {opts}]) {Nvim} *jobstart()* Spawns {cmd} as a job. If {cmd} is a |List|, it will be run - directly. If {cmd} is a |String|, it will be equivalent to > + directly. If {cmd} is a |string|, it will be equivalent to > :call jobstart([&shell, &shellcmdflag, '{cmd}']) < If passed, {opts} must be a dictionary with any of the following keys: @@ -6156,7 +6154,7 @@ synstack({lnum}, {col}) *synstack()* valid positions. system({cmd} [, {input}]) *system()* *E677* - Get the output of the shell command {cmd} as a |String|. {cmd} + Get the output of the shell command {cmd} as a |string|. {cmd} will be run the same as in |jobstart()|. See |systemlist()| to get the output as a |List|. diff --git a/runtime/doc/farsi.txt b/runtime/doc/farsi.txt index 77ec419d1f..c086738e2e 100644 --- a/runtime/doc/farsi.txt +++ b/runtime/doc/farsi.txt @@ -6,8 +6,6 @@ Right to Left and Farsi Mapping for Vim *farsi* *Farsi* -{Vi does not have any of these commands} - *E27* In order to use right-to-left and Farsi mapping support, it is necessary to compile Vim with the |+farsi| feature. diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt index 5df868044f..33d551d507 100644 --- a/runtime/doc/filetype.txt +++ b/runtime/doc/filetype.txt @@ -12,8 +12,6 @@ Filetypes *filetype* *file-type* Also see |autocmd.txt|. -{Vi does not have any of these commands} - ============================================================================== 1. Filetypes *filetypes* *file-types* diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt index 6ae2ff8682..ef69835462 100644 --- a/runtime/doc/fold.txt +++ b/runtime/doc/fold.txt @@ -14,9 +14,6 @@ You can find an introduction on folding in chapter 28 of the user manual. 3. Fold options |fold-options| 4. Behavior of folds |fold-behavior| -{Vi has no Folding} -{not available when compiled without the |+folding| feature} - ============================================================================== 1. Fold methods *fold-methods* diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt index 94b5309fd6..ba88ee242c 100644 --- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -18,8 +18,6 @@ Other GUI documentation: |gui_x11.txt| For specific items of the X11 GUI. |gui_w32.txt| For specific items of the Win32 GUI. -{Vi does not have any of these commands} - ============================================================================== 1. Starting the GUI *gui-start* *E229* *E233* diff --git a/runtime/doc/gui_w32.txt b/runtime/doc/gui_w32.txt index fbe3f35e74..de1b963314 100644 --- a/runtime/doc/gui_w32.txt +++ b/runtime/doc/gui_w32.txt @@ -19,8 +19,6 @@ Other relevant documentation: |gui.txt| For generic items of the GUI. |os_win32.txt| For Win32 specific items. -{Vi does not have a Windows GUI} - ============================================================================== 1. Starting the GUI *gui-w32-start* @@ -454,7 +452,7 @@ be opened as normal. See |drag-n-drop|. *:simalt* *:si* :sim[alt] {key} simulate pressing {key} while holding Alt pressed. - {not in Vi} {only for Win32 versions} + {only for Win32 versions} Normally, Vim takes control of all Alt-<Key> combinations, to increase the number of possible mappings. This clashes with the standard use of Alt as the diff --git a/runtime/doc/gui_x11.txt b/runtime/doc/gui_x11.txt index 22a88c9f1e..a0fc8624bf 100644 --- a/runtime/doc/gui_x11.txt +++ b/runtime/doc/gui_x11.txt @@ -19,8 +19,6 @@ Vim's Graphical User Interface *gui-x11* *GUI-X11* Other relevant documentation: |gui.txt| For generic items of the GUI. -{Vi does not have any of these commands} - ============================================================================== 1. Starting the X11 GUI *gui-x11-start* *E665* diff --git a/runtime/doc/hebrew.txt b/runtime/doc/hebrew.txt index b36c968d02..7bc8f02e7f 100644 --- a/runtime/doc/hebrew.txt +++ b/runtime/doc/hebrew.txt @@ -10,11 +10,6 @@ The supporting 'rightleft' functionality was originally created by Avner Lottem. <alottem at gmail dot com> Ron Aaron <ron at ronware dot org> is currently helping support these features. -{Vi does not have any of these commands} - -All this is only available when the |+rightleft| feature was enabled at -compile time. - Introduction ------------ diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt index 74971076b4..5267ef852b 100644 --- a/runtime/doc/helphelp.txt +++ b/runtime/doc/helphelp.txt @@ -24,7 +24,6 @@ Help on help files *helphelp* the very top. The 'helplang' option is used to select a language, if the main help file is available in several languages. - {not in Vi} *{subject}* *E149* *E661* :h[elp] {subject} Like ":help", additionally jump to the tag {subject}. @@ -90,7 +89,7 @@ Help on help files *helphelp* command from a following command. You need to type CTRL-V first to insert the <LF> or <CR>. Example: > :help so<C-V><CR>only -< {not in Vi} +< :h[elp]! [subject] Like ":help", but in non-English help files prefer to find a tag in a file with the same language as the @@ -126,7 +125,6 @@ Help on help files *helphelp* |:execute| when needed. Compressed help files will not be searched (Fedora compresses the help files). - {not in Vi} *:lh* *:lhelpgrep* :lh[elpgrep] {pattern}[@xx] @@ -139,11 +137,11 @@ Help on help files *helphelp* *:exu* *:exusage* :exu[sage] Show help on Ex commands. Added to simulate the Nvi - command. {not in Vi} + command. *:viu* *:viusage* :viu[sage] Show help on Normal mode commands. Added to simulate - the Nvi command. {not in Vi} + the Nvi command. When no argument is given to |:help| the file given with the 'helpfile' option will be opened. Otherwise the specified tag is searched for in all "doc/tags" @@ -191,7 +189,6 @@ command: > Only for backwards compatibility. It now executes the ToolBar.FindHelp menu entry instead of using a builtin dialog. {only when compiled with |+GUI_GTK|} - {not in Vi} *:helpt* *:helptags* *E154* *E150* *E151* *E152* *E153* *E670* @@ -211,7 +208,7 @@ command: > To rebuild the help tags in the runtime directory (requires write permission there): > :helptags $VIMRUNTIME/doc -< {not in Vi} +< ============================================================================== diff --git a/runtime/doc/if_cscop.txt b/runtime/doc/if_cscop.txt index d8dc48f066..5f13d4d176 100644 --- a/runtime/doc/if_cscop.txt +++ b/runtime/doc/if_cscop.txt @@ -21,7 +21,6 @@ functions as you normally would with |tags|. 7. Availability & Information |cscope-info| This is currently for Unix and Win32 only. -{Vi does not have any of these commands} ============================================================================== 1. Cscope introduction *cscope-intro* diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt index c2d169283f..f6bd365299 100644 --- a/runtime/doc/if_pyth.txt +++ b/runtime/doc/if_pyth.txt @@ -14,16 +14,9 @@ The Python Interface to Vim *python* *Python* 6. Tab page objects |python-tabpage| 7. vim.bindeval objects |python-bindeval-objects| 8. pyeval(), py3eval() Vim functions |python-pyeval| -9. Dynamic loading |python-dynamic| -10. Python 3 |python3| +9. Python 3 |python3| -{Vi does not have any of these commands} - -The Python 2.x interface is available only when Vim was compiled with the -|+python| feature. -The Python 3 interface is available only when Vim was compiled with the -|+python3| feature. -Both can be available at the same time, but read |python-2-and-3|. +See |nvim-python| for more information. {Nvim} ============================================================================== 1. Commands *python-commands* @@ -38,9 +31,8 @@ Both can be available at the same time, but read |python-2-and-3|. {script} {endmarker} Execute Python script {script}. - Note: This command doesn't work when the Python - feature wasn't compiled in. To avoid errors, see - |script-here|. + Note: This command doesn't work when Python isn't + available. To avoid errors, see |script-here|. {endmarker} must NOT be preceded by any white space. If {endmarker} is omitted from after the "<<", a dot '.' must be used after {script}, like @@ -69,7 +61,6 @@ and "EOF" do not have any indent. None. If a string is returned, it becomes the text of the line in the current turn. The default for [range] is the whole file: "1,$". - {not in Vi} Examples: > @@ -79,7 +70,7 @@ Examples: *:pyfile* *:pyf* :[range]pyf[ile] {file} Execute the Python script in {file}. The whole - argument is used as a single file name. {not in Vi} + argument is used as a single file name. Both of these commands do essentially the same thing - they execute a piece of Python code, with the "current range" |python-range| set to the given line @@ -700,24 +691,7 @@ To facilitate bi-directional interface, you can use |pyeval()| and |py3eval()| functions to evaluate Python expressions and pass their values to VimL. ============================================================================== -9. Dynamic loading *python-dynamic* - -On MS-Windows the Python library can be loaded dynamically. The |:version| -output then includes |+python/dyn|. - -This means that Vim will search for the Python DLL file only when needed. -When you don't use the Python interface you don't need it, thus you can use -Vim without this DLL file. - -To use the Python interface the Python DLL must be in your search path. In a -console window type "path" to see what directories are used. - -The name of the DLL must match the Python version Vim was compiled with. -Currently the name is "python24.dll". That is for Python 2.4. To know for -sure edit "gvim.exe" and search for "python\d*.dll\c". - -============================================================================== -10. Python 3 *python3* +9. Python 3 *python3* *:py3* *:python3* The `:py3` and `:python3` commands work similar to `:python`. A simple check @@ -728,47 +702,10 @@ The `:py3file` command works similar to `:pyfile`. *:py3do* *E863* The `:py3do` command works similar to `:pydo`. - -Vim can be built in four ways (:version output): -1. No Python support (-python, -python3) -2. Python 2 support only (+python or +python/dyn, -python3) -3. Python 3 support only (-python, +python3 or +python3/dyn) -4. Python 2 and 3 support (+python/dyn, +python3/dyn) - -Some more details on the special case 4: *python-2-and-3* - -When Python 2 and Python 3 are both supported they must be loaded dynamically. - -When doing this on Linux/Unix systems and importing global symbols, this leads -to a crash when the second Python version is used. So either global symbols -are loaded but only one Python version is activated, or no global symbols are -loaded. The latter makes Python's "import" fail on libraries that expect the -symbols to be provided by Vim. - *E836* *E837* -Vim's configuration script makes a guess for all libraries based on one -standard Python library (termios). If importing this library succeeds for -both Python versions, then both will be made available in Vim at the same -time. If not, only the version first used in a session will be enabled. -When trying to use the other one you will get the E836 or E837 error message. - -Here Vim's behavior depends on the system in which it was configured. In a -system where both versions of Python were configured with --enable-shared, -both versions of Python will be activated at the same time. There will still -be problems with other third party libraries that were not linked to -libPython. - -To work around such problems there are these options: -1. The problematic library is recompiled to link to the according - libpython.so. -2. Vim is recompiled for only one Python version. -3. You undefine PY_NO_RTLD_GLOBAL in auto/config.h after configuration. This - may crash Vim though. - *E880* Raising SystemExit exception in python isn't endorsed way to quit vim, use: > :py vim.command("qall!") < - *has-python* You can test what Python version is available with: > if has('python') @@ -777,10 +714,8 @@ You can test what Python version is available with: > echo 'there is Python 3.x' endif -Note however, that when Python 2 and 3 are both available and loaded -dynamically, these has() calls will try to load them. If only one can be -loaded at a time, just checking if Python 2 or 3 are available will prevent -the other one from being available. +Note however, that if Python 2 and 3 are both available, but not loaded, +these has() calls will try to load them. ============================================================================== vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index 9f63a5657c..df1c5c92cb 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -59,10 +59,10 @@ CTRL-C Quit insert mode, go back to Normal mode. Do not check for event. *i_CTRL-@* -CTRL-@ Insert previously inserted text and stop insert. {Vi: only - when typed as first char, only up to 128 chars} +CTRL-@ Insert previously inserted text and stop insert. + *i_CTRL-A* -CTRL-A Insert previously inserted text. {not in Vi} +CTRL-A Insert previously inserted text. *i_CTRL-H* *i_<BS>* *i_BS* <BS> or CTRL-H Delete the character before the cursor (see |i_backspacing| @@ -96,10 +96,10 @@ CTRL-K {char1} [char2] key, the code for that key is inserted in <> form. For example, the string "<S-Space>" can be entered by typing <C-K><S-Space> (two keys). Neither char is considered for - mapping. {not in Vi} + mapping. -CTRL-N Find next keyword (see |i_CTRL-N|). {not in Vi} -CTRL-P Find previous keyword (see |i_CTRL-P|). {not in Vi} +CTRL-N Find next keyword (see |i_CTRL-N|). +CTRL-P Find previous keyword (see |i_CTRL-P|). CTRL-R {0-9a-z"%#*+:.-=} *i_CTRL-R* Insert the contents of a register. Between typing CTRL-R and @@ -136,7 +136,7 @@ CTRL-R {0-9a-z"%#*+:.-=} *i_CTRL-R* converted to a String. When append() or setline() is invoked the undo sequence will be broken. - See |registers| about registers. {not in Vi} + See |registers| about registers. CTRL-R CTRL-R {0-9a-z"%#*+/:.-=} *i_CTRL-R_CTRL-R* Insert the contents of a register. Works like using a single @@ -148,7 +148,7 @@ CTRL-R CTRL-R {0-9a-z"%#*+/:.-=} *i_CTRL-R_CTRL-R* < Options 'textwidth', 'formatoptions', etc. still apply. If you also want to avoid these, use "<C-R><C-O>r", see below. The '.' register (last inserted text) is still inserted as - typed. {not in Vi} + typed. CTRL-R CTRL-O {0-9a-z"%#*+/:.-=} *i_CTRL-R_CTRL-O* Insert the contents of a register literally and don't @@ -156,31 +156,29 @@ CTRL-R CTRL-O {0-9a-z"%#*+/:.-=} *i_CTRL-R_CTRL-O* |<MiddleMouse>|. Does not replace characters! The '.' register (last inserted text) is still inserted as - typed. {not in Vi} + typed. CTRL-R CTRL-P {0-9a-z"%#*+/:.-=} *i_CTRL-R_CTRL-P* Insert the contents of a register literally and fix the indent, like |[<MiddleMouse>|. Does not replace characters! The '.' register (last inserted text) is still inserted as - typed. {not in Vi} + typed. *i_CTRL-T* CTRL-T Insert one shiftwidth of indent at the start of the current - line. The indent is always rounded to a 'shiftwidth' (this is - vi compatible). {Vi: only when in indent} + line. The indent is always rounded to a 'shiftwidth'. *i_CTRL-D* CTRL-D Delete one shiftwidth of indent at the start of the current - line. The indent is always rounded to a 'shiftwidth' (this is - vi compatible). {Vi: CTRL-D works only when used after - autoindent} + line. The indent is always rounded to a 'shiftwidth'. + *i_0_CTRL-D* -0 CTRL-D Delete all indent in the current line. {Vi: CTRL-D works - only when used after autoindent} +0 CTRL-D Delete all indent in the current line. + *i_^_CTRL-D* ^ CTRL-D Delete all indent in the current line. The indent is restored in the next line. This is useful when inserting a - label. {Vi: CTRL-D works only when used after autoindent} + label. *i_CTRL-V* CTRL-V Insert next non-digit literally. For special keys, the @@ -188,7 +186,7 @@ CTRL-V Insert next non-digit literally. For special keys, the decimal, octal or hexadecimal value of a character |i_CTRL-V_digit|. The characters typed right after CTRL-V are not considered for - mapping. {Vi: no decimal byte entry} + mapping. Note: When CTRL-V is mapped (e.g., to paste text) you can often use CTRL-Q instead |i_CTRL-Q|. @@ -199,12 +197,12 @@ CTRL-Q Same as CTRL-V. CTRL-X Enter CTRL-X mode. This is a sub-mode where commands can be given to complete words or scroll the window. See - |i_CTRL-X| and |ins-completion|. {not in Vi} + |i_CTRL-X| and |ins-completion|. *i_CTRL-E* -CTRL-E Insert the character which is below the cursor. {not in Vi} +CTRL-E Insert the character which is below the cursor. *i_CTRL-Y* -CTRL-Y Insert the character which is above the cursor. {not in Vi} +CTRL-Y Insert the character which is above the cursor. Note that for CTRL-E and CTRL-Y 'textwidth' is not used, to be able to copy characters from a long line. @@ -221,8 +219,6 @@ CTRL-_ Switch between languages, as follows: is set. Please refer to |rileft.txt| for more information about right-to-left mode. - {not in Vi} - Only if compiled with the |+rightleft| feature. *i_CTRL-^* CTRL-^ Toggle the use of typing language characters. @@ -241,14 +237,12 @@ CTRL-^ Toggle the use of typing language characters. The language mappings are normally used to type characters that are different from what the keyboard produces. The 'keymap' option can be used to install a whole number of them. - {not in Vi} *i_CTRL-]* -CTRL-] Trigger abbreviation, without inserting a character. {not in - Vi} +CTRL-] Trigger abbreviation, without inserting a character. *i_<Insert>* -<Insert> Toggle between Insert and Replace mode. {not in Vi} +<Insert> Toggle between Insert and Replace mode. ----------------------------------------------------------------------- *i_backspacing* @@ -270,7 +264,6 @@ For backwards compatibility the values "0", "1" and "2" are also allowed, see If the 'backspace' option does contain "eol" and the cursor is in column 1 when one of the three keys is used, the current line is joined with the previous line. This effectively deletes the <EOL> in front of the cursor. -{Vi: does not cross lines, does not delete past start position of insert} *i_CTRL-V_digit* With CTRL-V the decimal, octal or hexadecimal value of a character can be @@ -487,15 +480,14 @@ The 'expandtab' option is off by default. Note that in Replace mode, a single character is replaced with several spaces. The result of this is that the number of characters in the line increases. Backspacing will delete one space at a time. The original character will be put back for only one space -that you backspace over (the last one). {Vi does not have the 'expandtab' -option} +that you backspace over (the last one). *ins-smarttab* When the 'smarttab' option is on, a <Tab> inserts 'shiftwidth' positions at the beginning of a line and 'tabstop' positions in other places. This means that often spaces instead of a <Tab> character are inserted. When 'smarttab' is off, a <Tab> always inserts 'tabstop' positions, and 'shiftwidth' is only -used for ">>" and the like. {not in Vi} +used for ">>" and the like. *ins-softtabstop* When the 'softtabstop' option is non-zero, a <Tab> inserts 'softtabstop' @@ -535,14 +527,12 @@ If the 'expandtab' option is on, a <Tab> will replace one character with several spaces. The result of this is that the number of characters in the line increases. Backspacing will delete one space at a time. The original character will be put back for only one space that you backspace over (the -last one). {Vi does not have the 'expandtab' option} +last one). ============================================================================== 6. Virtual Replace mode *vreplace-mode* *Virtual-Replace-mode* Enter Virtual Replace mode with the "gR" command in normal mode. -{not available when compiled without the |+vreplace| feature} -{Vi does not have Virtual Replace mode} Virtual Replace mode is similar to Replace mode, but instead of replacing actual characters in the file, you are replacing screen real estate, so that @@ -1762,7 +1752,7 @@ I Insert text before the first non-blank in the line the last blank. *gI* -gI Insert text in column 1 [count] times. {not in Vi} +gI Insert text in column 1 [count] times. *gi* gi Insert text in the same position as where Insert mode @@ -1773,19 +1763,16 @@ gi Insert text in the same position as where Insert mode but NOT for inserted/deleted characters. When the |:keepjumps| command modifier is used the |'^| mark won't be changed. - {not in Vi} *o* o Begin a new line below the cursor and insert text, - repeat [count] times. {Vi: blank [count] screen - lines} + repeat [count] times. When the '#' flag is in 'cpoptions' the count is ignored. *O* O Begin a new line above the cursor and insert text, - repeat [count] times. {Vi: blank [count] screen - lines} + repeat [count] times. When the '#' flag is in 'cpoptions' the count is ignored. @@ -1840,9 +1827,6 @@ NOTE: These commands cannot be used with |:global| or |:vglobal|. script, the insertion only starts after the function or script is finished. This command does not work from |:normal|. - {not in Vi} - {not available when compiled without the |+ex_extra| - feature} *:stopi* *:stopinsert* :stopi[nsert] Stop Insert mode as soon as possible. Works like @@ -1859,16 +1843,10 @@ NOTE: These commands cannot be used with |:global| or |:vglobal|. Note that when using this command in a function or script that the replacement will only start after the function or script is finished. - {not in Vi} - {not available when compiled without the |+ex_extra| - feature} *:startgreplace* :startg[replace][!] Just like |:startreplace|, but use Virtual Replace mode, like with |gR|. - {not in Vi} - {not available when compiled without the |+ex_extra| - feature} ============================================================================== 10. Inserting a file *inserting-file* diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index 4739f43373..d15f8b3dd3 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -34,10 +34,6 @@ It can be accessed from within Vim with the <Help> or <F1> key and with the is not located in the default place. You can jump to subjects like with tags: Use CTRL-] to jump to a subject under the cursor, use CTRL-T to jump back. -Throughout this manual the differences between Vi and Vim are mentioned in -curly braces, like this: {Vi does not have on-line help}. See |vi_diff.txt| -for a summary of the differences between Vim and Vi. - This manual refers to Vim on various machines. There may be small differences between different computers and terminals. Besides the remarks given in this document, there is a separate document for each supported system, see @@ -630,11 +626,7 @@ Ex :vi -- -- -- -- -- the command. In the last case <Esc> may be the character defined with the 'wildchar' option, in which case it will start command-line completion. You can - ignore that and type <Esc> again. {Vi: when hitting <Esc> the command-line - is executed. This is unexpected for most people; therefore it was changed - in Vim. But when the <Esc> is part of a mapping, the command-line is - executed. If you want the Vi behaviour also when typing <Esc>, use ":cmap - ^V<Esc> ^V^M"} + ignore that and type <Esc> again. *4 Go from Normal to Select mode by: - use the mouse to select text while 'selectmode' contains "mouse" - use a non-printable command to move the cursor while keeping the Shift @@ -683,7 +675,6 @@ gQ Switch to "Ex" mode like with "Q", but really behave like typing ":" commands after another. All command line editing, completion etc. is available. Use the ":vi" command |:visual| to exit "Ex" mode. - {not in Vi} ============================================================================== 7. The window contents *window-contents* @@ -696,7 +687,6 @@ exceptions: character. - When inserting text in one window, other windows on the same text are not updated until the insert is finished. -{Vi: The screen is not always updated on slow terminals} Lines longer than the window width will wrap, unless the 'wrap' option is off (see below). The 'linebreak' option can be set to wrap at a blank character. @@ -742,7 +732,6 @@ If there is a single line that is too long to fit in the window, this is a special situation. Vim will show only part of the line, around where the cursor is. There are no special characters shown, so that you can edit all parts of this line. -{Vi: gives an "internal error" on lines that do not fit in the window} The '@' occasion in the 'highlight' option can be used to set special highlighting for the '@' and '~' characters. This makes it possible to @@ -757,7 +746,7 @@ that is not shown, the screen is scrolled horizontally. The advantage of this method is that columns are shown as they are and lines that cannot fit on the screen can be edited. The disadvantage is that you cannot see all the characters of a line at once. The 'sidescroll' option can be set to the -minimal number of columns to scroll. {Vi: has no 'wrap' option} +minimal number of columns to scroll. All normal ASCII characters are displayed directly on the screen. The <Tab> is replaced with the number of spaces that it represents. Other non-printing @@ -789,16 +778,14 @@ command characters 'showcmd' on off cursor position 'ruler' off off The current mode is "-- INSERT --" or "-- REPLACE --", see |'showmode'|. The -command characters are those that you typed but were not used yet. {Vi: does -not show the characters you typed or the cursor position} +command characters are those that you typed but were not used yet. If you have a slow terminal you can switch off the status messages to speed up editing: :set nosc noru nosm If there is an error, an error message will be shown for at least one second -(in reverse video). {Vi: error messages may be overwritten with other -messages before you have a chance to read them} +(in reverse video). Some commands show how many lines were affected. Above which threshold this happens can be controlled with the 'report' option (default 2). @@ -810,7 +797,7 @@ small not a single line will fit in it. Make it at least 40 characters wide to be able to read most messages on the last line. On most Unix systems, resizing the window is recognized and handled correctly -by Vim. {Vi: not ok} +by Vim. ============================================================================== 8. Definitions *definitions* diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index d4caea198c..699915a86f 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -74,7 +74,7 @@ modes. Map the key sequence {lhs} to {rhs} for the modes where the map command applies. Disallow mapping of {rhs}, to avoid nested and recursive mappings. Often - used to redefine a command. {not in Vi} + used to redefine a command. :unm[ap] {lhs} |mapmode-nvo| *:unm* *:unmap* @@ -106,7 +106,7 @@ modes. :lmapc[lear] |mapmode-l| *:lmapc* *:lmapclear* :cmapc[lear] |mapmode-c| *:cmapc* *:cmapclear* Remove ALL mappings for the modes where the map - command applies. {not in Vi} + command applies. Use the <buffer> argument to remove buffer-local mappings |:map-<buffer>| Warning: This also removes the default mappings. @@ -137,7 +137,6 @@ modes. :cm[ap] {lhs} |mapmode-c| *:cmap_l* List the key mappings for the key sequences starting with {lhs} in the modes where the map command applies. - {not in Vi} These commands are used to map a key or key sequence to a string of characters. You can use this to put command sequences under function keys, @@ -154,7 +153,6 @@ decide if "aa" or "aaa" should be mapped. This means that after typing "aa" that mapping won't get expanded yet, Vim is waiting for another character. If you type a space, then "foo" will get inserted, plus the space. If you type "a", then "bar" will get inserted. -{Vi does not allow ambiguous mappings} 1.2 SPECIAL ARGUMENTS *:map-arguments* @@ -876,8 +874,7 @@ end-id The "end-id" type ends in a keyword character, but all the other Examples: "#i", "..f", "$/7" non-id The "non-id" type ends in a non-keyword character, the other - characters may be of any type, excluding space and tab. {this type - is not supported by Vi} + characters may be of any type, excluding space and tab. Examples: "def#", "4/7$" @@ -995,45 +992,40 @@ See |:verbose-cmd| for more information. *:norea* *:noreabbrev* :norea[bbrev] [<expr>] [<buffer>] [lhs] [rhs] - same as ":ab", but no remapping for this {rhs} {not - in Vi} + same as ":ab", but no remapping for this {rhs} *:ca* *:cabbrev* :ca[bbrev] [<expr>] [<buffer>] [lhs] [rhs] - same as ":ab", but for Command-line mode only. {not - in Vi} + same as ":ab", but for Command-line mode only. *:cuna* *:cunabbrev* -:cuna[bbrev] {lhs} same as ":una", but for Command-line mode only. {not - in Vi} +:cuna[bbrev] {lhs} same as ":una", but for Command-line mode only. *:cnorea* *:cnoreabbrev* :cnorea[bbrev] [<expr>] [<buffer>] [lhs] [rhs] same as ":ab", but for Command-line mode only and no - remapping for this {rhs} {not in Vi} + remapping for this {rhs} *:ia* *:iabbrev* :ia[bbrev] [<expr>] [<buffer>] [lhs] [rhs] - same as ":ab", but for Insert mode only. {not in Vi} + same as ":ab", but for Insert mode only. *:iuna* *:iunabbrev* -:iuna[bbrev] {lhs} same as ":una", but for insert mode only. {not in - Vi} +:iuna[bbrev] {lhs} same as ":una", but for insert mode only. *:inorea* *:inoreabbrev* :inorea[bbrev] [<expr>] [<buffer>] [lhs] [rhs] same as ":ab", but for Insert mode only and no - remapping for this {rhs} {not in Vi} + remapping for this {rhs} *:abc* *:abclear* -:abc[lear] [<buffer>] Remove all abbreviations. {not in Vi} +:abc[lear] [<buffer>] Remove all abbreviations. *:iabc* *:iabclear* -:iabc[lear] [<buffer>] Remove all abbreviations for Insert mode. {not in Vi} +:iabc[lear] [<buffer>] Remove all abbreviations for Insert mode. *:cabc* *:cabclear* -:cabc[lear] [<buffer>] Remove all abbreviations for Command-line mode. {not - in Vi} +:cabc[lear] [<buffer>] Remove all abbreviations for Command-line mode. *using_CTRL-V* It is possible to use special characters in the rhs of an abbreviation. @@ -1126,9 +1118,6 @@ to find out what they are defined to. The |:scriptnames| command can be used to see which scripts have been sourced and what their <SNR> number is. -This is all {not in Vi} and {not available when compiled without the |+eval| -feature}. - ============================================================================== 4. User-defined commands *user-commands* diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt index bd236536c0..b91faba6aa 100644 --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -778,7 +778,6 @@ and the screen is about to be redrawn: like pressing <Space>. This makes it impossible to select text though. -> For the GUI clicking the left mouse button in the last line works like pressing <Space>. -{Vi: only ":" commands are interpreted} If you accidentally hit <Enter> or <Space> and you want to see the displayed text then use |g<|. This only works when 'more' is set. @@ -810,10 +809,10 @@ Type effect ~ G down all the way, until the hit-enter prompt - <BS> or k or <Up> one line back (*) - u up a page (half a screen) (*) - b or <PageUp> back a screen (*) - g back to the start (*) + <BS> or k or <Up> one line back + u up a page (half a screen) + b or <PageUp> back a screen + g back to the start q, <Esc> or CTRL-C stop the listing : stop the listing and enter a @@ -822,13 +821,11 @@ Type effect ~ the clipboard ("* and "+ registers) {menu-entry} what the menu is defined to in Cmdline-mode. - <LeftMouse> (**) next page + <LeftMouse> (*) next page Any other key causes the meaning of the keys to be displayed. -(*) backwards scrolling is {not in Vi}. Only scrolls back to where messages - started to scroll. -(**) Clicking the left mouse button only works: +(*) Clicking the left mouse button only works: - For the GUI: in the last line of the screen. - When 'r' is included in 'mouse' (but then selecting text won't work). diff --git a/runtime/doc/mlang.txt b/runtime/doc/mlang.txt index ac615b48de..8f765b6ce2 100644 --- a/runtime/doc/mlang.txt +++ b/runtime/doc/mlang.txt @@ -17,9 +17,6 @@ The basics are explained in the user manual: |usr_45.txt|. Also see |help-translated| for multi-language help. -{Vi does not have any of these features} -{not available when compiled without the |+multi_lang| feature} - ============================================================================== 1. Messages *multilang-messages* diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt index 2d4f23d443..9219911f68 100644 --- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -182,7 +182,7 @@ l or *l* TEXT column (if possible). Most other commands stay in the same SCREEN column. <Home> works like "1|", which differs from "0" when the line starts with a - <Tab>. {not in Vi} + <Tab>. *^* ^ To the first non-blank character of the line. @@ -199,7 +199,7 @@ $ or <End> To the end of the line. When a count is given also go *g_* g_ To the last non-blank character of the line and - [count - 1] lines downward |inclusive|. {not in Vi} + [count - 1] lines downward |inclusive|. *g0* *g<Home>* g0 or g<Home> When lines wrap ('wrap' on): To the first character of @@ -208,7 +208,7 @@ g0 or g<Home> When lines wrap ('wrap' on): To the first character of When lines don't wrap ('wrap' off): To the leftmost character of the current line that is on the screen. Differs from "0" when the first character of the line - is not on the screen. {not in Vi} + is not on the screen. *g^* g^ When lines wrap ('wrap' on): To the first non-blank @@ -217,12 +217,11 @@ g^ When lines wrap ('wrap' on): To the first non-blank When lines don't wrap ('wrap' off): To the leftmost non-blank character of the current line that is on the screen. Differs from "^" when the first non-blank - character of the line is not on the screen. {not in - Vi} + character of the line is not on the screen. *gm* gm Like "g0", but half a screenwidth to the right (or as - much as possible). {not in Vi} + much as possible). *g$* *g<End>* g$ or g<End> When lines wrap ('wrap' on): To the last character of @@ -237,7 +236,6 @@ g$ or g<End> When lines wrap ('wrap' on): To the last character of instead of going to the end of the line. When 'virtualedit' is enabled moves to the end of the screen line. - {not in Vi} *bar* | To screen column [count] in the current line. @@ -293,12 +291,12 @@ CTRL-N [count] lines downward |linewise|. gk or *gk* *g<Up>* g<Up> [count] display lines upward. |exclusive| motion. Differs from 'k' when lines wrap, and when used with - an operator, because it's not linewise. {not in Vi} + an operator, because it's not linewise. gj or *gj* *g<Down>* g<Down> [count] display lines downward. |exclusive| motion. Differs from 'j' when lines wrap, and when used with - an operator, because it's not linewise. {not in Vi} + an operator, because it's not linewise. *-* - <minus> [count] lines upward, on the first non-blank @@ -321,7 +319,7 @@ G Goto line [count], default last line, on the first *<C-End>* <C-End> Goto line [count], default last line, on the last - character |inclusive|. {not in Vi} + character |inclusive|. <C-Home> or *gg* *<C-Home>* gg Goto line [count], default first line, on the first @@ -339,7 +337,7 @@ gg Goto line [count], default first line, on the first non-blank in the line |linewise|. To compute the new line number this formula is used: ({count} * number-of-lines + 99) / 100 - See also 'startofline' option. {not in Vi} + See also 'startofline' option. :[range]go[to] [count] *:go* *:goto* *go* [count]go Go to [count] byte in the buffer. Default [count] is @@ -349,9 +347,6 @@ gg Goto line [count], default first line, on the first 'fileformat' setting. Also see the |line2byte()| function, and the 'o' option in 'statusline'. - {not in Vi} - {not available when compiled without the - |+byte_offset| feature} These commands move to the specified line. They stop when reaching the first or the last line. The first two commands put the cursor in the same column @@ -511,9 +506,6 @@ including white space, the commands starting with "i" select an "inner" object without white space, or just the white space. Thus the "inner" commands always select less text than the "a" commands. -These commands are {not in Vi}. -These commands are not available when the |+textobjects| feature has been -disabled at compile time. Also see `gn` and `gN`, operating on the last search pattern. *v_aw* *aw* @@ -775,7 +767,7 @@ m< or m> Set the |'<| or |'>| mark. Useful to change what the *'A* *'0* *`A* *`0* '{A-Z0-9} `{A-Z0-9} To the mark {A-Z0-9} in the file where it was set (not - a motion command when in another file). {not in Vi} + a motion command when in another file). *g'* *g'a* *g`* *g`a* g'{mark} g`{mark} @@ -785,18 +777,16 @@ g'{mark} g`{mark} < jumps to the last known position in a file. See $VIMRUNTIME/vimrc_example.vim. Also see |:keepjumps|. - {not in Vi} *:marks* :marks List all the current marks (not a motion command). The |'(|, |')|, |'{| and |'}| marks are not listed. The first column has number zero. - {not in Vi} *E283* :marks {arg} List the marks that are mentioned in {arg} (not a motion command). For example: > :marks aB -< to list marks 'a' and 'B'. {not in Vi} +< to list marks 'a' and 'B'. *:delm* *:delmarks* :delm[arks] {marks} Delete the specified marks. Marks that can be deleted @@ -810,11 +800,10 @@ g'{mark} g`{mark} :delmarks p-z deletes marks in the range p to z :delmarks ^.[] deletes marks ^ . [ ] :delmarks \" deletes mark " -< {not in Vi} +< :delm[arks]! Delete all marks for the current buffer, but not marks A-Z or 0-9. - {not in Vi} A mark is not visible in any way. It is just a position in the file that is remembered. Do not confuse marks with named registers, they are totally @@ -833,12 +822,12 @@ deletes the lines from the cursor position to mark 't'. Hint: Use mark 't' for Top, 'b' for Bottom, etc.. Lowercase marks are restored when using undo and redo. -Uppercase marks 'A to 'Z include the file name. {Vi: no uppercase marks} You -can use them to jump from file to file. You can only use an uppercase mark -with an operator if the mark is in the current file. The line number of the -mark remains correct, even if you insert/delete lines or edit another file for -a moment. When the 'viminfo' option is not empty, uppercase marks are kept in -the .viminfo file. See |viminfo-file-marks|. +Uppercase marks 'A to 'Z include the file name. +You can use them to jump from file to file. You can only use an uppercase +mark with an operator if the mark is in the current file. The line number of +the mark remains correct, even if you insert/delete lines or edit another file +for a moment. When the 'viminfo' option is not empty, uppercase marks are +kept in the .viminfo file. See |viminfo-file-marks|. Numbered marks '0 to '9 are quite different. They can not be set directly. They are only present when using a viminfo file |viminfo-file|. Basically '0 @@ -849,11 +838,11 @@ Numbered mark should be stored. See |viminfo-file-marks|. *'[* *`[* '[ `[ To the first character of the previously changed - or yanked text. {not in Vi} + or yanked text. *']* *`]* '] `] To the last character of the previously changed or - yanked text. {not in Vi} + yanked text. After executing an operator the Cursor is put at the beginning of the text that was operated upon. After a put command ("p" or "P") the cursor is @@ -871,7 +860,7 @@ was made yet in the current file. '< `< To the first line or character of the last selected Visual area in the current buffer. For block mode it may also be the last character in the first line (to - be able to define the block). {not in Vi}. + be able to define the block). *'>* *`>* '> `> To the last line or character of the last selected @@ -879,7 +868,7 @@ was made yet in the current file. may also be the first character of the last line (to be able to define the block). Note that 'selection' applies, the position may be just after the Visual - area. {not in Vi}. + area. *''* *``* '' `` To the position before the latest jump, or where the @@ -895,13 +884,12 @@ was made yet in the current file. Only one position is remembered per buffer, not one for each window. As long as the buffer is visible in a window the position won't be changed. - {not in Vi}. *'^* *`^* '^ `^ To the position where the cursor was the last time when Insert mode was stopped. This is used by the |gi| command. Not set when the |:keepjumps| command - modifier was used. {not in Vi} + modifier was used. *'.* *`.* '. `. To the position where the last change was made. The @@ -910,43 +898,40 @@ was made yet in the current file. then the position can be near the end of what the command changed. For example when inserting a word, the position will be on the last character. - {not in Vi} *'(* *`(* '( `( To the start of the current sentence, like the |(| - command. {not in Vi} + command. *')* *`)* ') `) To the end of the current sentence, like the |)| - command. {not in Vi} + command. *'{* *`{* '{ `{ To the start of the current paragraph, like the |{| - command. {not in Vi} + command. *'}* *`}* '} `} To the end of the current paragraph, like the |}| - command. {not in Vi} + command. These commands are not marks themselves, but jump to a mark: *]'* ]' [count] times to next line with a lowercase mark below the cursor, on the first non-blank character in the - line. {not in Vi} + line. *]`* -]` [count] times to lowercase mark after the cursor. {not - in Vi} +]` [count] times to lowercase mark after the cursor. *['* [' [count] times to previous line with a lowercase mark before the cursor, on the first non-blank character in - the line. {not in Vi} + the line. *[`* [` [count] times to lowercase mark before the cursor. - {not in Vi} :loc[kmarks] {command} *:loc* *:lockmarks* @@ -1022,25 +1007,20 @@ unless the line containing that position was changed or deleted. *CTRL-O* CTRL-O Go to [count] Older cursor position in jump list - (not a motion command). {not in Vi} - {not available without the |+jumplist| feature} + (not a motion command). <Tab> or *CTRL-I* *<Tab>* CTRL-I Go to [count] newer cursor position in jump list (not a motion command). - {not in Vi} - {not available without the |+jumplist| feature} *:ju* *:jumps* -:ju[mps] Print the jump list (not a motion command). {not in - Vi} {not available without the |+jumplist| feature} +:ju[mps] Print the jump list (not a motion command). *jumplist* Jumps are remembered in a jump list. With the CTRL-O and CTRL-I command you can go to cursor positions before older jumps, and back again. Thus you can move up and down the list. There is a separate jump list for each window. The maximum number of entries is fixed at 100. -{not available without the |+jumplist| feature} For example, after three jump commands you have this jump list: @@ -1117,15 +1097,11 @@ g; Go to [count] older position in change list. positions go to the oldest change. If there is no older change an error message is given. (not a motion command) - {not in Vi} - {not available without the |+jumplist| feature} *g,* *E663* g, Go to [count] newer cursor position in change list. Just like |g;| but in the opposite direction. (not a motion command) - {not in Vi} - {not available without the |+jumplist| feature} When using a count you jump as far back or forward as possible. Thus you can use "999g;" to go to the first change for which the position is still @@ -1215,19 +1191,19 @@ remembered. *[(* [( go to [count] previous unmatched '('. - |exclusive| motion. {not in Vi} + |exclusive| motion. *[{* [{ go to [count] previous unmatched '{'. - |exclusive| motion. {not in Vi} + |exclusive| motion. *])* ]) go to [count] next unmatched ')'. - |exclusive| motion. {not in Vi} + |exclusive| motion. *]}* ]} go to [count] next unmatched '}'. - |exclusive| motion. {not in Vi} + |exclusive| motion. The above four commands can be used to go to the start or end of the current code block. It is like doing "%" on the '(', ')', '{' or '}' at the other @@ -1240,25 +1216,25 @@ bring you back to the switch statement. similar structured language). When not before the start of a method, jump to the start or end of the class. When no '{' is found after the cursor, this is - an error. |exclusive| motion. {not in Vi} + an error. |exclusive| motion. *]M* ]M Go to [count] next end of a method (for Java or similar structured language). When not before the end of a method, jump to the start or end of the class. When no '}' is found after the cursor, this is an - error. |exclusive| motion. {not in Vi} + error. |exclusive| motion. *[m* [m Go to [count] previous start of a method (for Java or similar structured language). When not after the start of a method, jump to the start or end of the class. When no '{' is found before the cursor this is - an error. |exclusive| motion. {not in Vi} + an error. |exclusive| motion. *[M* [M Go to [count] previous end of a method (for Java or similar structured language). When not after the end of a method, jump to the start or end of the class. When no '}' is found before the cursor this is - an error. |exclusive| motion. {not in Vi} + an error. |exclusive| motion. The above two commands assume that the file contains a class with methods. The class definition is surrounded in '{' and '}'. Each method in the class @@ -1281,11 +1257,11 @@ Using "3[m" will jump to the start of the class. *[#* [# go to [count] previous unmatched "#if" or "#else". - |exclusive| motion. {not in Vi} + |exclusive| motion. *]#* ]# go to [count] next unmatched "#else" or "#endif". - |exclusive| motion. {not in Vi} + |exclusive| motion. These two commands work in C programs that contain #if/#else/#endif constructs. It brings you to the start or end of the #if/#else/#endif where @@ -1293,11 +1269,11 @@ the current line is included. You can then use "%" to go to the matching line. *[star* *[/* [* or [/ go to [count] previous start of a C comment "/*". - |exclusive| motion. {not in Vi} + |exclusive| motion. *]star* *]/* ]* or ]/ go to [count] next end of a C comment "*/". - |exclusive| motion. {not in Vi} + |exclusive| motion. *H* @@ -1319,6 +1295,6 @@ L To line [count] from bottom of window (default: Last <LeftMouse> Moves to the position on the screen where the mouse click is |exclusive|. See also |<LeftMouse>|. If the position is in a status line, that window is made the - active window and the cursor is not moved. {not in Vi} + active window and the cursor is not moved. vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 23284f5852..65908f910f 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -42,16 +42,16 @@ achieve special effects. These options come in three forms: *:set-!* *:set-inv* :se[t] {option}! or -:se[t] inv{option} Toggle option: Invert value. {not in Vi} +:se[t] inv{option} Toggle option: Invert value. *:set-default* *:set-&* *:set-&vi* *:set-&vim* -: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} +:se[t] {option}& Reset option to its default value. +:se[t] {option}&vi Reset option to its Vi default value. +:se[t] {option}&vim Reset option to its Vim default value. :se[t] all& Set all options, except terminal options, to their default value. The values of 'term', 'lines' and - 'columns' are not changed. {not in Vi} + 'columns' are not changed. *:set-args* *E487* *E521* :se[t] {option}={value} or @@ -78,7 +78,6 @@ achieve special effects. These options come in three forms: are removed. When adding a flag that was already present the option value doesn't change. Also see |:set-args| above. - {not in Vi} :se[t] {option}^={value} *:set^=* Multiply the {value} to a number option, or prepend @@ -86,7 +85,6 @@ achieve special effects. These options come in three forms: comma separated list, a comma is added, unless the value was empty. Also see |:set-args| above. - {not in Vi} :se[t] {option}-={value} *:set-=* Subtract the {value} from a number option, or remove @@ -99,7 +97,6 @@ achieve special effects. These options come in three forms: exactly as they appear in the option. Remove flags one by one to avoid problems. Also see |:set-args| above. - {not in Vi} The {option} arguments to ":set" may be repeated. For example: > :set ai nosi sw=3 ts=3 @@ -293,15 +290,12 @@ wiped out |:bwipe|. before the option name. For a global option the global value is shown (but that might change in the future). - {not in Vi} :setl[ocal] {option}< Set the local value of {option} to its global value by copying the value. - {not in Vi} :se[t] {option}< For |global-local| options: Remove the local value of {option}, so that the global value will be used. - {not in Vi} *:setg* *:setglobal* :setg[lobal] ... Like ":set" but set only the global value for a local @@ -311,7 +305,6 @@ wiped out |:bwipe|. local options. Without argument: display global values for all local options which are different from the default. - {not in Vi} For buffer-local and window-local options: Command global value local value ~ @@ -368,7 +361,6 @@ Setting the filetype < This command is used in a filetype.vim file to avoid setting the 'filetype' option twice, causing different settings and syntax files to be loaded. - {not in Vi} *option-window* *optwin* :bro[wse] se[t] *:set-browse* *:browse-set* *:opt* *:options* @@ -592,7 +584,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'aleph'* *'al'* *aleph* *Aleph* 'aleph' 'al' number (default 128 for MS-DOS, 224 otherwise) global - {not in Vi} {only available when compiled with the |+rightleft| feature} The ASCII code for the first letter of the Hebrew alphabet. The @@ -605,7 +596,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'allowrevins'* *'ari'* *'noallowrevins'* *'noari'* 'allowrevins' 'ari' boolean (default off) global - {not in Vi} {only available when compiled with the |+rightleft| feature} Allow CTRL-_ in Insert and Command-line mode. This is default off, to @@ -616,7 +606,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'altkeymap'* *'akm'* *'noaltkeymap'* *'noakm'* 'altkeymap' 'akm' boolean (default off) global - {not in Vi} {only available when compiled with the |+farsi| feature} When on, the second language is Farsi. In editing mode CTRL-_ toggles @@ -630,7 +619,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'ambiwidth'* *'ambw'* 'ambiwidth' 'ambw' string (default: "single") global - {not in Vi} {only available when compiled with the |+multi_byte| feature} Only effective when 'encoding' is "utf-8" or another Unicode encoding. @@ -668,7 +656,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'antialias'* *'anti'* *'noantialias'* *'noanti'* 'antialias' 'anti' boolean (default: off) global - {not in Vi} {only available when compiled with GUI enabled on Mac OS X} This option only has an effect in the GUI version of Vim on Mac OS X @@ -680,7 +667,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'autochdir'* *'acd'* *'noautochdir'* *'noacd'* 'autochdir' 'acd' boolean (default off) global - {not in Vi} {only available when compiled with it, use exists("+autochdir") to check} When on, Vim will change the current working directory whenever you @@ -694,7 +680,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'arabic'* *'arab'* *'noarabic'* *'noarab'* 'arabic' 'arab' boolean (default off) local to window - {not in Vi} {only available when compiled with the |+arabic| feature} This option can be set to start editing Arabic text. @@ -717,7 +702,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'noarabicshape'* *'noarshape'* 'arabicshape' 'arshape' boolean (default on) global - {not in Vi} {only available when compiled with the |+arabic| feature} When on and 'termbidi' is off, the required visual character @@ -755,7 +739,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'autoread'* *'ar'* *'noautoread'* *'noar'* 'autoread' 'ar' boolean (default off) global or local to buffer |global-local| - {not in Vi} When a file has been detected to have been changed outside of Vim and it has not been changed inside of Vim, automatically read it again. When the file has been deleted this is not done. |timestamp| @@ -776,7 +759,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'autowriteall'* *'awa'* *'noautowriteall'* *'noawa'* 'autowriteall' 'awa' boolean (default off) global - {not in Vi} Like 'autowrite', but also used for commands ":edit", ":enew", ":quit", ":qall", ":exit", ":xit", ":recover" and closing the Vim window. Setting this option also implies that Vim behaves like 'autowrite' has @@ -785,7 +767,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'background'* *'bg'* 'background' 'bg' string (default "dark" or "light", see below) global - {not in Vi} When set to "dark", Vim will try to use colors that look good on a dark background. When set to "light", Vim will try to use colors that look good on a light background. Any other value is illegal. @@ -839,7 +820,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'backspace'* *'bs'* 'backspace' 'bs' string (default "") global - {not in Vi} Influences the working of <BS>, <Del>, CTRL-W and CTRL-U in Insert mode. This is a list of items, separated by commas. Each item allows a way to backspace over something: @@ -860,7 +840,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'backup'* *'bk'* *'nobackup'* *'nobk'* 'backup' 'bk' boolean (default off) global - {not in Vi} Make a backup before overwriting a file. Leave it around after the file has been successfully written. If you do not want to keep the backup file, but you do want a backup while the file is being @@ -875,7 +854,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'backupcopy'* *'bkc'* 'backupcopy' 'bkc' string (Vi default for Unix: "yes", otherwise: "auto") global or local to buffer |global-local| - {not in Vi} When writing a file and a backup is made, this option tells how it's done. This is a comma separated list of words. @@ -942,7 +920,6 @@ A jump table for the options with a short description can be found at |Q_op|. 'backupdir' 'bdir' string (default for MS-DOS and Win32: ".,$TEMP,c:/tmp,c:/temp", for Unix: ".,~/tmp,~/") global - {not in Vi} List of directories for the backup file, separated with commas. - The backup file will be created in the first directory in the list where this is possible. The directory must exist, Vim will not @@ -980,7 +957,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'backupext'* *'bex'* *E589* 'backupext' 'bex' string (default "~") global - {not in Vi} String which is appended to a file name to make the name of the backup file. The default is quite unusual, because this avoids accidentally overwriting existing files with a backup file. You might @@ -997,7 +973,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'backupskip'* *'bsk'* 'backupskip' 'bsk' string (default: "/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*") global - {not in Vi} {not available when compiled without the |+wildignore| feature} A list of file patterns. When one of the patterns matches with the @@ -1024,7 +999,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'balloondelay'* *'bdlay'* 'balloondelay' 'bdlay' number (default: 600) global - {not in Vi} {only available when compiled with the |+balloon_eval| feature} Delay in milliseconds before a balloon may pop up. See |balloon-eval|. @@ -1032,7 +1006,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'ballooneval'* *'beval'* *'noballooneval'* *'nobeval'* 'ballooneval' 'beval' boolean (default off) global - {not in Vi} {only available when compiled with the |+balloon_eval| feature} Switch on the |balloon-eval| functionality. @@ -1040,7 +1013,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'balloonexpr'* *'bexpr'* 'balloonexpr' 'bexpr' string (default "") global or local to buffer |global-local| - {not in Vi} {only available when compiled with the |+balloon_eval| feature} Expression for text to show in evaluation balloon. It is only used @@ -1083,7 +1055,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'binary'* *'bin'* *'nobinary'* *'nobin'* 'binary' 'bin' boolean (default off) local to buffer - {not in Vi} This option should be set before editing a binary file. You can also use the |-b| Vim argument. When this option is switched on a few options will be changed (also when it already was on): @@ -1114,7 +1085,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'bomb'* *'nobomb'* 'bomb' boolean (default off) local to buffer - {not in Vi} {only available when compiled with the |+multi_byte| feature} When writing a file and the following conditions are met, a BOM (Byte @@ -1136,7 +1106,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'breakat'* *'brk'* 'breakat' 'brk' string (default " ^I!@*-+;:,./?") global - {not in Vi} {not available when compiled without the |+linebreak| feature} This option lets you choose which characters might cause a line @@ -1146,7 +1115,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'breakindent'* *'bri'* 'breakindent' 'bri' boolean (default off) local to window - {not in Vi} {not available when compiled without the |+linebreak| feature} Every wrapped line will continue visually indented (same amount of @@ -1156,7 +1124,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'breakindentopt'* *'briopt'* 'breakindentopt' 'briopt' string (default empty) local to window - {not in Vi} {not available when compiled without the |+linebreak| feature} Settings for 'breakindent'. It can consist of the following optional @@ -1178,7 +1145,7 @@ A jump table for the options with a short description can be found at |Q_op|. *'browsedir'* *'bsdir'* 'browsedir' 'bsdir' string (default: "last") global - {not in Vi} {only for Motif, Athena, GTK, Mac and + {only for Motif, Athena, GTK, Mac and Win32 GUI} Which directory to use for the file browser: last Use same directory as with last file browser, where a @@ -1190,7 +1157,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'bufhidden'* *'bh'* 'bufhidden' 'bh' string (default: "") local to buffer - {not in Vi} {not available when compiled without the |+quickfix| feature} This option specifies what happens when a buffer is no longer @@ -1216,7 +1182,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'buflisted'* *'bl'* *'nobuflisted'* *'nobl'* *E85* 'buflisted' 'bl' boolean (default: on) local to buffer - {not in Vi} When this option is set, the buffer shows up in the buffer list. If it is reset it is not used for ":bnext", "ls", the Buffers menu, etc. This option is reset by Vim for buffers that are only used to remember @@ -1226,7 +1191,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'buftype'* *'bt'* *E382* 'buftype' 'bt' string (default: "") local to buffer - {not in Vi} {not available when compiled without the |+quickfix| feature} The value of this option specifies the type of a buffer: @@ -1276,7 +1240,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'casemap'* *'cmp'* 'casemap' 'cmp' string (default: "internal,keepascii") global - {not in Vi} {only available when compiled with the |+multi_byte| feature} Specifies details about changing the case of letters. It may contain @@ -1294,7 +1257,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'cdpath'* *'cd'* *E344* *E346* 'cdpath' 'cd' string (default: equivalent to $CDPATH or ",,") global - {not in Vi} {not available when compiled without the |+file_in_path| feature} This is a list of directories which will be searched when using the @@ -1316,7 +1278,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'cedit'* '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. @@ -1333,7 +1294,6 @@ A jump table for the options with a short description can be found at |Q_op|. global {only available when compiled with the |+multi_byte| and |+eval| features} - {not in Vi} An expression that is used for character encoding conversion. It is evaluated when a file that is to be read or has been written has a different encoding from what is desired. @@ -1373,7 +1333,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'cindent'* *'cin'* *'nocindent'* *'nocin'* 'cindent' 'cin' boolean (default off) local to buffer - {not in Vi} {not available when compiled without the |+cindent| feature} Enables automatic C program indenting. See 'cinkeys' to set the keys @@ -1391,7 +1350,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'cinkeys'* *'cink'* 'cinkeys' 'cink' string (default "0{,0},0),:,0#,!^F,o,O,e") local to buffer - {not in Vi} {not available when compiled without the |+cindent| feature} A list of keys that, when typed in Insert mode, cause reindenting of @@ -1403,7 +1361,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'cinoptions'* *'cino'* 'cinoptions' 'cino' string (default "") local to buffer - {not in Vi} {not available when compiled without the |+cindent| feature} The 'cinoptions' affect the way 'cindent' reindents lines in a C @@ -1414,7 +1371,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'cinwords'* *'cinw'* 'cinwords' 'cinw' string (default "if,else,while,do,for,switch") local to buffer - {not in Vi} {not available when compiled without both the |+cindent| and the |+smartindent| features} These keywords start an extra indent in the next line when @@ -1428,7 +1384,6 @@ A jump table for the options with a short description can be found at |Q_op|. 'clipboard' 'cb' string (default "autoselect,exclude:cons\|linux" for X-windows, "" otherwise) global - {not in Vi} {only in GUI versions or when the |+xterm_clipboard| feature is included} This option is a list of comma separated names. @@ -1514,7 +1469,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'cmdheight'* *'ch'* 'cmdheight' 'ch' number (default 1) global - {not in Vi} Number of screen lines to use for the command-line. Helps avoiding |hit-enter| prompts. The value of this option is stored with the tab page, so that each tab @@ -1523,7 +1477,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'cmdwinheight'* *'cwh'* 'cmdwinheight' 'cwh' number (default 7) global - {not in Vi} {not available when compiled without the |+vertsplit| feature} Number of screen lines to use for the command-line window. |cmdwin| @@ -1531,7 +1484,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'colorcolumn'* *'cc'* 'colorcolumn' 'cc' string (default "") local to window - {not in Vi} {not available when compiled without the |+syntax| feature} 'colorcolumn' is a comma separated list of screen columns that are @@ -1550,7 +1502,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'columns'* *'co'* *E594* 'columns' 'co' number (default 80 or terminal width) global - {not in Vi} Number of columns of the screen. Normally this is set by the terminal initialization and does not have to be set by hand. Also see |posix-screen-size|. @@ -1569,7 +1520,6 @@ A jump table for the options with a short description can be found at |Q_op|. 'comments' 'com' string (default "s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-") local to buffer - {not in Vi} {not available when compiled without the |+comments| feature} A comma separated list of strings that can start a comment line. See @@ -1579,7 +1529,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'commentstring'* *'cms'* *E537* 'commentstring' 'cms' string (default "/*%s*/") local to buffer - {not in Vi} {not available when compiled without the |+folding| feature} A template for a comment. The "%s" in the value is replaced with the @@ -1592,7 +1541,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'complete'* *'cpt'* *E535* 'complete' 'cpt' string (default: ".,w,b,u,t,i") local to buffer - {not in Vi} This option specifies how keyword completion |ins-completion| works when CTRL-P or CTRL-N are used. It is also used for whole-line completion |i_CTRL-X_CTRL-L|. It indicates the type of completion @@ -1636,7 +1584,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'completefunc'* *'cfu'* 'completefunc' 'cfu' string (default: empty) local to buffer - {not in Vi} {not available when compiled without the |+eval| or |+insert_expand| features} This option specifies a function to be used for Insert mode completion @@ -1651,7 +1598,6 @@ A jump table for the options with a short description can be found at |Q_op|. global {not available when compiled without the |+insert_expand| feature} - {not in Vi} A comma separated list of options for Insert mode completion |ins-completion|. The supported values are: @@ -1677,7 +1623,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'concealcursor'* *'cocu'* 'concealcursor' 'cocu' string (default: "") local to window - {not in Vi} {not available when compiled without the |+conceal| feature} Sets the modes in which text in the cursor line can also be concealed. @@ -1700,7 +1645,6 @@ A jump table for the options with a short description can be found at |Q_op|. 'conceallevel' 'cole' *'conceallevel'* *'cole'* number (default 0) local to window - {not in Vi} {not available when compiled without the |+conceal| feature} Determine how text with the "conceal" syntax attribute |:syn-conceal| @@ -1726,7 +1670,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'confirm'* *'cf'* *'noconfirm'* *'nocf'* 'confirm' 'cf' boolean (default off) global - {not in Vi} When 'confirm' is on, certain operations that would normally fail because of unsaved changes to a buffer, e.g. ":q" and ":e", instead raise a |dialog| asking if you wish to save the current @@ -1739,7 +1682,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'copyindent'* *'ci'* *'nocopyindent'* *'noci'* 'copyindent' 'ci' boolean (default off) local to buffer - {not in Vi} Copy the structure of the existing lines indent when autoindenting a new line. Normally the new indent is reconstructed by a series of tabs followed by spaces as required (unless |'expandtab'| is enabled, @@ -1754,7 +1696,6 @@ A jump table for the options with a short description can be found at |Q_op|. 'cpoptions' 'cpo' string (Vim default: "aABceFs", Vi default: all flags) global - {not in Vi} A sequence of single character flags. When a character is present this indicates Vi-compatible behavior. This is used for things where not being Vi-compatible is mostly or sometimes preferred. @@ -1832,10 +1773,6 @@ A jump table for the options with a short description can be found at |Q_op|. argument will set the file name for the current buffer, if the current buffer doesn't have a file name yet. Also see |cpo-P|. - *cpo-H* - H When using "I" on a line with only blanks, insert - before the last blank. Without this flag insert after - the last blank. *cpo-i* i When included, interrupting the reading of a file will leave it modified. @@ -2060,7 +1997,6 @@ A jump table for the options with a short description can be found at |Q_op|. global {not available when compiled without the |+cscope| feature} - {not in Vi} Determines how many components of the path to show in a list of tags. See |cscopepathcomp|. @@ -2069,7 +2005,6 @@ A jump table for the options with a short description can be found at |Q_op|. global {not available when compiled without the |+cscope| feature} - {not in Vi} Specifies the command to execute cscope. See |cscopeprg|. This option cannot be set from a |modeline| or in the |sandbox|, for security reasons. @@ -2079,7 +2014,6 @@ A jump table for the options with a short description can be found at |Q_op|. global {not available when compiled without the |+cscope| or |+quickfix| features} - {not in Vi} Specifies whether to use quickfix window to show cscope results. See |cscopequickfix|. @@ -2088,7 +2022,6 @@ A jump table for the options with a short description can be found at |Q_op|. global {not available when compiled without the |+cscope| feature} - {not in Vi} In the absence of a prefix (-P) for cscope. setting this option enables to use the basename of cscope.out path as the prefix. See |cscoperelative|. @@ -2098,7 +2031,6 @@ A jump table for the options with a short description can be found at |Q_op|. global {not available when compiled without the |+cscope| feature} - {not in Vi} Use cscope for tag commands. See |cscope-options|. *'cscopetagorder'* *'csto'* @@ -2106,7 +2038,6 @@ A jump table for the options with a short description can be found at |Q_op|. global {not available when compiled without the |+cscope| feature} - {not in Vi} Determines the order in which ":cstag" performs a search. See |cscopetagorder|. @@ -2116,13 +2047,11 @@ A jump table for the options with a short description can be found at |Q_op|. global {not available when compiled without the |+cscope| feature} - {not in Vi} Give messages when adding a cscope database. See |cscopeverbose|. *'cursorbind'* *'crb'* *'nocursorbind'* *'nocrb'* 'cursorbind' 'crb' boolean (default off) local to window - {not in Vi} {not available when compiled without the |+cursorbind| feature} When this option is set, as the cursor in the current @@ -2137,7 +2066,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'cursorcolumn'* *'cuc'* *'nocursorcolumn'* *'nocuc'* 'cursorcolumn' 'cuc' boolean (default off) local to window - {not in Vi} {not available when compiled without the |+syntax| feature} Highlight the screen column of the cursor with CursorColumn @@ -2152,7 +2080,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'cursorline'* *'cul'* *'nocursorline'* *'nocul'* 'cursorline' 'cul' boolean (default off) local to window - {not in Vi} {not available when compiled without the |+syntax| feature} Highlight the screen line of the cursor with CursorLine @@ -2165,7 +2092,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'debug'* 'debug' string (default "") global - {not in Vi} These values can be used: msg Error messages that would otherwise be omitted will be given anyway. @@ -2180,7 +2106,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'define'* *'def'* 'define' 'def' string (default "^\s*#\s*define") global or local to buffer |global-local| - {not in Vi} Pattern to be used to find a macro definition. It is a search pattern, just like for the "/" command. This option is used for the commands like "[i" and "[d" |include-search|. The 'isident' option is @@ -2196,7 +2121,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'delcombine'* *'deco'* *'nodelcombine'* *'nodeco'* 'delcombine' 'deco' boolean (default off) global - {not in Vi} {only available when compiled with the |+multi_byte| feature} If editing Unicode and this option is set, backspace and Normal mode @@ -2212,7 +2136,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'dictionary'* *'dict'* 'dictionary' 'dict' string (default "") global or local to buffer |global-local| - {not in Vi} List of file names, separated by commas, that are used to lookup words for keyword completion commands |i_CTRL-X_CTRL-K|. Each file should contain a list of words. This can be one word per line, or several @@ -2236,14 +2159,12 @@ A jump table for the options with a short description can be found at |Q_op|. *'diff'* *'nodiff'* 'diff' boolean (default off) local to window - {not in Vi} Join the current window in the group of windows that shows differences between files. See |diff-mode|. *'dex'* *'diffexpr'* 'diffexpr' 'dex' string (default "") global - {not in Vi} 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 @@ -2252,7 +2173,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'dip'* *'diffopt'* 'diffopt' 'dip' string (default "filler") global - {not in Vi} Option settings for diff mode. It can consist of the following items. All are optional. Items must be separated by a comma. @@ -2296,7 +2216,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'digraph'* *'dg'* *'nodigraph'* *'nodg'* 'digraph' 'dg' boolean (default off) global - {not in Vi} {not available when compiled without the |+digraphs| feature} Enable the entering of digraphs in Insert mode with {char1} <BS> @@ -2347,12 +2266,10 @@ A jump table for the options with a short description can be found at |Q_op|. uses another default. This option cannot be set from a |modeline| or in the |sandbox|, for security reasons. - {Vi: directory to put temp file in, defaults to "/tmp"} *'display'* *'dy'* 'display' 'dy' string (default "") global - {not in Vi} Change the way text is displayed. This is comma separated list of flags: lastline When included, as much as possible of the last line @@ -2364,7 +2281,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'eadirection'* *'ead'* 'eadirection' 'ead' string (default "both") global - {not in Vi} {not available when compiled without the |+vertsplit| feature} Tells when the 'equalalways' option applies: @@ -2380,7 +2296,6 @@ A jump table for the options with a short description can be found at |Q_op|. global {only available when compiled with the |+multi_byte| feature} - {not in Vi} Sets the character encoding used inside Vim. It applies to text in the buffers, registers, Strings in expressions, text stored in the viminfo file, etc. It sets the kind of characters which Vim can work @@ -2443,7 +2358,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'endofline'* *'eol'* *'noendofline'* *'noeol'* 'endofline' 'eol' boolean (default on) local to buffer - {not in Vi} When writing a file and this option is off and the 'binary' option is on, no <EOL> will be written for the last line in the file. This option is automatically set when starting to edit a new file, unless @@ -2458,7 +2372,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'equalalways'* *'ea'* *'noequalalways'* *'noea'* 'equalalways' 'ea' boolean (default on) global - {not in Vi} When on, all the windows are automatically made the same size after splitting or closing a window. This also happens the moment the option is switched on. When off, splitting a window will reduce the @@ -2477,7 +2390,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'equalprg'* *'ep'* 'equalprg' 'ep' string (default "") global or local to buffer |global-local| - {not in Vi} External program to use for "=" command. When this option is empty the internal formatting functions are used; either 'lisp', 'cindent' or 'indentexpr'. When Vim was compiled without internal formatting, @@ -2499,7 +2411,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'errorfile'* *'ef'* 'errorfile' 'ef' string (default: "errors.err") global - {not in Vi} {not available when compiled without the |+quickfix| feature} Name of the errorfile for the QuickFix mode (see |:cf|). @@ -2514,7 +2425,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'errorformat'* *'efm'* 'errorformat' 'efm' string (default is very long) global or local to buffer |global-local| - {not in Vi} {not available when compiled without the |+quickfix| feature} Scanf-like description of the format for the lines in the error file @@ -2523,7 +2433,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'esckeys'* *'ek'* *'noesckeys'* *'noek'* 'esckeys' 'ek' boolean (Vim default: on, Vi default: off) global - {not in Vi} Function keys that start with an <Esc> are recognized in Insert mode. When this option is off, the cursor and function keys cannot be used in Insert mode if they start with an <Esc>. The advantage of @@ -2536,7 +2445,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'eventignore'* *'ei'* 'eventignore' 'ei' string (default "") global - {not in Vi} {not available when compiled without the |+autocmd| feature} A list of autocommand event names, which are to be ignored. @@ -2548,7 +2456,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'expandtab'* *'et'* *'noexpandtab'* *'noet'* 'expandtab' 'et' boolean (default off) local to buffer - {not in Vi} In Insert mode: Use the appropriate number of spaces to insert a <Tab>. Spaces are used in indents with the '>' and '<' commands and when 'autoindent' is on. To insert a real tab when 'expandtab' is @@ -2557,7 +2464,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'exrc'* *'ex'* *'noexrc'* *'noex'* 'exrc' 'ex' boolean (default off) global - {not in Vi} Enables the reading of .vimrc, .exrc and .gvimrc in the current directory. If you switch this option on you should also consider setting the 'secure' option (see |initialization|). Using a local @@ -2571,7 +2477,6 @@ A jump table for the options with a short description can be found at |Q_op|. local to buffer {only available when compiled with the |+multi_byte| feature} - {not in Vi} Sets the character encoding for the file of this buffer. When 'fileencoding' is different from 'encoding', conversion will be @@ -2626,7 +2531,6 @@ A jump table for the options with a short description can be found at |Q_op|. global {only available when compiled with the |+multi_byte| feature} - {not in Vi} This is a list of character encodings considered when starting to edit an existing file. When a file is read, Vim tries to use the first mentioned character encoding. If an error is detected, the next one @@ -2684,7 +2588,6 @@ A jump table for the options with a short description can be found at |Q_op|. Unix default: "unix", Macintosh default: "mac") local to buffer - {not in Vi} This gives the <EOL> of the current buffer, which is used for reading/writing the buffer from/to a file: dos <CR> <NL> @@ -2708,7 +2611,6 @@ A jump table for the options with a short description can be found at |Q_op|. Vim Mac: "mac,unix,dos", Vi others: "") global - {not in Vi} This gives the end-of-line (<EOL>) formats that will be tried when starting to edit a new buffer and when reading a file into an existing buffer: @@ -2759,14 +2661,12 @@ A jump table for the options with a short description can be found at |Q_op|. 'fileignorecase' 'fic' boolean (default on for systems where case in file names is normally ignored) global - {not in Vi} When set case is ignored when using file names and directories. See 'wildignorecase' for only ignoring case when doing completion. *'filetype'* *'ft'* 'filetype' 'ft' string (default: "") local to buffer - {not in Vi} {not available when compiled without the |+autocmd| feature} When this option is set, the FileType autocommand event is triggered. @@ -2794,7 +2694,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'fillchars'* *'fcs'* 'fillchars' 'fcs' string (default "vert:|,fold:-") global - {not in Vi} {not available when compiled without the |+windows| and |+folding| features} Characters to fill the statuslines and vertical separators. @@ -2829,7 +2728,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'fkmap'* *'fk'* *'nofkmap'* *'nofk'* 'fkmap' 'fk' boolean (default off) *E198* global - {not in Vi} {only available when compiled with the |+rightleft| feature} When on, the keyboard is mapped for the Farsi character set. @@ -2839,7 +2737,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'foldclose'* *'fcl'* 'foldclose' 'fcl' string (default "") global - {not in Vi} {not available when compiled without the |+folding| feature} When set to "all", a fold is closed when the cursor isn't in it and @@ -2849,7 +2746,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'foldcolumn'* *'fdc'* 'foldcolumn' 'fdc' number (default 0) local to window - {not in Vi} {not available when compiled without the |+folding| feature} When non-zero, a column with the specified width is shown at the side @@ -2860,7 +2756,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'foldenable'* *'fen'* *'nofoldenable'* *'nofen'* 'foldenable' 'fen' boolean (default on) local to window - {not in Vi} {not available when compiled without the |+folding| feature} When off, all folds are open. This option can be used to quickly @@ -2874,7 +2769,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'foldexpr'* *'fde'* 'foldexpr' 'fde' string (default: "0") local to window - {not in Vi} {not available when compiled without the |+folding| or |+eval| features} The expression used for when 'foldmethod' is "expr". It is evaluated @@ -2891,7 +2785,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'foldignore'* *'fdi'* 'foldignore' 'fdi' string (default: "#") local to window - {not in Vi} {not available when compiled without the |+folding| feature} Used only when 'foldmethod' is "indent". Lines starting with @@ -2902,7 +2795,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'foldlevel'* *'fdl'* 'foldlevel' 'fdl' number (default: 0) local to window - {not in Vi} {not available when compiled without the |+folding| feature} Sets the fold level: Folds with a higher level will be closed. @@ -2914,7 +2806,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'foldlevelstart'* *'fdls'* 'foldlevelstart' 'fdls' number (default: -1) global - {not in Vi} {not available when compiled without the |+folding| feature} Sets 'foldlevel' when starting to edit another buffer in a window. @@ -2930,7 +2821,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'foldmarker'* *'fmr'* *E536* 'foldmarker' 'fmr' string (default: "{{{,}}}") local to window - {not in Vi} {not available when compiled without the |+folding| feature} The start and end marker used when 'foldmethod' is "marker". There @@ -2941,7 +2831,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'foldmethod'* *'fdm'* 'foldmethod' 'fdm' string (default: "manual") local to window - {not in Vi} {not available when compiled without the |+folding| feature} The kind of folding used for the current window. Possible values: @@ -2955,7 +2844,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'foldminlines'* *'fml'* 'foldminlines' 'fml' number (default: 1) local to window - {not in Vi} {not available when compiled without the |+folding| feature} Sets the number of screen lines above which a fold can be displayed @@ -2969,7 +2857,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'foldnestmax'* *'fdn'* 'foldnestmax' 'fdn' number (default: 20) local to window - {not in Vi} {not available when compiled without the |+folding| feature} Sets the maximum nesting of folds for the "indent" and "syntax" @@ -2980,7 +2867,6 @@ A jump table for the options with a short description can be found at |Q_op|. 'foldopen' 'fdo' string (default: "block,hor,mark,percent,quickfix, search,tag,undo") global - {not in Vi} {not available when compiled without the |+folding| feature} Specifies for which type of commands folds will be opened, if the @@ -3017,7 +2903,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'foldtext'* *'fdt'* 'foldtext' 'fdt' string (default: "foldtext()") local to window - {not in Vi} {not available when compiled without the |+folding| feature} An expression which is used to specify the text displayed for a closed @@ -3032,7 +2917,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'formatoptions'* *'fo'* 'formatoptions' 'fo' string (Vim default: "tcq", Vi default: "vt") local to buffer - {not in Vi} This is a sequence of letters which describes how automatic formatting is to be done. See |fo-table|. When the 'paste' option is on, no formatting is done (like 'formatoptions' is empty). Commas can @@ -3043,7 +2927,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'formatlistpat'* *'flp'* 'formatlistpat' 'flp' string (default: "^\s*\d\+[\]:.)}\t ]\s*") local to buffer - {not in Vi} A pattern that is used to recognize a list header. This is used for the "n" flag in 'formatoptions'. The pattern must match exactly the text that will be the indent for @@ -3057,7 +2940,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'formatprg'* *'fp'* 'formatprg' 'fp' string (default "") global - {not in Vi} The name of an external program that will be used to format the lines selected with the |gq| operator. The program must take the input on stdin and produce the output on stdout. The Unix program "fmt" is @@ -3073,7 +2955,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'formatexpr'* *'fex'* 'formatexpr' 'fex' string (default "") local to buffer - {not in Vi} {not available when compiled without the |+eval| feature} Expression which is evaluated to format a range of lines for the |gq| @@ -3108,7 +2989,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'fsync'* *'fs'* 'fsync' 'fs' boolean (default on) global - {not in Vi} When on, the library function fsync() will be called after writing a file. This will flush a file to disk, ensuring that it is safely written even on filesystems which do metadata-only journaling. This @@ -3122,7 +3002,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'gdefault'* *'gd'* *'nogdefault'* *'nogd'* 'gdefault' 'gd' boolean (default off) global - {not in Vi} When on, the ":substitute" flag 'g' is default on. This means that all matches in a line are substituted instead of one. When a 'g' flag is given to a ":substitute" command, this will toggle the substitution @@ -3136,7 +3015,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'grepformat'* *'gfm'* 'grepformat' 'gfm' string (default "%f:%l:%m,%f:%l%m,%f %l%m") global - {not in Vi} Format to recognize for the ":grep" command output. This is a scanf-like string that uses the same format as the 'errorformat' option: see |errorformat|. @@ -3146,7 +3024,6 @@ A jump table for the options with a short description can be found at |Q_op|. Unix: "grep -n $* /dev/null", Win32: "findstr /n" or "grep -n") global or local to buffer |global-local| - {not in Vi} Program to use for the |:grep| command. This option may contain '%' and '#' characters, which are expanded like when used in a command- line. The placeholder "$*" is allowed to specify where the arguments @@ -3177,7 +3054,6 @@ A jump table for the options with a short description can be found at |Q_op|. "n-v-c:block,o:hor50,i-ci:hor15, r-cr:hor30,sm:block") global - {not in Vi} {only available when compiled with GUI enabled, and for MS-DOS and Win32 console} This option tells Vim what the cursor should look like in different @@ -3255,7 +3131,6 @@ A jump table for the options with a short description can be found at |Q_op|. *E235* *E596* 'guifont' 'gfn' string (default "") global - {not in Vi} {only available when compiled with GUI enabled} This is a list of fonts which will be used for the GUI version of Vim. In its simplest form the value is just one font name. When @@ -3334,7 +3209,6 @@ A jump table for the options with a short description can be found at |Q_op|. *E250* *E252* *E234* *E597* *E598* 'guifontset' 'gfs' string (default "") global - {not in Vi} {only available when compiled with GUI enabled and with the |+xfontset| feature} {not available in the GTK+ 2 GUI} @@ -3358,7 +3232,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'guifontwide'* *'gfw'* *E231* *E533* *E534* 'guifontwide' 'gfw' string (default "") global - {not in Vi} {only available when compiled with GUI enabled} When not empty, specifies a comma-separated list of fonts to be used for double-width characters. The first font that can be loaded is @@ -3391,7 +3264,7 @@ A jump table for the options with a short description can be found at |Q_op|. *'guiheadroom'* *'ghr'* 'guiheadroom' 'ghr' number (default 50) global - {not in Vi} {only for GTK and X11 GUI} + {only for GTK and X11 GUI} The number of pixels subtracted from the screen height when fitting the GUI window on the screen. Set this before the GUI is started, e.g., in your |gvimrc| file. When zero, the whole screen height will @@ -3404,7 +3277,6 @@ A jump table for the options with a short description can be found at |Q_op|. 'guioptions' 'go' string (default "egmrLtT" (MS-Windows), "aegimrLtT" (GTK, Motif and Athena)) global - {not in Vi} {only available when compiled with GUI enabled} This option only has an effect in the GUI version of Vim. It is a sequence of letters which describes what components and options of the @@ -3510,7 +3382,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'guipty'* *'noguipty'* 'guipty' boolean (default on) global - {not in Vi} {only available when compiled with GUI enabled} Only in the GUI: If on, an attempt is made to open a pseudo-tty for I/O to/from shell commands. See |gui-pty|. @@ -3518,7 +3389,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'guitablabel'* *'gtl'* 'guitablabel' 'gtl' string (default empty) global - {not in Vi} {only available when compiled with GUI enabled and with the |+windows| feature} When nonempty describes the text to use in a label of the GUI tab @@ -3535,7 +3405,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'guitabtooltip'* *'gtt'* 'guitabtooltip' 'gtt' string (default empty) global - {not in Vi} {only available when compiled with GUI enabled and with the |+windows| feature} When nonempty describes the text to use in a tooltip for the GUI tab @@ -3549,7 +3418,6 @@ A jump table for the options with a short description can be found at |Q_op|. 'helpfile' 'hf' string (default (MSDOS) "$VIMRUNTIME\doc\help.txt" (others) "$VIMRUNTIME/doc/help.txt") global - {not in Vi} Name of the main help file. All distributed help files should be placed together in one directory. Additionally, all "doc" directories in 'runtimepath' will be used. @@ -3563,7 +3431,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'helpheight'* *'hh'* 'helpheight' 'hh' number (default 20) global - {not in Vi} {not available when compiled without the |+windows| feature} Minimal initial height of the help window when it is opened with the @@ -3577,7 +3444,6 @@ A jump table for the options with a short description can be found at |Q_op|. global {only available when compiled with the |+multi_lang| feature} - {not in Vi} Comma separated list of languages. Vim will use the first language for which the desired help can be found. The English help will always be used as a last resort. You can add "en" to prefer English over @@ -3594,7 +3460,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'hidden'* *'hid'* *'nohidden'* *'nohid'* 'hidden' 'hid' boolean (default off) global - {not in Vi} When off a buffer is unloaded when it is |abandon|ed. When on a buffer becomes hidden when it is |abandon|ed. If the buffer is still displayed in another window, it does not become hidden, of course. @@ -3623,7 +3488,6 @@ A jump table for the options with a short description can be found at |Q_op|. +:Pmenu,=:PmenuSel,x:PmenuSbar, X:PmenuThumb") global - {not in Vi} This option can be used to set highlighting mode for various occasions. It is a comma separated list of character pairs. The first character in a pair gives the occasion, the second the mode to @@ -3696,7 +3560,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'hlsearch'* *'hls'* *'nohlsearch'* *'nohls'* 'hlsearch' 'hls' boolean (default off) global - {not in Vi} {not available when compiled without the |+extra_search| feature} When there is a previous search pattern, highlight all its matches. @@ -3720,7 +3583,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'history'* *'hi'* 'history' 'hi' number (Vim default: 50, Vi default: 0) global - {not in Vi} A history of ":" commands, and a history of previous search patterns is remembered. This option decides how many entries may be stored in each of these histories (see |cmdline-editing|). @@ -3729,7 +3591,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'hkmap'* *'hk'* *'nohkmap'* *'nohk'* 'hkmap' 'hk' boolean (default off) global - {not in Vi} {only available when compiled with the |+rightleft| feature} When on, the keyboard is mapped for the Hebrew character set. @@ -3739,7 +3600,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'hkmapp'* *'hkp'* *'nohkmapp'* *'nohkp'* 'hkmapp' 'hkp' boolean (default off) global - {not in Vi} {only available when compiled with the |+rightleft| feature} When on, phonetic keyboard mapping is used. 'hkmap' must also be on. @@ -3749,7 +3609,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'icon'* *'noicon'* 'icon' boolean (default off, on when title can be restored) global - {not in Vi} {not available when compiled without the |+title| feature} When on, the icon text of the window will be set to the value of @@ -3767,7 +3626,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'iconstring'* 'iconstring' string (default "") global - {not in Vi} {not available when compiled without the |+title| feature} When this option is not empty, it will be used for the icon text of @@ -3794,7 +3652,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'imactivatefunc'* *'imaf'* 'imactivatefunc' 'imaf' string (default "") global - {not in Vi} {only available when compiled with |+xim| and |+GUI_GTK|} This option specifies a function that will be called to @@ -3814,7 +3671,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'imactivatekey'* *'imak'* 'imactivatekey' 'imak' string (default "") global - {not in Vi} {only available when compiled with |+xim| and |+GUI_GTK|} *E599* Specifies the key that your Input Method in X-Windows uses for @@ -3846,7 +3702,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'imcmdline'* *'imc'* *'noimcmdline'* *'noimc'* 'imcmdline' 'imc' boolean (default off) global - {not in Vi} {only available when compiled with the |+xim|, |+multi_byte_ime| or |global-ime| features} When set the Input Method is always on when starting to edit a command @@ -3858,7 +3713,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'imdisable'* *'imd'* *'noimdisable'* *'noimd'* 'imdisable' 'imd' boolean (default off, on for some systems (SGI)) global - {not in Vi} {only available when compiled with the |+xim|, |+multi_byte_ime| or |global-ime| features} When set the Input Method is never used. This is useful to disable @@ -3869,7 +3723,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'iminsert'* *'imi'* 'iminsert' 'imi' number (default 0, 2 when an input method is supported) local to buffer - {not in Vi} Specifies whether :lmap or an Input Method (IM) is to be used in Insert mode. Valid values: 0 :lmap is off and IM is off @@ -3892,7 +3745,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'imsearch'* *'ims'* 'imsearch' 'ims' number (default 0, 2 when an input method is supported) local to buffer - {not in Vi} Specifies whether :lmap or an Input Method (IM) is to be used when entering a search pattern. Valid values: -1 the value of 'iminsert' is used, makes it look like @@ -3910,7 +3762,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'imstatusfunc'* *'imsf'* 'imstatusfunc' 'imsf' string (default "") global - {not in Vi} {only available when compiled with |+xim| and |+GUI_GTK|} This option specifies a function that is called to obtain the status @@ -3928,7 +3779,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'include'* *'inc'* 'include' 'inc' string (default "^\s*#\s*include") global or local to buffer |global-local| - {not in Vi} {not available when compiled without the |+find_in_path| feature} Pattern to be used to find an include command. It is a search @@ -3946,7 +3796,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'includeexpr'* *'inex'* 'includeexpr' 'inex' string (default "") local to buffer - {not in Vi} {not available when compiled without the |+find_in_path| or |+eval| features} Expression to be used to transform the string found with the 'include' @@ -3967,7 +3816,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'incsearch'* *'is'* *'noincsearch'* *'nois'* 'incsearch' 'is' boolean (default off) global - {not in Vi} {not available when compiled without the |+extra_search| features} While typing a search command, show where the pattern, as it was typed @@ -3994,7 +3842,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'indentexpr'* *'inde'* 'indentexpr' 'inde' string (default "") local to buffer - {not in Vi} {not available when compiled without the |+cindent| or |+eval| features} Expression which is evaluated to obtain the proper indent for a line. @@ -4031,7 +3878,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'indentkeys'* *'indk'* 'indentkeys' 'indk' string (default "0{,0},:,0#,!^F,o,O,e") local to buffer - {not in Vi} {not available when compiled without the |+cindent| feature} A list of keys that, when typed in Insert mode, cause reindenting of @@ -4042,7 +3888,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'infercase'* *'inf'* *'noinfercase'* *'noinf'* 'infercase' 'inf' boolean (default off) local to buffer - {not in Vi} When doing keyword completion in insert mode |ins-completion|, and 'ignorecase' is also on, the case of the match is adjusted depending on the typed text. If the typed text contains a lowercase letter @@ -4055,7 +3900,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'insertmode'* *'im'* *'noinsertmode'* *'noim'* 'insertmode' 'im' boolean (default off) global - {not in Vi} Makes Vim work in a way that Insert mode is the default mode. Useful if you want to use Vim as a modeless editor. These Insert mode commands will be useful: @@ -4083,7 +3927,6 @@ A jump table for the options with a short description can be found at |Q_op|. "@,48-57,/,\,.,-,_,+,,,#,$,%,{,},[,],:,@-@,!,~,=" otherwise: "@,48-57,/,.,-,_,+,,,#,$,%,~,=") global - {not in Vi} The characters specified by this option are included in file names and path names. Filenames are used for commands like "gf", "[i" and in the tags file. It is also used for "\f" in a |pattern|. @@ -4135,7 +3978,6 @@ A jump table for the options with a short description can be found at |Q_op|. "@,48-57,_,128-167,224-235" otherwise: "@,48-57,_,192-255") global - {not in Vi} The characters given by this option are included in identifiers. Identifiers are used in recognizing environment variables and after a match of the 'define' option. It is also used for "\i" in a @@ -4151,7 +3993,6 @@ A jump table for the options with a short description can be found at |Q_op|. 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: "w", "*", "[i", etc. It is also used for "\k" in a |pattern|. See 'isfname' for a description of the format of this option. For C @@ -4165,7 +4006,6 @@ A jump table for the options with a short description can be found at |Q_op|. 'isprint' 'isp' string (default for MS-DOS, Win32, and Macintosh: "@,~-255"; otherwise: "@,161-255") global - {not in Vi} The characters given by this option are displayed directly on the screen. It is also used for "\p" in a |pattern|. The characters from space (ASCII 32) to '~' (ASCII 126) are always displayed directly, @@ -4196,7 +4036,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'joinspaces'* *'js'* *'nojoinspaces'* *'nojs'* 'joinspaces' 'js' boolean (default on) global - {not in Vi} 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. @@ -4207,7 +4046,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'keymap'* *'kmp'* *E544* 'keymap' 'kmp' string (default "") local to buffer - {not in Vi} {only available when compiled with the |+keymap| feature} Name of a keyboard mapping. See |mbyte-keymap|. @@ -4219,7 +4057,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'keymodel'* *'km'* 'keymodel' 'km' string (default "") global - {not in Vi} List of comma separated words, which enable special things that keys can do. These values can be used: startsel Using a shifted special key starts selection (either @@ -4233,7 +4070,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'keywordprg'* *'kp'* 'keywordprg' 'kp' string (default "man" or "man -s", DOS: ":help") global or local to buffer |global-local| - {not in Vi} Program to use for the |K| command. Environment variables are expanded |:set_env|. ":help" may be used to access the Vim internal help. (Note that previously setting the global option to the empty @@ -4250,7 +4086,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'langmap'* *'lmap'* *E357* *E358* 'langmap' 'lmap' string (default "") global - {not in Vi} {only available when compiled with the |+langmap| feature} This option allows switching your keyboard into a special language @@ -4294,7 +4129,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'langmenu'* *'lm'* 'langmenu' 'lm' string (default "") global - {not in Vi} {only available when compiled with the |+menu| and |+multi_lang| features} Language to use for menu translation. Tells which file is loaded @@ -4319,7 +4153,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'langnoremap'* *'lnr'* 'langnoremap' 'lnr' boolean (default off) global - {not in Vi} When on, setting 'langmap' does not apply to characters resulting from a mapping. This basically means, if you noticed that setting 'langmap' disables some of your mappings, try setting this option. @@ -4329,7 +4162,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'laststatus'* *'ls'* 'laststatus' 'ls' number (default 1) global - {not in Vi} The value of this option influences when the last window will have a status line: 0: never @@ -4341,7 +4173,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'lazyredraw'* *'lz'* *'nolazyredraw'* *'nolz'* 'lazyredraw' 'lz' boolean (default off) global - {not in Vi} When this option is set, the screen will not be redrawn while executing macros, registers and other commands that have not been typed. Also, updating the window title is postponed. To force an @@ -4350,7 +4181,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'linebreak'* *'lbr'* *'nolinebreak'* *'nolbr'* 'linebreak' 'lbr' boolean (default off) local to window - {not in Vi} {not available when compiled without the |+linebreak| feature} If on, Vim will wrap long lines at a character in 'breakat' rather @@ -4383,7 +4213,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'linespace'* *'lsp'* 'linespace' 'lsp' number (default 0, 1 for Win32 GUI) global - {not in Vi} {only in the GUI} Number of pixel lines inserted between characters. Useful if the font uses the full character cell height, making lines touch each other. @@ -4407,12 +4236,10 @@ A jump table for the options with a short description can be found at |Q_op|. "=" operator to use this same indentation algorithm rather than calling an external program if 'equalprg' is empty. This option is not used when 'paste' is set. - {Vi: Does it a little bit differently} *'lispwords'* *'lw'* 'lispwords' 'lw' string (default is very long) global or local to buffer |global-local| - {not in Vi} {not available when compiled without the |+lispindent| feature} Comma separated list of words that influence the Lisp indenting. @@ -4437,7 +4264,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'listchars'* *'lcs'* 'listchars' 'lcs' string (default "eol:$") global - {not in Vi} Strings to use in 'list' mode and for the |:list| command. It is a comma separated list of string settings. *lcs-eol* @@ -4487,7 +4313,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'lpl'* *'nolpl'* *'loadplugins'* *'noloadplugins'* 'loadplugins' 'lpl' boolean (default on) global - {not in Vi} When on the plugin scripts are loaded when starting up |load-plugins|. This option can be reset in your |vimrc| file to disable the loading of plugins. @@ -4523,7 +4348,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'makeef'* *'mef'* 'makeef' 'mef' string (default: "") global - {not in Vi} {not available when compiled without the |+quickfix| feature} Name of the errorfile for the |:make| command (see |:make_makeprg|) @@ -4541,7 +4365,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'makeprg'* *'mp'* 'makeprg' 'mp' string (default "make") global or local to buffer |global-local| - {not in Vi} Program to use for the ":make" command. See |:make_makeprg|. This option may contain '%' and '#' characters (see |:_%| and |:_#|), which are expanded to the current and alternate file name. Use |::S| @@ -4561,7 +4384,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'matchpairs'* *'mps'* 'matchpairs' 'mps' string (default "(:),{:},[:]") local to buffer - {not in Vi} Characters that form pairs. The |%| command jumps from one to the other. Only character pairs are allowed that are different, thus you cannot @@ -4581,7 +4403,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'matchtime'* *'mat'* 'matchtime' 'mat' number (default 5) global - {not in Vi}{in Nvi} Tenths of a second to show the matching paren, when 'showmatch' is set. Note that this is not in milliseconds, like other options that set a time. This is to be compatible with Nvi. @@ -4589,7 +4410,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'maxcombine'* *'mco'* 'maxcombine' 'mco' number (default 2) global - {not in Vi} {only available when compiled with the |+multi_byte| feature} The maximum number of combining characters supported for displaying. @@ -4603,7 +4423,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'maxfuncdepth'* *'mfd'* 'maxfuncdepth' 'mfd' number (default 100) global - {not in Vi} {not available when compiled without the |+eval| feature} Maximum depth of function calls for user functions. This normally @@ -4615,7 +4434,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'maxmapdepth'* *'mmd'* *E223* 'maxmapdepth' 'mmd' number (default 1000) global - {not in Vi} Maximum number of times a mapping is done without resulting in a character to be used. This normally catches endless mappings, like ":map x y" with ":map y x". It still does not catch ":map g wg", @@ -4627,7 +4445,6 @@ A jump table for the options with a short description can be found at |Q_op|. dependent) or half the amount of memory available) global - {not in Vi} Maximum amount of memory (in Kbyte) to use for one buffer. When this limit is reached allocating extra memory for a buffer will cause other memory to be freed. The maximum usable value is about 2000000. @@ -4636,7 +4453,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'maxmempattern'* *'mmp'* 'maxmempattern' 'mmp' number (default 1000) global - {not in Vi} Maximum amount of memory (in Kbyte) to use for pattern matching. The maximum value is about 2000000. Use this to work without a limit. *E363* @@ -4652,7 +4468,6 @@ A jump table for the options with a short description can be found at |Q_op|. dependent) or half the amount of memory available) global - {not in Vi} Maximum amount of memory in Kbyte to use for all buffers together. The maximum usable value is about 2000000 (2 Gbyte). Use this to work without a limit. On 64 bit machines higher values might work. But @@ -4662,7 +4477,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'menuitems'* *'mis'* 'menuitems' 'mis' number (default 25) global - {not in Vi} {not available when compiled without the |+menu| feature} Maximum number of items to use in a menu. Used for menus that are @@ -4672,7 +4486,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'mkspellmem'* *'msm'* 'mkspellmem' 'msm' string (default "460000,2000,500") global - {not in Vi} {not available when compiled without the |+syntax| feature} Parameters for |:mkspell|. This tunes when to start compressing the @@ -4715,15 +4528,13 @@ A jump table for the options with a short description can be found at |Q_op|. *'modelines'* *'mls'* 'modelines' 'mls' number (default 5) global - {not in Vi} 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|. - *'modifiable'* *'ma'* *'nomodifiable'* *'noma'* + *'modifiable'* *'ma'* *'nomodifiable'* *'noma'* *E21* 'modifiable' 'ma' boolean (default on) local to buffer - {not in Vi} *E21* When off the buffer contents cannot be changed. The 'fileformat' and 'fileencoding' options also can't be changed. Can be reset with the |-M| command line argument. @@ -4731,7 +4542,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'modified'* *'mod'* *'nomodified'* *'nomod'* 'modified' 'mod' boolean (default off) local to buffer - {not in Vi} When on, the buffer is considered to be modified. This option is set when: 1. A change was made to the text since it was last written. Using the @@ -4754,7 +4564,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'more'* *'nomore'* 'more' boolean (Vim default: on, Vi default: off) global - {not in Vi} 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. @@ -4762,7 +4571,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'mouse'* *E538* 'mouse' string (default "", "a" for GUI, MS-DOS and Win32) global - {not in Vi} Enable the use of the mouse. Only works for certain terminals (xterm, Win32 |win32-mouse|, *BSD console with sysmouse and Linux console with gpm). For using the mouse in the GUI, see |gui-mouse|. @@ -4789,7 +4597,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'mousefocus'* *'mousef'* *'nomousefocus'* *'nomousef'* 'mousefocus' 'mousef' boolean (default off) global - {not in Vi} {only works in the GUI} The window that the mouse pointer is on is automatically activated. When changing the window layout or window focus in another way, the @@ -4800,7 +4607,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'mousehide'* *'mh'* *'nomousehide'* *'nomh'* 'mousehide' 'mh' boolean (default on) global - {not in Vi} {only works in the GUI} When on, the mouse pointer is hidden when characters are typed. The mouse pointer is restored when the mouse is moved. @@ -4808,7 +4614,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'mousemodel'* *'mousem'* 'mousemodel' 'mousem' string (default "extend", "popup" for MS-DOS and Win32) global - {not in Vi} Sets the model to use for the mouse. The name mostly specifies what the right mouse button is used for: extend Right mouse button extends a selection. This works @@ -4845,7 +4650,6 @@ A jump table for the options with a short description can be found at |Q_op|. 'mouseshape' 'mouses' string (default "i:beam,r:beam,s:updown,sd:cross, m:no,ml:up-arrow,v:rightup-arrow") global - {not in Vi} {only available when compiled with the |+mouseshape| feature} This option tells Vim what the mouse pointer should look like in @@ -4910,7 +4714,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'mousetime'* *'mouset'* 'mousetime' 'mouset' number (default 500) global - {not in Vi} Only for GUI, MS-DOS, Win32 and Unix with xterm. Defines the maximum time in msec between two mouse clicks for the second click to be recognized as a multi click. @@ -4918,7 +4721,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'nrformats'* *'nf'* 'nrformats' 'nf' string (default "octal,hex") local to buffer - {not in Vi} This defines what bases Vim will consider for numbers when using the CTRL-A and CTRL-X commands for adding to and subtracting from a number respectively; see |CTRL-A| for more info on these commands. @@ -4962,7 +4764,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'numberwidth'* *'nuw'* 'numberwidth' 'nuw' number (Vim default: 4 Vi default: 8) local to window - {not in Vi} {only available when compiled with the |+linebreak| feature} Minimal number of columns to use for the line number. Only relevant @@ -4979,7 +4780,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'omnifunc'* *'ofu'* 'omnifunc' 'ofu' string (default: empty) local to buffer - {not in Vi} {not available when compiled without the |+eval| or |+insert_expand| features} This option specifies a function to be used for Insert mode omni @@ -4995,7 +4795,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'opendevice'* *'odev'* *'noopendevice'* *'noodev'* 'opendevice' 'odev' boolean (default off) global - {not in Vi} {only for MS-DOS and MS-Windows} Enable reading and writing from devices. This may get Vim stuck on a device that can be opened but doesn't actually do the I/O. Therefore @@ -5007,7 +4806,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'operatorfunc'* *'opfunc'* 'operatorfunc' 'opfunc' string (default: empty) global - {not in Vi} This option specifies a function to be called by the |g@| operator. See |:map-operator| for more info and an example. @@ -5023,7 +4821,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'paste'* *'nopaste'* 'paste' boolean (default off) global - {not in Vi} Put Vim in Paste mode. This is useful if you want to cut or copy some text from one window and paste it in Vim. This will avoid unexpected effects. @@ -5065,7 +4862,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'pastetoggle'* *'pt'* 'pastetoggle' 'pt' string (default "") global - {not in Vi} When non-empty, specifies the key sequence that toggles the 'paste' option. This is like specifying a mapping: > :map {keys} :set invpaste<CR> @@ -5090,14 +4886,12 @@ A jump table for the options with a short description can be found at |Q_op|. *'pex'* *'patchexpr'* 'patchexpr' 'pex' string (default "") global - {not in Vi} Expression which is evaluated to apply a patch to a file and generate the resulting new version of the file. See |diff-patchexpr|. *'patchmode'* *'pm'* *E205* *E206* 'patchmode' 'pm' string (default "") global - {not in Vi} When non-empty the oldest version of a file is kept. This can be used to keep the original version of a file if you are changing files in a source distribution. Only the first time that a file is written a @@ -5119,7 +4913,6 @@ A jump table for the options with a short description can be found at |Q_op|. 'path' 'pa' string (default on Unix: ".,/usr/include,," other systems: ".,,") global or local to buffer |global-local| - {not in Vi} This is a list of directories which will be searched when using the |gf|, [f, ]f, ^Wf, |:find|, |:sfind|, |:tabfind| and other commands, provided that the file being searched for has a relative path (not @@ -5172,7 +4965,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'preserveindent'* *'pi'* *'nopreserveindent'* *'nopi'* 'preserveindent' 'pi' boolean (default off) local to buffer - {not in Vi} When changing the indent of the current line, preserve as much of the indent structure as possible. Normally the indent is replaced by a series of tabs followed by spaces as required (unless |'expandtab'| is @@ -5189,7 +4981,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'previewheight'* *'pvh'* 'previewheight' 'pvh' number (default 12) global - {not in Vi} {not available when compiled without the |+windows| or |+quickfix| features} Default height for a preview window. Used for |:ptag| and associated @@ -5199,7 +4990,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'pvw'* *'nopvw'* *E590* 'previewwindow' 'pvw' boolean (default off) local to window - {not in Vi} {not available when compiled without the |+windows| or |+quickfix| features} Identifies the preview window. Only one window can have this option @@ -5209,7 +4999,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'printdevice'* *'pdev'* 'printdevice' 'pdev' string (default empty) global - {not in Vi} {only available when compiled with the |+printer| feature} The name of the printer to be used for |:hardcopy|. @@ -5220,7 +5009,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'printencoding'* *'penc'* 'printencoding' 'penc' String (default empty, except for some systems) global - {not in Vi} {only available when compiled with the |+printer| and |+postscript| features} Sets the character encoding used when printing. @@ -5229,7 +5017,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'printexpr'* *'pexpr'* 'printexpr' 'pexpr' String (default: see below) global - {not in Vi} {only available when compiled with the |+printer| and |+postscript| features} Expression used to print the PostScript produced with |:hardcopy|. @@ -5238,7 +5025,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'printfont'* *'pfn'* 'printfont' 'pfn' string (default "courier") global - {not in Vi} {only available when compiled with the |+printer| feature} The name of the font that will be used for |:hardcopy|. @@ -5247,7 +5033,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'printheader'* *'pheader'* 'printheader' 'pheader' string (default "%<%f%h%m%=Page %N") global - {not in Vi} {only available when compiled with the |+printer| feature} The format of the header produced in |:hardcopy| output. @@ -5256,7 +5041,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'printmbcharset'* *'pmbcs'* 'printmbcharset' 'pmbcs' string (default "") global - {not in Vi} {only available when compiled with the |+printer|, |+postscript| and |+multi_byte| features} The CJK character set to be used for CJK output from |:hardcopy|. @@ -5265,7 +5049,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'printmbfont'* *'pmbfn'* 'printmbfont' 'pmbfn' string (default "") global - {not in Vi} {only available when compiled with the |+printer|, |+postscript| and |+multi_byte| features} List of font names to be used for CJK output from |:hardcopy|. @@ -5274,7 +5057,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'printoptions'* *'popt'* 'printoptions' 'popt' string (default "") global - {not in Vi} {only available when compiled with |+printer| feature} List of items that control the format of the output of |:hardcopy|. See |popt-option|. @@ -5289,7 +5071,6 @@ A jump table for the options with a short description can be found at |Q_op|. global {not available when compiled without the |+insert_expand| feature} - {not in Vi} Determines the maximum number of items to show in the popup menu for Insert mode completion. When zero as much space as available is used. |ins-completion-menu|. @@ -5298,7 +5079,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'quoteescape'* *'qe'* 'quoteescape' 'qe' string (default "\") local to buffer - {not in Vi} The characters that are used to escape quotes in a string. Used for objects like a', a" and a` |a'|. When one of the characters in this option is found inside a string, @@ -5313,13 +5093,12 @@ A jump table for the options with a short description can be found at |Q_op|. in read-only mode ("vim -R") or when the executable is called "view". When using ":w!" the 'readonly' option is reset for the current buffer, unless the 'Z' flag is in 'cpoptions'. - {not in Vi:} When using the ":view" command the 'readonly' option is + When using the ":view" command the 'readonly' option is set for the newly edited buffer. *'redrawtime'* *'rdt'* 'redrawtime' 'rdt' number (default 2000) global - {not in Vi} {only available when compiled with the |+reltime| feature} The time in milliseconds for redrawing the display. This applies to @@ -5331,7 +5110,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'regexpengine'* *'re'* 'regexpengine' 're' number (default 0) global - {not in Vi} This selects the default regexp engine. |two-engines| The possible values are: 0 automatic selection @@ -5348,7 +5126,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'relativenumber'* *'rnu'* *'norelativenumber'* *'nornu'* 'relativenumber' 'rnu' boolean (default off) local to window - {not in Vi} Show the line number relative to the line with the cursor in front of each line. Relative line numbers help you use the |count| you can precede some vertical motion commands (e.g. j k + -) with, without @@ -5388,7 +5165,7 @@ A jump table for the options with a short description can be found at |Q_op|. *'restorescreen'* *'rs'* *'norestorescreen'* *'nors'* 'restorescreen' 'rs' boolean (default on) global - {not in Vi} {only in Windows 95/NT console version} + {only in Windows 95/NT console version} When set, the screen contents is restored when exiting Vim. This also happens when executing external commands. @@ -5402,7 +5179,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'revins'* *'ri'* *'norevins'* *'nori'* 'revins' 'ri' boolean (default off) global - {not in Vi} {only available when compiled with the |+rightleft| feature} Inserting characters in Insert mode will work backwards. See "typing @@ -5413,7 +5189,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'rightleft'* *'rl'* *'norightleft'* *'norl'* 'rightleft' 'rl' boolean (default off) local to window - {not in Vi} {only available when compiled with the |+rightleft| feature} When on, display orientation becomes right-to-left, i.e., characters @@ -5429,7 +5204,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'rightleftcmd'* *'rlc'* 'rightleftcmd' 'rlc' string (default "search") local to window - {not in Vi} {only available when compiled with the |+rightleft| feature} Each word in this option enables the command line editing to work in @@ -5443,7 +5217,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'ruler'* *'ru'* *'noruler'* *'noru'* 'ruler' 'ru' boolean (default off) global - {not in Vi} {not available when compiled without the |+cmdline_info| feature} Show the line and column number of the cursor position, separated by a @@ -5471,7 +5244,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'rulerformat'* *'ruf'* 'rulerformat' 'ruf' string (default empty) global - {not in Vi} {not available when compiled without the |+statusline| feature} When this option is not empty, it determines the content of the ruler @@ -5493,7 +5265,6 @@ A jump table for the options with a short description can be found at |Q_op|. $VIMRUNTIME, $VIM:vimfiles:after") global - {not in Vi} This is a list of directories which will be searched for runtime files: filetype.vim filetypes by file name |new-filetype| @@ -5554,14 +5325,11 @@ A jump table for the options with a short description can be found at |Q_op|. set to half the number of lines in the window when the window size changes. If you give a count to the CTRL-U or CTRL-D command it will be used as the new value for 'scroll'. Reset to half the window - height with ":set scroll=0". {Vi is a bit different: 'scroll' gives - the number of screen lines instead of file lines, makes a difference - when lines wrap} + height with ":set scroll=0". *'scrollbind'* *'scb'* *'noscrollbind'* *'noscb'* 'scrollbind' 'scb' boolean (default off) local to window - {not in Vi} {not available when compiled without the |+scrollbind| feature} See also |scroll-binding|. When this option is set, the current @@ -5577,7 +5345,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'scrolljump'* *'sj'* 'scrolljump' 'sj' number (default 1) global - {not in Vi} Minimal number of lines to scroll when the cursor gets off the screen (e.g., with "j"). Not used for scroll commands (e.g., CTRL-E, CTRL-D). Useful if your terminal scrolls very slowly. @@ -5588,7 +5355,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'scrolloff'* *'so'* 'scrolloff' 'so' number (default 0) global - {not in Vi} Minimal number of screen lines to keep above and below the cursor. This will make some context visible around where you are working. If you set it to a very large value (999) the cursor line will always be @@ -5601,7 +5367,6 @@ A jump table for the options with a short description can be found at |Q_op|. global {not available when compiled without the |+scrollbind| feature} - {not in Vi} This is a comma-separated list of words that specifies how 'scrollbind' windows should behave. 'sbo' stands for ScrollBind Options. @@ -5640,7 +5405,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'secure'* *'nosecure'* *E523* 'secure' boolean (default off) global - {not in Vi} When on, ":autocmd", shell and write commands are not allowed in ".vimrc" and ".exrc" in the current directory and map commands are displayed. Switch it off only if you know that you will not run into @@ -5654,7 +5418,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'selection'* *'sel'* 'selection' 'sel' string (default "inclusive") global - {not in Vi} This option defines the behavior of the selection. It is only used in Visual and Select mode. Possible values: @@ -5676,7 +5439,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'selectmode'* *'slm'* 'selectmode' 'slm' string (default "") global - {not in Vi} This is a comma separated list of words, which specifies when to start Select mode instead of Visual mode, when a selection is started. Possible values: @@ -5690,7 +5452,6 @@ A jump table for the options with a short description can be found at |Q_op|. 'sessionoptions' 'ssop' string (default: "blank,buffers,curdir,folds, help,options,tabpages,winsize") global - {not in Vi} {not available when compiled without the |+mksession| feature} Changes the effect of the |:mksession| command. It is a comma @@ -5769,7 +5530,6 @@ A jump table for the options with a short description can be found at |Q_op|. MS-DOS and Win32, when 'shell' does not contain "sh" somewhere: "/c") global - {not in Vi} Flag passed to the shell to execute "!" and ":!" commands; e.g., "bash.exe -c ls" or "command.com /c dir". For the MS-DOS-like systems, the default is set according to the value of 'shell', to @@ -5784,7 +5544,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'shellpipe'* *'sp'* 'shellpipe' 'sp' string (default ">", "| tee", "|& tee" or "2>&1| tee") global - {not in Vi} {not available when compiled without the |+quickfix| feature} String to be used to put the output of the ":make" command in the @@ -5820,7 +5579,6 @@ A jump table for the options with a short description can be found at |Q_op|. 'shellquote' 'shq' string (default: ""; MS-DOS and Win32, when 'shell' contains "sh" somewhere: "\"") global - {not in Vi} Quoting character(s), put around the command passed to the shell, for the "!" and ":!" commands. The redirection is kept outside of the quoting. See 'shellxquote' to include the redirection. It's @@ -5836,7 +5594,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'shellredir'* *'srr'* 'shellredir' 'srr' string (default ">", ">&" or ">%s 2>&1") global - {not in Vi} String to be used to put the output of a filter command in a temporary file. See also |:!|. See |option-backslash| about including spaces and backslashes. @@ -5862,7 +5619,7 @@ A jump table for the options with a short description can be found at |Q_op|. *'shellslash'* *'ssl'* *'noshellslash'* *'nossl'* 'shellslash' 'ssl' boolean (default off) global - {not in Vi} {only for MSDOS and MS-Windows} + {only for MSDOS and MS-Windows} When set, a forward slash is used when expanding file names. This is useful when a Unix-like shell is used instead of command.com or cmd.exe. Backward slashes can still be typed, but they are changed to @@ -5877,7 +5634,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'shelltemp'* *'stmp'* *'noshelltemp'* *'nostmp'* '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. When using a pipe is not possible temp files are used anyway. Currently a pipe is only supported on Unix and MS-Windows 2K and @@ -5895,7 +5651,6 @@ A jump table for the options with a short description can be found at |Q_op|. 'shellxescape' 'sxe' string (default: ""; for MS-DOS and MS-Windows: "\"&|<>()@^") global - {not in Vi} When 'shellxquote' is set to "(" then the characters listed in this option will be escaped with a '^' character. This makes it possible to execute most external commands with cmd.exe. @@ -5907,7 +5662,6 @@ A jump table for the options with a short description can be found at |Q_op|. somewhere: "\"" for Unix, when using system(): "\"") global - {not in Vi} Quoting character(s), put around the command passed to the shell, for the "!" and ":!" commands. Includes the redirection. See 'shellquote' to exclude the redirection. It's probably not useful @@ -5927,7 +5681,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'shiftround'* *'sr'* *'noshiftround'* *'nosr'* 'shiftround' 'sr' boolean (default off) global - {not in Vi} 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). @@ -5944,7 +5697,6 @@ A jump table for the options with a short description can be found at |Q_op|. 'shortmess' 'shm' string (Vim default "filnxtToO", Vi default: "", POSIX default: "A") global - {not in Vi} This option helps to avoid all the |hit-enter| prompts caused by file messages, for example with CTRL-G, and to avoid some other messages. It is a list of flags: @@ -5996,7 +5748,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'showbreak'* *'sbr'* *E595* 'showbreak' 'sbr' string (default "") global - {not in Vi} {not available when compiled without the |+linebreak| feature} String to put at the start of lines that have been wrapped. Useful @@ -6018,7 +5769,6 @@ A jump table for the options with a short description can be found at |Q_op|. 'showcmd' 'sc' boolean (Vim default: on (off for Unix), Vi default: off) global - {not in Vi} {not available when compiled without the |+cmdline_info| feature} Show (partial) command in the last line of the screen. Set this @@ -6034,7 +5784,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'showfulltag'* *'sft'* *'noshowfulltag'* *'nosft'* 'showfulltag' 'sft' boolean (default off) global - {not in Vi} When completing a word in insert mode (see |ins-completion|) from the tags file, show both the tag name and a tidied-up form of the search pattern (if there is one) as possible matches. Thus, if you have @@ -6076,7 +5825,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'showtabline'* *'stal'* 'showtabline' 'stal' number (default 1) global - {not in Vi} {not available when compiled without the |+windows| feature} The value of this option specifies when the line with tab page labels @@ -6091,7 +5839,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'sidescroll'* *'ss'* 'sidescroll' 'ss' number (default 0) global - {not in Vi} The minimal number of columns to scroll horizontally. Used only when the 'wrap' option is off and the cursor is moved off of the screen. When it is zero the cursor will be put in the middle of the screen. @@ -6102,7 +5849,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'sidescrolloff'* *'siso'* 'sidescrolloff' 'siso' number (default 0) global - {not in Vi} The minimal number of screen columns to keep to the left and to the right of the cursor if 'nowrap' is set. Setting this option to a value greater than 0 while having |'sidescroll'| also at a non-zero @@ -6123,7 +5869,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'smartcase'* *'scs'* *'nosmartcase'* *'noscs'* 'smartcase' 'scs' boolean (default off) global - {not in Vi} Override the 'ignorecase' option if the search pattern contains upper case characters. Only used when the search pattern is typed and 'ignorecase' option is on. Used for the commands "/", "?", "n", "N", @@ -6134,7 +5879,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'smartindent'* *'si'* *'nosmartindent'* *'nosi'* 'smartindent' 'si' boolean (default off) local to buffer - {not in Vi} {not available when compiled without the |+smartindent| feature} Do smart autoindenting when starting a new line. Works for C-like @@ -6161,7 +5905,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'smarttab'* *'sta'* *'nosmarttab'* *'nosta'* 'smarttab' 'sta' boolean (default off) global - {not in Vi} When on, a <Tab> in front of a line inserts blanks according to 'shiftwidth'. 'tabstop' or 'softtabstop' is used in other places. A <BS> will delete a 'shiftwidth' worth of space at the start of the @@ -6176,7 +5919,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'softtabstop'* *'sts'* 'softtabstop' 'sts' number (default 0) local to buffer - {not in Vi} Number of spaces that a <Tab> counts for while performing editing operations, like inserting a <Tab> or using <BS>. It "feels" like <Tab>s are being inserted, while in fact a mix of spaces and <Tab>s is @@ -6194,7 +5936,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'spell'* *'nospell'* 'spell' boolean (default off) local to window - {not in Vi} {not available when compiled without the |+syntax| feature} When on spell checking will be done. See |spell|. @@ -6203,7 +5944,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'spellcapcheck'* *'spc'* 'spellcapcheck' 'spc' string (default "[.?!]\_[\])'" \t]\+") local to buffer - {not in Vi} {not available when compiled without the |+syntax| feature} Pattern to locate the end of a sentence. The following word will be @@ -6219,7 +5959,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'spellfile'* *'spf'* 'spellfile' 'spf' string (default empty) local to buffer - {not in Vi} {not available when compiled without the |+syntax| feature} Name of the word list file where words are added for the |zg| and |zw| @@ -6246,7 +5985,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'spelllang'* *'spl'* 'spelllang' 'spl' string (default "en") local to buffer - {not in Vi} {not available when compiled without the |+syntax| feature} A comma separated list of word list names. When the 'spell' option is @@ -6289,7 +6027,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'spellsuggest'* *'sps'* 'spellsuggest' 'sps' string (default "best") global - {not in Vi} {not available when compiled without the |+syntax| feature} Methods used for spelling suggestions. Both for the |z=| command and @@ -6355,7 +6092,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'splitbelow'* *'sb'* *'nosplitbelow'* *'nosb'* 'splitbelow' 'sb' boolean (default off) global - {not in Vi} {not available when compiled without the |+windows| feature} When on, splitting a window will put the new window below the current @@ -6364,7 +6100,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'splitright'* *'spr'* *'nosplitright'* *'nospr'* 'splitright' 'spr' boolean (default off) global - {not in Vi} {not available when compiled without the |+vertsplit| feature} When on, splitting a window will put the new window right of the @@ -6373,7 +6108,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'startofline'* *'sol'* *'nostartofline'* *'nosol'* 'startofline' 'sol' boolean (default on) global - {not in Vi} When "on" the commands listed below move the cursor to the first non-blank of the line. When off the cursor is kept in the same column (if possible). This applies to the commands: CTRL-D, CTRL-U, CTRL-B, @@ -6387,7 +6121,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'statusline'* *'stl'* *E540* *E542* 'statusline' 'stl' string (default empty) global or local to window |global-local| - {not in Vi} {not available when compiled without the |+statusline| feature} When nonempty, this option determines the content of the status line. @@ -6553,7 +6286,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'suffixes'* *'su'* 'suffixes' 'su' string (default ".bak,~,.o,.h,.info,.swp,.obj") global - {not in Vi} Files with these suffixes get a lower priority when multiple files match a wildcard. See |suffixes|. Commas can be used to separate the suffixes. Spaces after the comma are ignored. A dot is also seen as @@ -6568,7 +6300,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'suffixesadd'* *'sua'* 'suffixesadd' 'sua' string (default "") local to buffer - {not in Vi} {not available when compiled without the |+file_in_path| feature} Comma separated list of suffixes, which are used when searching for a @@ -6578,7 +6309,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'swapfile'* *'swf'* *'noswapfile'* *'noswf'* 'swapfile' 'swf' boolean (default on) local to buffer - {not in Vi} Use a swapfile for the buffer. This option can be reset when a swapfile is not wanted for a specific buffer. For example, with confidential information that even root must not be able to access. @@ -6600,7 +6330,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'swapsync'* *'sws'* 'swapsync' 'sws' string (default "fsync") global - {not in Vi} When this option is not empty a swap file is synced to disk after writing to it. This takes some time, especially on busy unix systems. When this option is empty parts of the swap file may be in memory and @@ -6615,7 +6344,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'switchbuf'* *'swb'* 'switchbuf' 'swb' string (default "") global - {not in Vi} This option controls the behavior when switching between buffers. Possible values (comma separated list): useopen If included, jump to the first open window that @@ -6636,7 +6364,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'synmaxcol'* *'smc'* 'synmaxcol' 'smc' number (default 3000) local to buffer - {not in Vi} {not available when compiled without the |+syntax| feature} Maximum column in which to search for syntax items. In long lines the @@ -6649,7 +6376,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'syntax'* *'syn'* 'syntax' 'syn' string (default empty) local to buffer - {not in Vi} {not available when compiled without the |+syntax| feature} When this option is set, the syntax with this name is loaded, unless @@ -6679,7 +6405,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'tabline'* *'tal'* 'tabline' 'tal' string (default empty) global - {not in Vi} {not available when compiled without the |+windows| feature} When nonempty, this option determines the content of the tab pages @@ -6703,7 +6428,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'tabpagemax'* *'tpm'* 'tabpagemax' 'tpm' number (default 10) global - {not in Vi} {not available when compiled without the |+windows| feature} Maximum number of tab pages to be opened by the |-p| command line @@ -6740,7 +6464,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'tagbsearch'* *'tbs'* *'notagbsearch'* *'notbs'* 'tagbsearch' 'tbs' boolean (default on) global - {not in Vi} When searching for a tag (e.g., for the |:ta| command), Vim can either use a binary search or a linear search in a tags file. Binary searching makes searching for a tag a LOT faster, but a linear search @@ -6782,7 +6505,6 @@ A jump table for the options with a short description can be found at |Q_op|. must be included in the tags file. This option doesn't affect commands that find all matching tags (e.g., command-line completion and ":help"). - {Vi: always uses binary search in some versions} *'taglength'* *'tl'* 'taglength' 'tl' number (default 0) @@ -6792,7 +6514,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'tagrelative'* *'tr'* *'notagrelative'* *'notr'* 'tagrelative' 'tr' boolean (Vim default: on, Vi default: off) global - {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. @@ -6822,12 +6543,10 @@ A jump table for the options with a short description can be found at |Q_op|. The use of |:set+=| and |:set-=| is preferred when adding or removing file names from the list. This avoids problems when a future version uses another default. - {Vi: default is "tags /usr/lib/tags"} *'tagstack'* *'tgst'* *'notagstack'* *'notgst'* 'tagstack' 'tgst' boolean (default on) global - {not in all versions of Vi} When on, the |tagstack| is used normally. When off, a ":tag" or ":tselect" command with an argument will not push the tag onto the tagstack. A following ":tag" without an argument, a ":pop" command or @@ -6854,7 +6573,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'notermbidi'* *'notbidi'* 'termbidi' 'tbidi' boolean (default off, on for "mlterm") global - {not in Vi} {only available when compiled with the |+arabic| feature} The terminal is in charge of Bi-directionality of text (as specified @@ -6873,7 +6591,6 @@ A jump table for the options with a short description can be found at |Q_op|. global {only available when compiled with the |+multi_byte| feature} - {not in Vi} Encoding used for the terminal. This specifies what character encoding the keyboard produces and the display will understand. For the GUI it only applies to the keyboard ( 'encoding' is used for the @@ -6912,7 +6629,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'textwidth'* *'tw'* 'textwidth' 'tw' number (default 0) local to buffer - {not in Vi} Maximum width of text that is being inserted. A longer line will be broken after white space to get this width. A zero value disables this. 'textwidth' is set to 0 when the 'paste' option is set. When @@ -6923,7 +6639,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'thesaurus'* *'tsr'* 'thesaurus' 'tsr' string (default "") global or local to buffer |global-local| - {not in Vi} List of file names, separated by commas, that are used to lookup words for thesaurus completion commands |i_CTRL-X_CTRL-T|. Each line in the file should contain words with similar meaning, separated by @@ -6942,7 +6657,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'tildeop'* *'top'* *'notildeop'* *'notop'* 'tildeop' 'top' boolean (default off) global - {not in Vi} When on: The tilde command "~" behaves like an operator. *'timeout'* *'to'* *'notimeout'* *'noto'* @@ -6956,7 +6670,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'ttimeout'* *'nottimeout'* 'ttimeout' boolean (default off) global - {not in Vi} This option and 'ttimeoutlen' determine the behavior when part of a key code sequence has been received by the terminal UI. For example, if the \x1b byte is received and 'ttimeout' is set, Nvim will wait @@ -6968,20 +6681,17 @@ A jump table for the options with a short description can be found at |Q_op|. global The time in milliseconds that is waited for a mapped sequence to complete. - {not in all versions of Vi} *'ttimeoutlen'* *'ttm'* 'ttimeoutlen' 'ttm' number (default -1) global - {not in Vi} - The time in milliseconds that is waited for a key code + The time in milliseconds that is waited for a key code sequence to complete. Also used for CTRL-\ CTRL-N and CTRL-\ CTRL-G when part of a command has been typed. *'title'* *'notitle'* 'title' boolean (default off, on when title can be restored) global - {not in Vi} {not available when compiled without the |+title| feature} When on, the title of the window will be set to the value of @@ -7017,7 +6727,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'titlelen'* 'titlelen' number (default 85) global - {not in Vi} {not available when compiled without the |+title| feature} Gives the percentage of 'columns' to use for the length of the window @@ -7033,7 +6742,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'titleold'* 'titleold' string (default "Thanks for flying Vim") global - {not in Vi} {only available when compiled with the |+title| feature} This option will be used for the window title when exiting Vim if the @@ -7044,7 +6752,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'titlestring'* 'titlestring' string (default "") global - {not in Vi} {not available when compiled without the |+title| feature} When this option is not empty, it will be used for the title of the @@ -7099,7 +6806,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'toolbariconsize'* *'tbis'* 'toolbariconsize' 'tbis' string (default "small") global - {not in Vi} {only in the GTK+ 2 GUI} Controls the size of toolbar icons. The possible values are: tiny Use tiny toolbar icons. @@ -7122,7 +6828,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'ttymouse'* *'ttym'* 'ttymouse' 'ttym' string (default depends on 'term') global - {not in Vi} {only in Unix, doesn't work in the GUI; not available when compiled without |+mouse|} Name of the terminal type for which mouse codes are to be recognized. @@ -7198,7 +6903,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'undodir'* *'udir'* 'undodir' 'udir' string (default ".") global - {not in Vi} {only when compiled with the |+persistent_undo| feature} List of directory names for undo files, separated with commas. See |'backupdir'| for details of the format. @@ -7216,7 +6920,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'undofile'* *'noundofile'* *'udf'* *'noudf'* 'undofile' 'udf' boolean (default off) local to buffer - {not in Vi} {only when compiled with the |+persistent_undo| feature} When on, Vim automatically saves undo history to an undo file when writing a buffer to a file, and restores undo history from the same @@ -7230,7 +6933,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'undolevels'* *'ul'* 'undolevels' 'ul' number (default 100, 1000 for Unix and Win32) global or local to buffer |global-local| - {not in Vi} Maximum number of changes that can be undone. Since undo information is kept in memory, higher numbers will cause more memory to be used (nevertheless, a single change can use an unlimited amount of memory). @@ -7249,7 +6951,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'undoreload'* *'ur'* 'undoreload' 'ur' number (default 10000) global - {not in Vi} Save the whole buffer for undo when reloading it. This applies to the ":e!" command and reloading for when the buffer changed outside of Vim. |FileChangedShell| @@ -7265,7 +6966,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'updatecount'* *'uc'* 'updatecount' 'uc' number (default: 200) global - {not in Vi} After typing this many characters the swap file will be written to disk. When zero, no swap file will be created at all (see chapter on recovery |crash-recovery|). 'updatecount' is set to zero by starting @@ -7282,7 +6982,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'updatetime'* *'ut'* 'updatetime' 'ut' number (default 4000) global - {not in Vi} If this many milliseconds nothing is typed the swap file will be written to disk (see |crash-recovery|). Also used for the |CursorHold| autocommand event. @@ -7290,8 +6989,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'verbose'* *'vbs'* 'verbose' 'vbs' number (default 0) global - {not in Vi, although some versions have a boolean - verbose option} When bigger than zero, Vim will give messages about what it is doing. Currently, these messages are given: >= 1 When the viminfo file is read or written. @@ -7313,7 +7010,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'verbosefile'* *'vfile'* 'verbosefile' 'vfile' string (default empty) global - {not in Vi} When not empty all messages are written in a file with this name. When the file exists messages are appended. Writing to the file ends when Vim exits or when 'verbosefile' is made @@ -7326,7 +7022,6 @@ A jump table for the options with a short description can be found at |Q_op|. 'viewdir' 'vdir' string (default for MS-DOS and Win32: "$VIM/vimfiles/view", for Unix: "~/.vim/view") global - {not in Vi} {not available when compiled without the |+mksession| feature} Name of the directory where to store files for |:mkview|. @@ -7336,7 +7031,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'viewoptions'* *'vop'* 'viewoptions' 'vop' string (default: "folds,options,cursor") global - {not in Vi} {not available when compiled without the |+mksession| feature} Changes the effect of the |:mkview| command. It is a comma separated @@ -7363,7 +7057,6 @@ A jump table for the options with a short description can be found at |Q_op|. others: '100,<50,s10,h Vi default: "") global - {not in Vi} {not available when compiled without the |+viminfo| feature} When non-empty, the viminfo file is read upon startup and written @@ -7476,7 +7169,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'virtualedit'* *'ve'* 'virtualedit' 've' string (default "") global - {not in Vi} {not available when compiled without the |+virtualedit| feature} A comma separated list of these words: @@ -7504,7 +7196,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'visualbell'* *'vb'* *'novisualbell'* *'novb'* *beep* 'visualbell' 'vb' boolean (default off) global - {not in Vi} Use visual bell instead of beeping. The terminal code to display the visual bell is given with 't_vb'. When no beep or flash is wanted, use ":set vb t_vb=". @@ -7523,7 +7214,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'weirdinvert'* *'wiv'* *'noweirdinvert'* *'nowiv'* 'weirdinvert' 'wiv' boolean (default off) global - {not in Vi} This option has the same effect as the 't_xs' terminal option. It is provided for backwards compatibility with version 4.x. Setting 'weirdinvert' has the effect of making 't_xs' non-empty, and @@ -7532,7 +7222,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'whichwrap'* *'ww'* 'whichwrap' 'ww' string (Vim default: "b,s", Vi default: "") global - {not in Vi} Allow specified keys that move the cursor left/right to move to the previous/next line when the cursor is on the first/last character in the line. Concatenate characters to allow this for these keys: @@ -7563,7 +7252,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'wildchar'* *'wc'* 'wildchar' 'wc' number (Vim default: <Tab>, Vi default: CTRL-E) global - {not in Vi} Character you have to type to start wildcard expansion in the command-line, as specified with 'wildmode'. More info here: |cmdline-completion|. @@ -7576,7 +7264,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'wildcharm'* *'wcm'* 'wildcharm' 'wcm' number (default: none (0)) global - {not in Vi} 'wildcharm' works exactly like 'wildchar', except that it is recognized when used inside a macro. You can find "spare" command-line keys suitable for this option by looking at |ex-edit-index|. Normally @@ -7589,7 +7276,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'wildignore'* *'wig'* 'wildignore' 'wig' string (default "") global - {not in Vi} {not available when compiled without the |+wildignore| feature} A list of file patterns. A file that matches with one of these @@ -7608,7 +7294,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'wildignorecase'* *'wic'* *'nowildignorecase'* *'nowic'* 'wildignorecase' 'wic' boolean (default off) global - {not in Vi} When set case is ignored when completing file names and directories. Has no effect when 'fileignorecase' is set. Does not apply when the shell is used to expand wildcards, which @@ -7618,7 +7303,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'wildmenu'* *'wmnu'* *'nowildmenu'* *'nowmnu'* 'wildmenu' 'wmnu' boolean (default off) global - {not in Vi} {not available if compiled without the |+wildmenu| feature} When 'wildmenu' is on, command-line completion operates in an enhanced @@ -7659,7 +7343,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'wildmode'* *'wim'* 'wildmode' 'wim' string (Vim default: "full") global - {not in Vi} Completion mode that is used for the character specified with 'wildchar'. It is a comma separated list of up to four parts. Each part specifies what to do for each consecutive use of 'wildchar'. The @@ -7697,7 +7380,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'wildoptions'* *'wop'* 'wildoptions' 'wop' string (default "") global - {not in Vi} {not available when compiled without the |+wildignore| feature} A list of words that change how command line completion is done. @@ -7712,7 +7394,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'winaltkeys'* *'wak'* 'winaltkeys' 'wak' string (default "menu") global - {not in Vi} {only used in Win32, Motif, and GTK} Some GUI versions allow the access to menu entries by using the ALT key in combination with a character that appears underlined in the @@ -7743,12 +7424,10 @@ A jump table for the options with a short description can be found at |Q_op|. in a much smarter way, taking care of wrapping lines. When resizing the Vim window, the value is smaller than 1 or more than or equal to 'lines' it will be set to 'lines' minus 1. - {Vi also uses the option to specify the number of displayed lines} *'winheight'* *'wh'* *E591* 'winheight' 'wh' number (default 1) global - {not in Vi} {not available when compiled without the |+windows| feature} Minimal number of lines for the current window. This is not a hard @@ -7771,7 +7450,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'winfixheight'* *'wfh'* *'nowinfixheight'* *'nowfh'* 'winfixheight' 'wfh' boolean (default off) local to window - {not in Vi} {not available when compiled without the |+windows| feature} Keep the window height when windows are opened or closed and @@ -7782,7 +7460,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'winfixwidth'* *'wfw'* *'nowinfixwidth'* *'nowfw'* 'winfixwidth' 'wfw' boolean (default off) local to window - {not in Vi} {not available when compiled without the |+windows| feature} Keep the window width when windows are opened or closed and @@ -7792,7 +7469,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'winminheight'* *'wmh'* 'winminheight' 'wmh' number (default 1) global - {not in Vi} {not available when compiled without the |+windows| feature} The minimal height of a window, when it's not the current window. @@ -7808,7 +7484,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'winminwidth'* *'wmw'* 'winminwidth' 'wmw' number (default 1) global - {not in Vi} {not available when compiled without the |+vertsplit| feature} The minimal width of a window, when it's not the current window. @@ -7825,7 +7500,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'winwidth'* *'wiw'* *E592* 'winwidth' 'wiw' number (default 20) global - {not in Vi} {not available when compiled without the |+vertsplit| feature} Minimal number of columns for the current window. This is not a hard @@ -7841,7 +7515,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'wrap'* *'nowrap'* 'wrap' boolean (default on) local to window - {not in Vi} This option changes how text is displayed. It doesn't change the text in the buffer, see 'textwidth' for that. When on, lines longer than the width of the window will wrap and @@ -7867,8 +7540,7 @@ A jump table for the options with a short description can be found at |Q_op|. Options that add a margin, such as 'number' and 'foldcolumn', cause the text width to be further reduced. This is Vi compatible. When 'textwidth' is non-zero, this option is not used. - See also 'formatoptions' and |ins-textwidth|. {Vi: works differently - and less usefully} + See also 'formatoptions' and |ins-textwidth|. *'wrapscan'* *'ws'* *'nowrapscan'* *'nows'* 'wrapscan' 'ws' boolean (default on) *E384* *E385* @@ -7879,7 +7551,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'write'* *'nowrite'* 'write' boolean (default on) global - {not in Vi} Allows writing files. When not set, writing a file is not allowed. Can be used for a view-only mode, where modifications to the text are still allowed. Can be reset with the |-m| or |-M| command line @@ -7895,7 +7566,6 @@ A jump table for the options with a short description can be found at |Q_op|. 'writebackup' 'wb' boolean (default on with |+writebackup| feature, off otherwise) global - {not in Vi} Make a backup before overwriting a file. The backup is removed after the file was successfully written, unless the 'backup' option is also on. @@ -7910,7 +7580,6 @@ A jump table for the options with a short description can be found at |Q_op|. *'writedelay'* *'wd'* 'writedelay' 'wd' number (default 0) global - {not in Vi} The number of microseconds to wait for each character sent to the screen. When non-zero, characters are sent to the terminal one by one. For MS-DOS pcterm this does not work. For debugging purposes. diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index 322811b7cf..1a76a4749a 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -59,11 +59,11 @@ explanations are in chapter 27 |usr_27.txt|. *n* n Repeat the latest "/" or "?" [count] times. - |last-pattern| {Vi: no count} + |last-pattern| *N* N Repeat the latest "/" or "?" [count] times in - opposite direction. |last-pattern| {Vi: no count} + opposite direction. |last-pattern| *star* *E348* *E349* * Search forward for the [count]'th occurrence of the @@ -76,24 +76,24 @@ N Repeat the latest "/" or "?" [count] times in 4. the first non-blank word after the cursor, in the current line Only whole keywords are searched for, like with the - command "/\<keyword\>". |exclusive| {not in Vi} + command "/\<keyword\>". |exclusive| 'ignorecase' is used, 'smartcase' is not. *#* # Same as "*", but search backward. The pound sign (character 163) also works. If the "#" key works as backspace, try using "stty erase <BS>" before starting - Vim (<BS> is CTRL-H or a real backspace). {not in Vi} + Vim (<BS> is CTRL-H or a real backspace). *gstar* g* Like "*", but don't put "\<" and "\>" around the word. This makes the search also find matches that are not a - whole word. {not in Vi} + whole word. *g#* g# Like "#", but don't put "\<" and "\>" around the word. This makes the search also find matches that are not a - whole word. {not in Vi} + whole word. *gd* gd Goto local Declaration. When the cursor is on a local @@ -111,22 +111,21 @@ gd Goto local Declaration. When the cursor is on a local searched use the commands listed in |include-search|. After this command |n| searches forward for the next match (not backward). - {not in Vi} *gD* gD Goto global Declaration. When the cursor is on a global variable that is defined in the file, this command will jump to its declaration. This works just like "gd", except that the search for the keyword - always starts in line 1. {not in Vi} + always starts in line 1. *1gd* 1gd Like "gd", but ignore matches inside a {} block that - ends before the cursor position. {not in Vi} + ends before the cursor position. *1gD* 1gD Like "gD", but ignore matches inside a {} block that - ends before the cursor position. {not in Vi} + ends before the cursor position. *CTRL-C* CTRL-C Interrupt current (search) command. Use CTRL-Break on @@ -158,7 +157,7 @@ error message |:s_flags|. *search-offset* *{offset}* These commands search for the specified pattern. With "/" and "?" an additional offset may be given. There are two types of offsets: line offsets -and character offsets. {the character offsets are not in Vi} +and character offsets. The offset gives the cursor position relative to the found match: [num] [num] lines downwards, in column 1 @@ -361,7 +360,7 @@ into a problem or want to specifically select one engine or the other, you can prepend one of the following to the pattern: \%#=0 Force automatic selection. Only has an effect when - 'regexpengine' has been set to a non-zero value. + 'regexpengine' has been set to a non-zero value. \%#=1 Force using the old engine. \%#=2 Force using the NFA engine. @@ -425,30 +424,28 @@ More explanation and examples below, follow the links. *E64* *E871* multi ~ 'magic' 'nomagic' matches of the preceding atom ~ |/star| * \* 0 or more as many as possible -|/\+| \+ \+ 1 or more as many as possible (*) -|/\=| \= \= 0 or 1 as many as possible (*) -|/\?| \? \? 0 or 1 as many as possible (*) - -|/\{| \{n,m} \{n,m} n to m as many as possible (*) - \{n} \{n} n exactly (*) - \{n,} \{n,} at least n as many as possible (*) - \{,m} \{,m} 0 to m as many as possible (*) - \{} \{} 0 or more as many as possible (same as *) (*) - -|/\{-| \{-n,m} \{-n,m} n to m as few as possible (*) - \{-n} \{-n} n exactly (*) - \{-n,} \{-n,} at least n as few as possible (*) - \{-,m} \{-,m} 0 to m as few as possible (*) - \{-} \{-} 0 or more as few as possible (*) +|/\+| \+ \+ 1 or more as many as possible +|/\=| \= \= 0 or 1 as many as possible +|/\?| \? \? 0 or 1 as many as possible + +|/\{| \{n,m} \{n,m} n to m as many as possible + \{n} \{n} n exactly + \{n,} \{n,} at least n as many as possible + \{,m} \{,m} 0 to m as many as possible + \{} \{} 0 or more as many as possible (same as *) + +|/\{-| \{-n,m} \{-n,m} n to m as few as possible + \{-n} \{-n} n exactly + \{-n,} \{-n,} at least n as few as possible + \{-,m} \{-,m} 0 to m as few as possible + \{-} \{-} 0 or more as few as possible *E59* -|/\@>| \@> \@> 1, like matching a whole pattern (*) -|/\@=| \@= \@= nothing, requires a match |/zero-width| (*) -|/\@!| \@! \@! nothing, requires NO match |/zero-width| (*) -|/\@<=| \@<= \@<= nothing, requires a match behind |/zero-width| (*) -|/\@<!| \@<! \@<! nothing, requires NO match behind |/zero-width| (*) - -(*) {not in Vi} +|/\@>| \@> \@> 1, like matching a whole pattern +|/\@=| \@= \@= nothing, requires a match |/zero-width| +|/\@!| \@! \@! nothing, requires NO match |/zero-width| +|/\@<=| \@<= \@<= nothing, requires a match behind |/zero-width| +|/\@<!| \@<! \@<! nothing, requires NO match behind |/zero-width| Overview of ordinary atoms. */ordinary-atom* @@ -477,7 +474,7 @@ More explanation and examples below, follow the links. |/\%c| \%23c \%23c in column 23 |/zero-width| |/\%v| \%23v \%23v in virtual column 23 |/zero-width| -Character classes {not in Vi}: */character-classes* +Character classes: */character-classes* |/\i| \i \i identifier character (see 'isident' option) |/\I| \I \I like "\i", but excluding digits |/\k| \k \k keyword character (see 'iskeyword' option) @@ -514,7 +511,7 @@ Character classes {not in Vi}: */character-classes* |/\b| \b \b <BS> |/\n| \n \n end-of-line |/~| ~ \~ last given substitute string -|/\1| \1 \1 same string as matched by first \(\) {not in Vi} +|/\1| \1 \1 same string as matched by first \(\) |/\2| \2 \2 Like "\1", but uses second \(\) ... |/\9| \9 \9 Like "\1", but uses ninth \(\) @@ -591,20 +588,19 @@ overview. character at a time. */\+* *E57* -\+ Matches 1 or more of the preceding atom, as many as possible. {not in - Vi} +\+ Matches 1 or more of the preceding atom, as many as possible. Example matches ~ ^.\+$ any non-empty line \s\+ white space of at least one character */\=* -\= Matches 0 or 1 of the preceding atom, as many as possible. {not in Vi} +\= Matches 0 or 1 of the preceding atom, as many as possible. Example matches ~ foo\= "fo" and "foo" */\?* \? Just like \=. Cannot be used when searching backwards with the "?" - command. {not in Vi} + command. */\{* *E58* *E60* *E554* *E870* \{n,m} Matches n to m of the preceding atom, as many as possible @@ -618,7 +614,6 @@ overview. \{-n,} matches at least n of the preceding atom, as few as possible \{-,m} matches 0 to m of the preceding atom, as few as possible \{-} matches 0 or more of the preceding atom, as few as possible - {Vi does not have any of these} n and m are positive decimal numbers or zero *non-greedy* @@ -641,7 +636,7 @@ overview. The } may optionally be preceded with a backslash: \{n,m\}. */\@=* -\@= Matches the preceding atom with zero width. {not in Vi} +\@= Matches the preceding atom with zero width. Like "(?=pattern)" in Perl. Example matches ~ foo\(bar\)\@= "foo" in "foobar" @@ -661,7 +656,7 @@ overview. */\@!* \@! Matches with zero width if the preceding atom does NOT match at the - current position. |/zero-width| {not in Vi} + current position. |/zero-width| Like "(?!pattern)" in Perl. Example matches ~ foo\(bar\)\@! any "foo" not followed by "bar" @@ -691,7 +686,7 @@ overview. */\@<=* \@<= Matches with zero width if the preceding atom matches just before what - follows. |/zero-width| {not in Vi} + follows. |/zero-width| Like "(?<=pattern)" in Perl, but Vim allows non-fixed-width patterns. Example matches ~ \(an\_s\+\)\@<=file "file" after "an" and white space or an @@ -735,7 +730,7 @@ overview. \@<! Matches with zero width if the preceding atom does NOT match just before what follows. Thus this matches if there is no position in the current or previous line where the atom matches such that it ends just - before what follows. |/zero-width| {not in Vi} + before what follows. |/zero-width| Like "(?<!pattern)" in Perl, but Vim allows non-fixed-width patterns. The match with the preceding atom is made to end just before the match with what follows, thus an atom that ends in ".*" will work. @@ -751,7 +746,7 @@ overview. slow. */\@>* -\@> Matches the preceding atom like matching a whole pattern. {not in Vi} +\@> Matches the preceding atom like matching a whole pattern. Like "(?>pattern)" in Perl. Example matches ~ \(a*\)\@>a nothing (the "a*" takes all the "a"'s, there can't be @@ -830,7 +825,7 @@ $ At end of pattern or in front of "\|", "\)" or "\n" ('magic' on): /\(.\{-}\zsFab\)\{3} < Finds the third occurrence of "Fab". This cannot be followed by a multi. *E888* - {not in Vi} {not available when compiled without the |+syntax| feature} + */\ze* \ze Matches at any position, and sets the end of the match there: The previous char is the last char of the whole match. |/zero-width| @@ -839,17 +834,16 @@ $ At end of pattern or in front of "\|", "\)" or "\n" ('magic' on): Example: "end\ze\(if\|for\)" matches the "end" in "endif" and "endfor". This cannot be followed by a multi. |E888| - {not in Vi} {not available when compiled without the |+syntax| feature} */\%^* *start-of-file* \%^ Matches start of the file. When matching with a string, matches the - start of the string. {not in Vi} + start of the string. For example, to find the first "VIM" in a file: > /\%^\_.\{-}\zsVIM < */\%$* *end-of-file* \%$ Matches end of the file. When matching with a string, matches the - end of the string. {not in Vi} + end of the string. Note that this does NOT find the last "VIM" in a file: > /VIM\_.\{-}\%$ < It will find the next VIM, because the part after it will always @@ -870,7 +864,7 @@ $ At end of pattern or in front of "\|", "\)" or "\n" ('magic' on): */\%#* *cursor-position* \%# Matches with the cursor position. Only works when matching in a - buffer displayed in a window. {not in Vi} + buffer displayed in a window. WARNING: When the cursor is moved after the pattern was used, the result becomes invalid. Vim doesn't automatically update the matches. This is especially relevant for syntax highlighting and 'hlsearch'. @@ -891,7 +885,6 @@ $ At end of pattern or in front of "\|", "\)" or "\n" ('magic' on): < Note that two dots are required to include mark 'e in the match. That is because "\%<'e" matches at the character before the 'e mark, and since it's a |/zero-width| match it doesn't include that character. - {not in Vi} WARNING: When the mark is moved after the pattern was used, the result becomes invalid. Vim doesn't automatically update the matches. Similar to moving the cursor for "\%#" |/\%#|. @@ -901,7 +894,7 @@ $ At end of pattern or in front of "\|", "\)" or "\n" ('magic' on): \%<23l Matches above a specific line (lower line number). \%>23l Matches below a specific line (higher line number). These three can be used to match specific lines in a buffer. The "23" - can be any line number. The first line is 1. {not in Vi} + can be any line number. The first line is 1. WARNING: When inserting or deleting lines Vim does not automatically update the matches. This means Syntax highlighting quickly becomes wrong. @@ -917,7 +910,7 @@ $ At end of pattern or in front of "\|", "\)" or "\n" ('magic' on): These three can be used to match specific columns in a buffer or string. The "23" can be any column number. The first column is 1. Actually, the column is the byte number (thus it's not exactly right - for multi-byte characters). {not in Vi} + for multi-byte characters). WARNING: When inserting or deleting text Vim does not automatically update the matches. This means Syntax highlighting quickly becomes wrong. @@ -939,7 +932,7 @@ $ At end of pattern or in front of "\|", "\)" or "\n" ('magic' on): The "23" can be any column number. The first column is 1. Note that some virtual column positions will never match, because they are halfway through a tab or other character that occupies more than - one screen character. {not in Vi} + one screen character. WARNING: When inserting or deleting text Vim does not automatically update highlighted matches. This means Syntax highlighting quickly becomes wrong. @@ -958,7 +951,7 @@ $ At end of pattern or in front of "\|", "\)" or "\n" ('magic' on): /.*\%<18v. < -Character classes: {not in Vi} +Character classes: \i identifier character (see 'isident' option) */\i* \I like "\i", but excluding digits */\I* \k keyword character (see 'iskeyword' option) */\k* @@ -1018,7 +1011,7 @@ match ASCII characters, as indicated by the range. *E51* *E54* *E55* *E872* *E873* \1 Matches the same string that was matched by */\1* *E65* - the first sub-expression in \( and \). {not in Vi} + the first sub-expression in \( and \). Example: "\([a-z]\).\1" matches "ata", "ehe", "tot", etc. \2 Like "\1", but uses second sub-expression, */\2* ... */\3* @@ -1030,7 +1023,6 @@ match ASCII characters, as indicated by the range. \%(\) A pattern enclosed by escaped parentheses. */\%(\)* */\%(* *E53* Just like \(\), but without counting it as a sub-expression. This allows using more groups and it's a little bit faster. - {not in Vi} x A single character, with no special meaning, matches itself @@ -1108,7 +1100,7 @@ x A single character, with no special meaning, matches itself backslash before it: "[xyz\]]", "[\^xyz]", "[xy\-z]" and "[xyz\\]". (Note: POSIX does not support the use of a backslash this way). For ']' you can also make it the first character (following a possible - "^"): "[]xyz]" or "[^]xyz]" {not in Vi}. + "^"): "[]xyz]" or "[^]xyz]". For '-' you can also make it the first or last character: "[-xyz]", "[^-xyz]" or "[xyz-]". For '\' you can also let it be followed by any character that's not in "^]-\bdertnoUux". "[\xyz]" matches '\', @@ -1117,7 +1109,7 @@ x A single character, with no special meaning, matches itself - Omitting the trailing ] is not considered an error. "[]" works like "[]]", it matches the ']' character. - The following translations are accepted when the 'l' flag is not - included in 'cpoptions' {not in Vi}: + included in 'cpoptions': \e <Esc> \t <Tab> \r <CR> (NOT end-of-line!) @@ -1197,7 +1189,7 @@ files. To match a <Nul> with a search pattern you can just enter CTRL-@ or "CTRL-V 000". This is probably just what you expect. Internally the character is replaced with a <NL> in the search pattern. What is unusual is that typing CTRL-V CTRL-J also inserts a <NL>, thus also searches for a <Nul> -in the file. {Vi cannot handle <Nul> characters in the file at all} +in the file. *CR-used-for-NL* When 'fileformat' is "mac", <NL> characters in the file are stored as <CR> diff --git a/runtime/doc/pi_gzip.txt b/runtime/doc/pi_gzip.txt index a3998d567a..df0ba5e52e 100644 --- a/runtime/doc/pi_gzip.txt +++ b/runtime/doc/pi_gzip.txt @@ -13,8 +13,6 @@ This plugin is only available if 'compatible' is not set. You can avoid loading this plugin by setting the "loaded_gzip" variable: > :let loaded_gzip = 1 -{Vi does not have any of this} - ============================================================================== 1. Autocommands *gzip-autocmd* diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt index 32f576af6a..1cffb7f7dd 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -108,8 +108,6 @@ Copyright: Copyright (C) 1999-2014 Charles E Campbell *netrw-copyright* 13. Todo..................................................|netrw-todo| 14. Credits...............................................|netrw-credits| -{Vi does not have any of this} - ============================================================================== 2. Starting With Netrw *netrw-start* {{{1 diff --git a/runtime/doc/print.txt b/runtime/doc/print.txt index 9d07819a1e..a6dce56c57 100644 --- a/runtime/doc/print.txt +++ b/runtime/doc/print.txt @@ -15,9 +15,6 @@ Printing *printing* 7. PostScript Utilities |postscript-print-util| 8. Formfeed Characters |printing-formfeed| -{Vi has None of this} -{only available when compiled with the |+printer| feature} - ============================================================================== 1. Introduction *print-intro* diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index 22a5e41fd1..419629faf0 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -16,11 +16,6 @@ This subject is introduced in section |30.1| of the user manual. 8. The directory stack |quickfix-directory-stack| 9. Specific error file formats |errorformats| -{Vi does not have any of these commands} - -The quickfix commands are not available when the |+quickfix| feature was -disabled at compile time. - ============================================================================= 1. Using QuickFix commands *quickfix* *Quickfix* *E42* diff --git a/runtime/doc/recover.txt b/runtime/doc/recover.txt index 99a0837224..53cb31f813 100644 --- a/runtime/doc/recover.txt +++ b/runtime/doc/recover.txt @@ -115,7 +115,6 @@ command: flag is present in 'cpoptions' the swap file will not be deleted for this buffer when Vim exits and the buffer is still loaded |cpo-&|. - {Vi: might also exit} A Vim swap file can be recognized by the first six characters: "b0VIM ". After that comes the version number, e.g., "3.0". @@ -180,7 +179,5 @@ recovered file. Or use |:DiffOrig|. Once you are sure the recovery is ok delete the swap file. Otherwise, you will continue to get warning messages that the ".swp" file already exists. -{Vi: recovers in another way and sends mail if there is something to recover} - vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/remote.txt b/runtime/doc/remote.txt index 87367e9ceb..e84b7fc5e9 100644 --- a/runtime/doc/remote.txt +++ b/runtime/doc/remote.txt @@ -10,8 +10,6 @@ Vim client-server communication *client-server* 2. X11 specific items |x11-clientserver| 3. MS-Windows specific items |w32-clientserver| -{Vi does not have any of these commands} - ============================================================================== 1. Common functionality *clientserver* diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt index 9cf445f361..847830af9b 100644 --- a/runtime/doc/repeat.txt +++ b/runtime/doc/repeat.txt @@ -106,11 +106,12 @@ To abort this type CTRL-C twice. q{0-9a-zA-Z"} Record typed characters into register {0-9a-zA-Z"} (uppercase to append). The 'q' command is disabled while executing a register, and it doesn't work inside - a mapping and |:normal|. {Vi: no recording} + a mapping and |:normal|. -q Stops recording. (Implementation note: The 'q' that - stops recording is not stored in the register, unless - it was the result of a mapping) {Vi: no recording} +q Stops recording. + Implementation note: The 'q' that stops recording is + not stored in the register, unless it was the result + of a mapping *@* @{0-9a-z".=*+} Execute the contents of register {0-9a-z".=*+} [count] @@ -122,7 +123,7 @@ q Stops recording. (Implementation note: The 'q' that applies. For "@=" you are prompted to enter an expression. The result of the expression is then executed. - See also |@:|. {Vi: only named registers} + See also |@:|. *@@* *E748* @@ Repeat the previous @{0-9a-z":*} [count] times. @@ -139,17 +140,14 @@ q Stops recording. (Implementation note: The 'q' that result of evaluating the expression is executed as an Ex command. Mappings are not recognized in these commands. - {Vi: only in some versions} Future: Will execute the - register for each line in the address range. *:@:* :[addr]@: Repeat last command-line. First set cursor at line - [addr] (default is current line). {not in Vi} + [addr] (default is current line). *:@@* :[addr]@@ Repeat the previous :@{0-9a-z"}. First set cursor at - line [addr] (default is current line). {Vi: only in - some versions} + line [addr] (default is current line). ============================================================================== 4. Using Vim scripts *using-scripts* @@ -168,7 +166,6 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|. |:bufdo|, in a loop or when another command follows the display won't be updated while executing the commands. - {not in Vi} *:ru* *:runtime* :ru[ntime][!] {file} .. @@ -200,7 +197,6 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|. when no file could be found. When 'verbose' is two or higher, there is a message about each searched file. - {not in Vi} :scripte[ncoding] [encoding] *:scripte* *:scriptencoding* *E167* Specify the character encoding used in the script. @@ -227,16 +223,10 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|. Mark) in utf-8 format Vim will recognize it, no need to use ":scriptencoding utf-8" then. - When compiled without the |+multi_byte| feature this - command is ignored. - {not in Vi} - *:scrip* *:scriptnames* :scrip[tnames] List all sourced script names, in the order they were first sourced. The number is used for the script ID |<SID>|. - {not in Vi} {not available when compiled without the - |+eval| feature} *:fini* *:finish* *E168* :fini[sh] Stop sourcing a script. Can only be used in a Vim @@ -246,7 +236,7 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|. following the ":finally" up to the matching |:endtry| are executed first. This process applies to all nested ":try"s in the script. The outermost ":endtry" - then stops sourcing the script. {not in Vi} + then stops sourcing the script. All commands and command sequences can be repeated by putting them in a named register and then executing it. There are two ways to get the commands in the @@ -387,7 +377,6 @@ sourced file or user function and set breakpoints. NOTE: The debugging mode is far from perfect. Debugging will have side effects on how Vim works. You cannot use it to debug everything. For example, the display is messed up by the debugging messages. -{Vi does not have a debug mode} An alternative to debug mode is setting the 'verbose' option. With a bigger number it will give more verbose messages about what Vim is doing. @@ -580,7 +569,6 @@ OBSCURE Profiling means that Vim measures the time that is spent on executing functions and/or scripts. The |+profile| feature is required for this. It is only included when Vim was compiled with "huge" features. -{Vi does not have profiling} You can also use the |reltime()| function to measure time. This only requires the |+reltime| feature, which is present more often. diff --git a/runtime/doc/rileft.txt b/runtime/doc/rileft.txt index f4b8f41fd3..b4d9347470 100644 --- a/runtime/doc/rileft.txt +++ b/runtime/doc/rileft.txt @@ -12,12 +12,6 @@ These functions were originally created by Avner Lottem: E-mail: alottem@iil.intel.com Phone: +972-4-8307322 -{Vi does not have any of these commands} - - *E26* -{only available when compiled with the |+rightleft| feature} - - Introduction ------------ Some languages such as Arabic, Farsi, Hebrew (among others) require the diff --git a/runtime/doc/scroll.txt b/runtime/doc/scroll.txt index b2c56634a0..8626a1a7f6 100644 --- a/runtime/doc/scroll.txt +++ b/runtime/doc/scroll.txt @@ -117,7 +117,7 @@ z<CR> Redraw, line [count] at top of window (default *zt* zt Like "z<CR>", but leave the cursor in the same - column. {not in Vi} + column. *zN<CR>* z{height}<CR> Redraw, make window {height} lines tall. This is @@ -133,7 +133,7 @@ z. Redraw, line [count] at center of window (default *zz* zz Like "z.", but leave the cursor in the same column. Careful: If caps-lock is on, this command becomes - "ZZ": write buffer and exit! {not in Vi} + "ZZ": write buffer and exit! *z-* z- Redraw, line [count] at bottom of window (default @@ -142,7 +142,6 @@ z- Redraw, line [count] at bottom of window (default *zb* zb Like "z-", but leave the cursor in the same column. - {not in Vi} ============================================================================== 4. Scrolling horizontally *scroll-horizontal* @@ -155,26 +154,22 @@ not used. z<Right> or *zl* *z<Right>* zl Move the view on the text [count] characters to the right, thus scroll the text [count] characters to the - left. This only works when 'wrap' is off. {not in - Vi} + left. This only works when 'wrap' is off. z<Left> or *zh* *z<Left>* zh Move the view on the text [count] characters to the left, thus scroll the text [count] characters to the - right. This only works when 'wrap' is off. {not in - Vi} + right. This only works when 'wrap' is off. *zL* zL Move the view on the text half a screenwidth to the right, thus scroll the text half a screenwidth to the - left. This only works when 'wrap' is off. {not in - Vi} + left. This only works when 'wrap' is off. *zH* zH Move the view on the text half a screenwidth to the left, thus scroll the text half a screenwidth to the - right. This only works when 'wrap' is off. {not in - Vi} + right. This only works when 'wrap' is off. For the following two commands the cursor is not moved in the text, only the text scrolls on the screen. @@ -182,12 +177,12 @@ text scrolls on the screen. *zs* zs Scroll the text horizontally to position the cursor at the start (left side) of the screen. This only - works when 'wrap' is off. {not in Vi} + works when 'wrap' is off. *ze* ze Scroll the text horizontally to position the cursor at the end (right side) of the screen. This only - works when 'wrap' is off. {not in Vi} + works when 'wrap' is off. ============================================================================== 5. Scrolling synchronously *scroll-binding* diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt index d52b8e964f..8dc229df41 100644 --- a/runtime/doc/sign.txt +++ b/runtime/doc/sign.txt @@ -10,9 +10,6 @@ Sign Support Features *sign-support* 1. Introduction |sign-intro| 2. Commands |sign-commands| -{Vi does not have any of these features} -{only available when compiled with the |+signs| feature} - ============================================================================== 1. Introduction *sign-intro* *signs* diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index 8a752d8a11..4fbec3694f 100644 --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -11,11 +11,6 @@ Spell checking *spell* 3. Generating a spell file |spell-mkspell| 4. Spell file format |spell-file-format| -{Vi does not have any of these commands} - -Spell checking is not available when the |+syntax| feature has been disabled -at compile time. - Note: There also is a vimspell plugin. If you have it you can do ":help vimspell" to find about it. But you will probably want to get rid of the plugin and use the 'spell' option instead, it works better. diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index a18571b77f..017fba1824 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -76,7 +76,6 @@ filename One or more file names. The first one will be the current and the first error is displayed. See |quickfix|. If [errorfile] is not given, the 'errorfile' option is used for the file name. See 'errorfile' for the default value. - {not in Vi} (nothing) Without one of the four items above, Vim will start editing a new buffer. It's empty and doesn't have a file name. @@ -87,17 +86,16 @@ combined after one dash. There can be no option arguments after the "--" argument. --help *-h* *--help* --h Give usage (help) message and exit. {not in Vi} +-h Give usage (help) message and exit. See |info-message| about capturing the text. *--version* --version Print version information and exit. Same output as for - |:version| command. {not in Vi} + |:version| command. See |info-message| about capturing the text. *--noplugin* --noplugin Skip loading plugins. Resets the 'loadplugins' option. - {not in Vi} Note that the |-u| argument may also disable loading plugins: argument load vimrc files load plugins ~ (nothing) yes yes @@ -147,13 +145,11 @@ argument. Note: You can use up to 10 "+" or "-c" arguments in a Vim command. They are executed in the order given. A "-S" argument counts as a "-c" argument as well. - {Vi only allows one command} --cmd {command} *--cmd* {command} will be executed before processing any vimrc file. Otherwise it acts like -c {command}. You can use up to 10 of these commands, independently from "-c" commands. - {not in Vi} *-S* -S {file} The {file} will be sourced after the first file has been read. @@ -162,7 +158,6 @@ argument. < It can be mixed with "-c" arguments and repeated like "-c". The limit of 10 "-c" arguments applies here as well. {file} cannot start with a "-". - {not in Vi} -S Works like "-S Session.vim". Only when used as the last argument or when another "-" option follows. @@ -174,8 +169,7 @@ argument. |crash-recovery|. *-L* --L Same as -r. {only in some versions of Vi: "List recoverable - edit sessions"} +-L Same as -r. *-R* -R Readonly mode. The 'readonly' option will be set for all the @@ -194,7 +188,6 @@ argument. -m Modifications not allowed to be written. The 'write' option will be reset, so that writing files is disabled. However, the 'write' option can be set to enable writing again. - {not in Vi} *-M* -M Modifications not allowed. The 'modifiable' option will be @@ -202,18 +195,15 @@ argument. will be reset, so that writing files is disabled. However, the 'modifiable' and 'write' options can be set to enable changes and writing. - {not in Vi} *-Z* *restricted-mode* *E145* -Z Restricted mode. All commands that make use of an external shell are disabled. This includes suspending with CTRL-Z, ":sh", filtering, the system() function, backtick expansion, delete(), rename(), mkdir(), writefile(), libcall(), etc. - {not in Vi} *-g* -g Start Vim in GUI mode. See |gui|. - {not in Vi} *-e* -e Start Vim in Ex mode |Q|. @@ -250,32 +240,25 @@ argument. option is set to 0. 'modeline' is reset. The 'binary' option is set. This is done after reading the vimrc/exrc files but before reading any file in the arglist. See also - |edit-binary|. {not in Vi} + |edit-binary|. *-l* -l Lisp mode. Sets the 'lisp' and 'showmatch' options on. *-A* --A Arabic mode. Sets the 'arabic' option on. (Only when - compiled with the |+arabic| features (which include - |+rightleft|), otherwise Vim gives an error message - and exits.) {not in Vi} +-A Arabic mode. Sets the 'arabic' option on. *-F* -F Farsi mode. Sets the 'fkmap' and 'rightleft' options on. - (Only when compiled with |+rightleft| and |+farsi| features, - otherwise Vim gives an error message and exits.) {not in Vi} *-H* -H Hebrew mode. Sets the 'hkmap' and 'rightleft' options on. - (Only when compiled with the |+rightleft| feature, otherwise - Vim gives an error message and exits.) {not in Vi} *-V* *verbose* -V[N] Verbose. Sets the 'verbose' option to [N] (default: 10). Messages will be given for each file that is ":source"d and for reading or writing a viminfo file. Can be used to find - out what is happening upon startup and exit. {not in Vi} + out what is happening upon startup and exit. Example: > vim -V8 foobar @@ -290,7 +273,6 @@ argument. -D Debugging. Go to debugging mode when executing the first command from a script. |debug-mode| {not available when compiled without the |+eval| feature} - {not in Vi} *-n* -n No swap file will be used. Recovery after a crash will be @@ -308,7 +290,6 @@ argument. 'updatecount' to very big numbers, and type ":preserve" when you want to save your work. This way you keep the possibility for crash recovery. - {not in Vi} *-o* -o[N] Open N windows, split horizontally. If [N] is not given, @@ -316,13 +297,11 @@ argument. there is not enough room, only the first few files get a window. If there are more windows than arguments, the last few windows will be editing an empty file. - {not in Vi} *-O* -O[N] Open N windows, split vertically. Otherwise it's like -o. If both the -o and the -O option are given, the last one on the command line determines how the windows will be split. - {not in Vi} *-p* -p[N] Open N tab pages. If [N] is not given, one tab page is opened @@ -330,13 +309,12 @@ argument. 'tabpagemax' pages (default 10). If there are more tab pages than arguments, the last few tab pages will be editing an empty file. Also see |tabpage|. - {not in Vi} *-T* -T {terminal} Set the terminal type to "terminal". This influences the codes that Vim will send to your terminal. This is normally not needed, because Vim will be able to find out what type - of terminal you are using. (See |terminal-info|.) {not in Vi} + of terminal you are using. (See |terminal-info|.) *-d* -d Start in |diff-mode|. @@ -356,7 +334,6 @@ argument. starts. Loading plugins is also skipped. When {vimrc} is equal to "NORC" (all uppercase), this has the same effect as "NONE", but loading plugins is not skipped. - {not in Vi} *-U* *E230* -U {gvimrc} The file {gvimrc} is read for initializations when the GUI @@ -364,14 +341,12 @@ argument. is equal to "NONE", no file is read for GUI initializations at all. |gui-init| Exception: Reading the system-wide menu file is always done. - {not in Vi} *-i* -i {viminfo} The file "viminfo" is used instead of the default viminfo file. If the name "NONE" is used (all uppercase), no viminfo file is read or written, even if 'viminfo' is set or when ":rv" or ":wv" are used. See also |viminfo-file|. - {not in Vi} *-X* -X Do not try connecting to the X server to get the current @@ -389,7 +364,6 @@ argument. When the connection is desired later anyway (e.g., for client-server messages), call the |serverlist()| function. This does not enable the XSMP handler though. - {not in Vi} *-s* -s {scriptin} The script file "scriptin" is read. The characters in the @@ -398,7 +372,6 @@ argument. of the file is reached before the editor exits, further characters are read from the keyboard. Only works when not started in Ex mode, see |-s-ex|. See also |complex-repeat|. - {not in Vi} *-w_nr* -w {number} @@ -411,62 +384,60 @@ argument. ":source!". When the "scriptout" file already exists, new characters are appended. See also |complex-repeat|. {scriptout} cannot start with a digit. - {not in Vi} *-W* -W {scriptout} Like -w, but do not append, overwrite an existing file. - {not in Vi} --remote [+{cmd}] {file} ... Open the {file} in another Vim that functions as a server. Any non-file arguments must come before this. - See |--remote|. {not in Vi} + See |--remote|. --remote-silent [+{cmd}] {file} ... Like --remote, but don't complain if there is no server. - See |--remote-silent|. {not in Vi} + See |--remote-silent|. --remote-wait [+{cmd}] {file} ... Like --remote, but wait for the server to finish editing the file(s). - See |--remote-wait|. {not in Vi} + See |--remote-wait|. --remote-wait-silent [+{cmd}] {file} ... Like --remote-wait, but don't complain if there is no server. - See |--remote-wait-silent|. {not in Vi} + See |--remote-wait-silent|. --servername {name} Specify the name of the Vim server to send to or to become. - See |--servername|. {not in Vi} + See |--servername|. --remote-send {keys} Send {keys} to a Vim server and exit. - See |--remote-send|. {not in Vi} + See |--remote-send|. --remote-expr {expr} Evaluate {expr} in another Vim that functions as a server. The result is printed on stdout. - See |--remote-expr|. {not in Vi} + See |--remote-expr|. --serverlist Output a list of Vim server names and exit. See - |--serverlist|. {not in Vi} + |--serverlist|. --socketid {id} *--socketid* GTK+ GUI Vim only. Make gvim try to use GtkPlug mechanism, so that it runs inside another window. See |gui-gtk-socketid| - for details. {not in Vi} + for details. --windowid {id} *--windowid* Win32 GUI Vim only. Make gvim try to use the window {id} as a parent, so that it runs inside that window. See - |gui-w32-windowid| for details. {not in Vi} + |gui-w32-windowid| for details. --echo-wid *--echo-wid* GTK+ GUI Vim only. Make gvim echo the Window ID on stdout, which can be used to run gvim in a kpart widget. The format of the output is: > WID: 12345\n -< {not in Vi} +< --role {role} *--role* GTK+ 2 GUI only. Set the role of the main window to {role}. @@ -474,7 +445,6 @@ argument. identify a window, in order to restore window placement and such. The --role argument is passed automatically when restoring the session on login. See |gui-gnome-session| - {not in Vi} -P {parent-title} *-P* *MDI* *E671* *E672* Win32 only: Specify the title of the parent application. When @@ -848,16 +818,16 @@ vimrc file. *:mk* *:mkexrc* :mk[exrc] [file] Write current key mappings and changed options to [file] (default ".exrc" in the current directory), - unless it already exists. {not in Vi} + unless it already exists. :mk[exrc]! [file] Always write current key mappings and changed options to [file] (default ".exrc" in the current - directory). {not in Vi} + directory). *:mkv* *:mkvimrc* :mkv[imrc][!] [file] Like ":mkexrc", but the default is ".vimrc" in the current directory. The ":version" command is also - written to the file. {not in Vi} + written to the 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 @@ -918,9 +888,6 @@ You can quickly start editing with a previously saved View or Session with the |-S| argument: > vim -S Session.vim < -All this is {not in Vi} and {not available when compiled without the -|+mksession| feature}. - *:mks* *:mksession* :mks[ession][!] [file] Write a Vim script that restores the current editing session. @@ -1203,7 +1170,7 @@ most of the information will be restored). :rv[iminfo][!] [file] Read from viminfo file [file] (default: see above). If [!] is given, then any information that is already set (registers, marks, |v:oldfiles|, etc.) - will be overwritten {not in Vi} + will be overwritten. *:wv* *:wviminfo* *E137* *E138* *E574* *E886* :wv[iminfo][!] [file] Write to viminfo file [file] (default: see above). @@ -1216,15 +1183,12 @@ most of the information will be restored). check that no old temp files were left behind (e.g. ~/.viminf*) and that you can write in the directory of the .viminfo file. - {not in Vi} *:ol* *:oldfiles* :ol[dfiles] List the files that have marks stored in the viminfo file. This list is read on startup and only changes afterwards with ":rviminfo!". Also see |v:oldfiles|. The number can be used with |c_#<|. - {not in Vi, only when compiled with the |+eval| - feature} :bro[wse] ol[dfiles][!] List file names as with |:oldfiles|, and then prompt @@ -1233,6 +1197,5 @@ most of the information will be restored). If you get the |press-enter| prompt you can press "q" and still get the prompt to enter a file number. Use ! to abandon a modified buffer. |abandon| - {not when compiled with tiny or small features} vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 6415b4203f..7e1488651e 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -39,11 +39,6 @@ In the User Manual: 17. Color xterms |xterm-color| 18. When syntax is slow |:syntime| -{Vi does not have any of these commands} - -Syntax highlighting is not available when the |+syntax| feature has been -disabled at compile time. - ============================================================================== 1. Quick start *:syn-qstart* diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt index bb0baf4ccf..44e770dc12 100644 --- a/runtime/doc/tabpage.txt +++ b/runtime/doc/tabpage.txt @@ -16,10 +16,6 @@ when used in combination with more than one tab page. 4. Setting 'tabline' |setting-tabline| 5. Setting 'guitablabel' |setting-guitablabel| -{Vi does not have any of these commands} -{not able to use multiple tab pages when the |+windows| feature was disabled -at compile time} - ============================================================================== 1. Introduction *tab-page-intro* @@ -238,8 +234,6 @@ LOOPING OVER TAB PAGES: current tab page. {cmd} can contain '|' to concatenate several commands. {cmd} must not open or close tab pages or reorder them. - {not in Vi} {not available when compiled without the - |+listcmds| feature} Also see |:windo|, |:argdo| and |:bufdo|. ============================================================================== diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt index dc0ecae0a3..93e8b368ae 100644 --- a/runtime/doc/tagsrch.txt +++ b/runtime/doc/tagsrch.txt @@ -55,11 +55,10 @@ CTRL-] Jump to the definition of the keyword under the to the [count] one. When no [count] is given the first one is jumped to. See |tag-matchlist| for jumping to other matching tags. - {Vi: identifier after the cursor} *v_CTRL-]* {Visual}CTRL-] Same as ":tag {ident}", where {ident} is the text that - is highlighted. {not in Vi} + is highlighted. *telnet-CTRL-]* CTRL-] is the default telnet escape key. When you type CTRL-] to jump to a @@ -100,18 +99,18 @@ Tags are only pushed onto the stack when the 'tagstack' option is set. g<RightMouse> *g<RightMouse>* <C-RightMouse> *<C-RightMouse>* *CTRL-T* CTRL-T Jump to [count] older entry in the tag stack - (default 1). {not in Vi} + (default 1). *:po* *:pop* *E555* *E556* :[count]po[p][!] Jump to [count] older entry in tag stack (default 1). - See |tag-!| for [!]. {not in Vi} + See |tag-!| for [!]. :[count]ta[g][!] Jump to [count] newer entry in tag stack (default 1). - See |tag-!| for [!]. {not in Vi} + See |tag-!| for [!]. *:tags* :tags Show the contents of the tag stack. The active - entry is marked with a '>'. {not in Vi} + entry is marked with a '>'. The output of ":tags" looks like this: @@ -188,7 +187,7 @@ the same entry. the current position in the list (if there is one). [ident] can be a regexp pattern, see |tag-regexp|. See |tag-priority| for the priorities used in the - listing. {not in Vi} + listing. Example output: > @@ -215,54 +214,50 @@ the same entry. *:sts* *:stselect* :sts[elect][!] [ident] Does ":tselect[!] [ident]" and splits the window for - the selected tag. {not in Vi} + the selected tag. *g]* g] Like CTRL-], but use ":tselect" instead of ":tag". - {not in Vi} *v_g]* {Visual}g] Same as "g]", but use the highlighted text as the - identifier. {not in Vi} + identifier. *:tj* *:tjump* :tj[ump][!] [ident] Like ":tselect", but jump to the tag directly when - there is only one match. {not in Vi} + there is only one match. *:stj* *:stjump* :stj[ump][!] [ident] Does ":tjump[!] [ident]" and splits the window for the - selected tag. {not in Vi} + selected tag. *g_CTRL-]* g CTRL-] Like CTRL-], but use ":tjump" instead of ":tag". - {not in Vi} *v_g_CTRL-]* {Visual}g CTRL-] Same as "g CTRL-]", but use the highlighted text as - the identifier. {not in Vi} + the identifier. *:tn* *:tnext* :[count]tn[ext][!] Jump to [count] next matching tag (default 1). See - |tag-!| for [!]. {not in Vi} + |tag-!| for [!]. *:tp* *:tprevious* :[count]tp[revious][!] Jump to [count] previous matching tag (default 1). - See |tag-!| for [!]. {not in Vi} + See |tag-!| for [!]. *:tN* *:tNext* -:[count]tN[ext][!] Same as ":tprevious". {not in Vi} +:[count]tN[ext][!] Same as ":tprevious". *:tr* *:trewind* :[count]tr[ewind][!] Jump to first matching tag. If [count] is given, jump - to [count]th matching tag. See |tag-!| for [!]. {not - in Vi} + to [count]th matching tag. See |tag-!| for [!]. *:tf* *:tfirst* -:[count]tf[irst][!] Same as ":trewind". {not in Vi} +:[count]tf[irst][!] Same as ":trewind". *:tl* *:tlast* -:tl[ast][!] Jump to last matching tag. See |tag-!| for [!]. {not - in Vi} +:tl[ast][!] Jump to last matching tag. See |tag-!| for [!]. *:lt* *:ltag* :lt[ag][!] [ident] Jump to tag [ident] and add the matching tags to a new @@ -274,7 +269,6 @@ g CTRL-] Like CTRL-], but use ":tjump" instead of ":tag". characters (very nomagic). The location list showing the matching tags is independent of the tag stack. See |tag-!| for [!]. - {not in Vi} When there is no other message, Vim shows which matching tag has been jumped to, and the number of matching tags: > @@ -301,34 +295,28 @@ the same as above, with a "p" prepended. *:pts* *:ptselect* :pts[elect][!] [ident] Does ":tselect[!] [ident]" and shows the new tag in a "Preview" window. See |:ptag| for more info. - {not in Vi} *:ptj* *:ptjump* :ptj[ump][!] [ident] Does ":tjump[!] [ident]" and shows the new tag in a "Preview" window. See |:ptag| for more info. - {not in Vi} *:ptn* *:ptnext* :[count]ptn[ext][!] ":tnext" in the preview window. See |:ptag|. - {not in Vi} *:ptp* *:ptprevious* :[count]ptp[revious][!] ":tprevious" in the preview window. See |:ptag|. - {not in Vi} *:ptN* *:ptNext* -:[count]ptN[ext][!] Same as ":ptprevious". {not in Vi} +:[count]ptN[ext][!] Same as ":ptprevious". *:ptr* *:ptrewind* :[count]ptr[ewind][!] ":trewind" in the preview window. See |:ptag|. - {not in Vi} *:ptf* *:ptfirst* -:[count]ptf[irst][!] Same as ":ptrewind". {not in Vi} +:[count]ptf[irst][!] Same as ":ptrewind". *:ptl* *:ptlast* :ptl[ast][!] ":tlast" in the preview window. See |:ptag|. - {not in Vi} ============================================================================== 4. Tags details *tag-details* @@ -416,7 +404,6 @@ In a future version changing the buffer will be impossible. All this for security reasons: Somebody might hide a nasty command in the tags file, which would otherwise go unnoticed. Example: > :$d|/tag-function-name/ -{this security prevention is not present in Vi} In Vi the ":tag" command sets the last search pattern when the tag is searched for. In Vim this is not done, the previous search pattern is still remembered, @@ -608,9 +595,7 @@ If the command is a normal search command (it starts and ends with "/" or - Searching starts on line 1 of the file. The direction of the search is forward for "/", backward for "?". Note that 'wrapscan' does not matter, the whole file is always searched. (Vi - does use 'wrapscan', which caused tags sometimes not be found.) {Vi starts - searching in line 2 of another file. It does not find a tag in line 1 of - another file when 'wrapscan' is not set} + does use 'wrapscan', which caused tags sometimes not be found.) - If the search fails, another try is done ignoring case. If that fails too, a search is done for: "^tagname[ \t]*(" @@ -621,7 +606,7 @@ If the command is a normal search command (it starts and ends with "/" or "^[#a-zA-Z_].*\<tagname[ \t]*(" This means: A line starting with '#' or an identifier and containing the tag followed by white space and a '('. This will find macro names and function - names with a type prepended. {the extra searches are not in Vi} + names with a type prepended. ============================================================================== 6. Include file searches *include-search* *definition-search* @@ -682,33 +667,31 @@ mapping to do that for you. Here is an example: > of the file. Lines that look like a comment are ignored (see 'comments' option). If a count is given, the count'th matching line is displayed, and comment - lines are not ignored. {not in Vi} + lines are not ignored. *]i* ]i like "[i", but start at the current cursor position. - {not in Vi} *:is* *:isearch* :[range]is[earch][!] [count] [/]pattern[/] Like "[i" and "]i", but search in [range] lines (default: whole file). - See |:search-args| for [/] and [!]. {not in Vi} + See |:search-args| for [/] and [!]. *[I* [I Display all lines that contain the keyword under the cursor. Filenames and line numbers are displayed for the found lines. The search starts at the - beginning of the file. {not in Vi} + beginning of the file. *]I* ]I like "[I", but start at the current cursor position. - {not in Vi} *:il* *:ilist* :[range]il[ist][!] [/]pattern[/] Like "[I" and "]I", but search in [range] lines (default: whole file). - See |:search-args| for [/] and [!]. {not in Vi} + See |:search-args| for [/] and [!]. *[_CTRL-I* [ CTRL-I Jump to the first line that contains the keyword @@ -716,17 +699,17 @@ mapping to do that for you. Here is an example: > of the file. Lines that look like a comment are ignored (see 'comments' option). If a count is given, the count'th matching line is jumped to, and comment - lines are not ignored. {not in Vi} + lines are not ignored. *]_CTRL-I* ] CTRL-I like "[ CTRL-I", but start at the current cursor - position. {not in Vi} + position. *:ij* *:ijump* :[range]ij[ump][!] [count] [/]pattern[/] Like "[ CTRL-I" and "] CTRL-I", but search in [range] lines (default: whole file). - See |:search-args| for [/] and [!]. {not in Vi} + See |:search-args| for [/] and [!]. CTRL-W CTRL-I *CTRL-W_CTRL-I* *CTRL-W_i* CTRL-W i Open a new window, with the cursor on the first line @@ -735,45 +718,43 @@ CTRL-W i Open a new window, with the cursor on the first line that look like a comment line are ignored (see 'comments' option). If a count is given, the count'th matching line is jumped to, and comment lines are not - ignored. {not in Vi} + ignored. *:isp* *:isplit* :[range]isp[lit][!] [count] [/]pattern[/] Like "CTRL-W i" and "CTRL-W i", but search in [range] lines (default: whole file). - See |:search-args| for [/] and [!]. {not in Vi} + See |:search-args| for [/] and [!]. *[d* [d Display the first macro definition that contains the macro under the cursor. The search starts from the beginning of the file. If a count is given, the - count'th matching line is displayed. {not in Vi} + count'th matching line is displayed. *]d* ]d like "[d", but start at the current cursor position. - {not in Vi} *:ds* *:dsearch* :[range]ds[earch][!] [count] [/]string[/] Like "[d" and "]d", but search in [range] lines (default: whole file). - See |:search-args| for [/] and [!]. {not in Vi} + See |:search-args| for [/] and [!]. *[D* [D Display all macro definitions that contain the macro under the cursor. Filenames and line numbers are displayed for the found lines. The search starts - from the beginning of the file. {not in Vi} + from the beginning of the file. *]D* ]D like "[D", but start at the current cursor position. - {not in Vi} *:dli* *:dlist* :[range]dli[st][!] [/]string[/] Like `[D` and `]D`, but search in [range] lines (default: whole file). - See |:search-args| for [/] and [!]. {not in Vi} + See |:search-args| for [/] and [!]. Note that `:dl` works like `:delete` with the "l" flag, not `:dlist`. @@ -781,36 +762,35 @@ CTRL-W i Open a new window, with the cursor on the first line [ CTRL-D Jump to the first macro definition that contains the keyword under the cursor. The search starts from the beginning of the file. If a count is given, the - count'th matching line is jumped to. {not in Vi} + count'th matching line is jumped to. *]_CTRL-D* ] CTRL-D like "[ CTRL-D", but start at the current cursor - position. {not in Vi} + position. *:dj* *:djump* :[range]dj[ump][!] [count] [/]string[/] Like "[ CTRL-D" and "] CTRL-D", but search in [range] lines (default: whole file). - See |:search-args| for [/] and [!]. {not in Vi} + See |:search-args| for [/] and [!]. CTRL-W CTRL-D *CTRL-W_CTRL-D* *CTRL-W_d* CTRL-W d Open a new window, with the cursor on the first macro definition line that contains the keyword under the cursor. The search starts from the beginning of the file. If a count is given, the - count'th matching line is jumped to. {not in Vi} + count'th matching line is jumped to. *:dsp* *:dsplit* :[range]dsp[lit][!] [count] [/]string[/] Like "CTRL-W d", but search in [range] lines (default: whole file). - See |:search-args| for [/] and [!]. {not in Vi} + See |:search-args| for [/] and [!]. *:che* *:checkpath* :che[ckpath] List all the included files that could not be found. - {not in Vi} -:che[ckpath]! List all the included files. {not in Vi} +:che[ckpath]! List all the included files. *:search-args* Common arguments for the commands above: diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt index 18b83d3812..e0e7f37948 100644 --- a/runtime/doc/term.txt +++ b/runtime/doc/term.txt @@ -170,9 +170,6 @@ It is always possible to change individual strings by setting the appropriate option. For example: > :set t_ce=^V^[[K (CTRL-V, <Esc>, [, K) -{Vi: no terminal options. You have to exit Vi, edit the termcap entry and -try again} - The options are listed below. The associated termcap code is always equal to the last two characters of the option name. Only one termcap code is required: Cursor motion, 't_cm'. diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index f0ac103c06..4304d51fa1 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -5075,7 +5075,7 @@ Various improvements: used, remove the <CR> at the end of lines in [range]. A CTRL-Z at the end of the file is removed. If [range] is omitted, or it is the whole file, and all - lines end in <CR> 'textmode' is set. {not in Vi} + lines end in <CR> 'textmode' is set. - Should integrate addstar() and file_pat_to_reg_pat(). - When working over a serial line with 7 bit characters, remove meta characters from 'isprint'. diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt index fba981d4a3..1342621516 100644 --- a/runtime/doc/undo.txt +++ b/runtime/doc/undo.txt @@ -19,26 +19,24 @@ The basics are explained in section |02.5| of the user manual. 1. Undo and redo commands *undo-commands* <Undo> or *undo* *<Undo>* *u* -u Undo [count] changes. {Vi: only one level} +u Undo [count] changes. *:u* *:un* *:undo* -:u[ndo] Undo one change. {Vi: only one level} +:u[ndo] Undo one change. *E830* :u[ndo] {N} Jump to after change number {N}. See |undo-branches| - for the meaning of {N}. {not in Vi} + for the meaning of {N}. *CTRL-R* -CTRL-R Redo [count] changes which were undone. {Vi: redraw - screen} +CTRL-R Redo [count] changes which were undone. *:red* *:redo* *redo* -:red[o] Redo one change which was undone. {Vi: no redo} +:red[o] Redo one change which was undone. *U* U Undo all latest changes on one line, the line where the latest change was made. |U| itself also counts as a change, and thus |U| undoes a previous |U|. - {Vi: while not moved off of the last modified line} The last changes are remembered. You can use the undo and redo commands above to revert the text to how it was before each change. You can also apply the @@ -95,7 +93,6 @@ change but joins in with the previous change use this command: Warning: Use with care, it may prevent the user from properly undoing changes. Don't use this after undo or redo. - {not in Vi} This is most useful when you need to prompt the user halfway through a change. For example in a function that calls |getchar()|. Do make sure that there was @@ -151,7 +148,7 @@ This is explained in the user manual: |usr_32.txt|. *g-* g- Go to older text state. With a count repeat that many - times. {not in Vi} + times. *:ea* *:earlier* :earlier {count} Go to older text state {count} times. :earlier {N}s Go to older text state about {N} seconds before. @@ -170,7 +167,7 @@ g- Go to older text state. With a count repeat that many *g+* g+ Go to newer text state. With a count repeat that many - times. {not in Vi} + times. *:lat* *:later* :later {count} Go to newer text state {count} times. :later {N}s Go to newer text state about {N} seconds later. @@ -271,10 +268,8 @@ respectively: the existing file and then creating a new file with the same name. So it is not possible to overwrite an existing undofile in a write-protected directory. - {not in Vi} :rundo {file} Read undo history from {file}. - {not in Vi} You can use these in autocommands to explicitly specify the name of the history file. E.g.: > @@ -358,13 +353,13 @@ information you can use these commands: > :unlet old_undolevels Marks for the buffer ('a to 'z) are also saved and restored, together with the -text. {Vi does this a little bit different} +text. When all changes have been undone, the buffer is not considered to be changed. -It is then possible to exit Vim with ":q" instead of ":q!" {not in Vi}. Note -that this is relative to the last write of the file. Typing "u" after ":w" -actually changes the buffer, compared to what was written, so the buffer is -considered changed then. +It is then possible to exit Vim with ":q" instead of ":q!". +Note that this is relative to the last write of the file. Typing "u" after +":w" actually changes the buffer, compared to what was written, so the buffer +is considered changed then. When manual |folding| is being used, the folds are not saved and restored. Only changes completely within a fold will keep the fold as it was, because diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index 05770587a5..6419ecb628 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -54,7 +54,7 @@ ga Print the ascii value of the character under the <^@> 0, Hex 00, Octal 000 ~ If the character has composing characters these are also shown. The value of 'maxcombine' doesn't matter. - Mnemonic: Get Ascii value. {not in Vi} + Mnemonic: Get ASCII value. *g8* g8 Print the hex values of the bytes used in the @@ -63,8 +63,6 @@ g8 Print the hex values of the bytes used in the value of 'maxcombine' doesn't matter. Example of a character with two composing characters: e0 b8 81 + e0 b8 b9 + e0 b9 89 ~ - {not in Vi} {only when compiled with the |+multi_byte| - feature} *8g8* 8g8 Find an illegal UTF-8 byte sequence at or after the @@ -79,8 +77,6 @@ g8 Print the hex values of the bytes used in the Note that when the cursor is on an illegal byte or the cursor is halfway through a multi-byte character the command won't move the cursor. - {not in Vi} {only when compiled with the |+multi_byte| - feature} *:p* *:pr* *:print* *E749* :[range]p[rint] [flags] @@ -205,9 +201,7 @@ g8 Print the hex values of the bytes used in the Example: > :exe "normal \<c-w>\<c-w>" -< {not in Vi, of course} - {not available when the |+ex_extra| feature was - disabled at compile time} +< :{range}norm[al][!] {commands} *:normal-range* Execute Normal mode commands {commands} for each line @@ -215,9 +209,6 @@ g8 Print the hex values of the bytes used in the cursor is positioned in the first column of the range, for each line. Otherwise it's the same as the ":normal" command without a range. - {not in Vi} - {not available when |+ex_extra| feature was disabled - at compile time} *:sh* *:shell* *E371* *E360* :sh[ell] Removed. |vim-differences| {Nvim} @@ -389,9 +380,7 @@ N *+persistent_undo* Persistent undo |undo-persistence| N *+printer* |:hardcopy| command H *+profile* |:profile| command m *+python* Python 2 interface |python| -m *+python/dyn* Python 2 interface |python-dynamic| |/dyn| m *+python3* Python 3 interface |python| -m *+python3/dyn* Python 3 interface |python-dynamic| |/dyn| N *+quickfix* |:make| and |quickfix| commands N *+reltime* |reltime()| function, 'hlsearch'/'incsearch' timeout, 'redrawtime' option @@ -442,7 +431,7 @@ N *+X11* Unix only: can restore window title |X11| :ve[rsion] {nr} Is now ignored. This was previously used to check the version number of a .vimrc file. It was removed, because you can now use the ":if" command for - version-dependent behavior. {not in Vi} + version-dependent behavior. *:redi* *:redir* :redi[r][!] > {file} Redirect messages to file {file}. The messages which @@ -459,31 +448,28 @@ N *+X11* Unix only: can restore window title |X11| with ":silent call Function()". An alternative is to use the 'verbosefile' option, this can be used in combination with ":redir". - {not in Vi} :redi[r] >> {file} Redirect messages to file {file}. Append if {file} - already exists. {not in Vi} + already exists. :redi[r] @{a-zA-Z} :redi[r] @{a-zA-Z}> Redirect messages to register {a-z}. Append to the contents of the register if its name is given uppercase {A-Z}. The ">" after the register name is - optional. {not in Vi} -:redi[r] @{a-z}>> Append messages to register {a-z}. {not in Vi} + optional. +:redi[r] @{a-z}>> Append messages to register {a-z}. :redi[r] @*> :redi[r] @+> Redirect messages to the selection or clipboard. For backward compatibility, the ">" after the register name can be omitted. See |quotestar| and |quoteplus|. - {not in Vi} :redi[r] @*>> :redi[r] @+>> Append messages to the selection or clipboard. - {not in Vi} :redi[r] @"> Redirect messages to the unnamed register. For backward compatibility, the ">" after the register - name can be omitted. {not in Vi} -:redi[r] @">> Append messages to the unnamed register. {not in Vi} + name can be omitted. +:redi[r] @">> Append messages to the unnamed register. :redi[r] => {var} Redirect messages to a variable. If the variable doesn't exist, then it is created. If the variable @@ -492,12 +478,12 @@ N *+X11* Unix only: can restore window title |X11| Only string variables can be used. After the redirection starts, if the variable is removed or locked or the variable type is changed, then further - command output messages will cause errors. {not in Vi} + command output messages will cause errors. :redi[r] =>> {var} Append messages to an existing variable. Only string - variables can be used. {not in Vi} + variables can be used. -:redi[r] END End redirecting messages. {not in Vi} +:redi[r] END End redirecting messages. *:sil* *:silent* :sil[ent][!] {command} Execute {command} silently. Normal messages will not @@ -600,12 +586,11 @@ K Run a program to lookup the keyword under the < - When 'keywordprg' is equal to "man -s", a count before "K" is inserted after the "-s". If there is no count, the "-s" is removed. - {not in Vi} *v_K* {Visual}K Like "K", but use the visually highlighted text for the keyword. Only works when the highlighted text is - not more than one line. {not in Vi} + not more than one line. [N]gs *gs* *:sl* *:sleep* :[N]sl[eep] [N] [m] Do nothing for [N] seconds. When [m] is included, @@ -618,7 +603,7 @@ K Run a program to lookup the keyword under the < Can be interrupted with CTRL-C (CTRL-Break on MS-DOS). "gs" stands for "goto sleep". While sleeping the cursor is positioned in the text, - if at a visible position. {not in Vi} + if at a visible position. *g_CTRL-A* diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt index 663c50445e..6810d50c11 100644 --- a/runtime/doc/visual.txt +++ b/runtime/doc/visual.txt @@ -20,10 +20,6 @@ This is introduced in section |04.4| of the user manual. 7. Examples |visual-examples| 8. Select mode |Select-mode| -{Vi has no Visual mode, the name "visual" is used for Normal mode, to -distinguish it from Ex mode} -{Since Vim 7.4.200 the |+visual| feature is always included} - ============================================================================== 1. Using Visual mode *visual-use* diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt index 782349abe8..ba69b7cf2f 100644 --- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -26,12 +26,6 @@ The basics are explained in chapter 7 and 8 of the user manual |usr_07.txt| 11. Using hidden buffers |buffer-hidden| 12. Special kinds of buffers |special-buffers| -{Vi does not have any of these commands} -{not able to use multiple windows when the |+windows| feature was disabled at -compile time} -{not able to use vertically split windows when the |+vertsplit| feature was -disabled at compile time} - ============================================================================== 1. Introduction *windows-intro* *window* @@ -710,8 +704,6 @@ can also get to them with the buffer list commands, like ":bnext". the current window. {cmd} can contain '|' to concatenate several commands. {cmd} must not open or close windows or reorder them. - {not in Vi} {not available when compiled without the - |+listcmds| feature} Also see |:tabdo|, |:argdo| and |:bufdo|. *:bufdo* @@ -738,8 +730,6 @@ can also get to them with the buffer list commands, like ":bnext". autocommand event is disabled by adding it to 'eventignore'. This considerably speeds up editing each buffer. - {not in Vi} {not available when compiled without the - |+listcmds| feature} Also see |:tabdo|, |:argdo| and |:windo|. Examples: > @@ -858,7 +848,7 @@ CTRL-W CTRL-Z *CTRL-W_CTRL-Z* *:pc* *:pclose* *:pp* *:ppop* :[count]pp[op][!] Does ":[count]pop[!]" in the preview window. See |:pop| and - |:ptag|. {not in Vi} + |:ptag|. CTRL-W } *CTRL-W_}* Use identifier under cursor as a tag and perform a :ptag on diff --git a/runtime/macros/matchit.txt b/runtime/macros/matchit.txt index 8a3a96e260..155a317bbb 100644 --- a/runtime/macros/matchit.txt +++ b/runtime/macros/matchit.txt @@ -23,8 +23,6 @@ You can avoid loading this plugin by setting the "loaded_matchit" variable in your |vimrc| file: > :let loaded_matchit = 1 -{Vi does not have any of this} - ============================================================================== 1. Extended matching with "%" *matchit-intro* diff --git a/runtime/syntax/help.vim b/runtime/syntax/help.vim index b306e66e59..d133c6a804 100644 --- a/runtime/syntax/help.vim +++ b/runtime/syntax/help.vim @@ -85,8 +85,6 @@ syn match helpSpecial "CTRL-PageDown" syn match helpSpecial "CTRL-Insert" syn match helpSpecial "CTRL-Del" syn match helpSpecial "CTRL-{char}" -syn region helpNotVi start="{Vi[: ]" start="{not" start="{only" end="}" contains=helpLeadBlank,helpHyperTextJump -syn match helpLeadBlank "^\s\+" contained " Highlight group items in their own color. syn match helpComment "\t[* ]Comment\t\+[a-z].*" @@ -140,7 +138,6 @@ if v:lang =~ '\<IT\>' || v:lang =~ '_IT\>' || v:lang =~? "italian" syn match helpSpecial "Nmi"me=e-2 syn match helpSpecial "Nmo"me=e-2 syn match helpSpecial "\[interv.]" - syn region helpNotVi start="{non" start="{solo" start="{disponibile" end="}" contains=helpLeadBlank,helpHyperTextJump endif syn sync minlines=40 @@ -161,7 +158,6 @@ hi def link helpVim Identifier hi def link helpCommand Comment hi def link helpExample Comment hi def link helpOption Type -hi def link helpNotVi Special hi def link helpSpecial Special hi def link helpNote Todo diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index 92b4f72c6e..1aac49c401 100644 --- a/runtime/syntax/vim.vim +++ b/runtime/syntax/vim.vim @@ -607,7 +607,7 @@ if !filereadable(s:pythonpath) endif endfor endif -if g:vimsyn_embed =~ 'P' && (has("python") || has("python3")) && filereadable(s:pythonpath) +if g:vimsyn_embed =~ 'P' && filereadable(s:pythonpath) unlet! b:current_syntax exe "syn include @vimPythonScript ".s:pythonpath if exists("g:vimsyn_folding") && g:vimsyn_folding =~ 'P' diff --git a/scripts/gendeclarations.lua b/scripts/gendeclarations.lua index 9398bbb31c..4e74e4e301 100755 --- a/scripts/gendeclarations.lua +++ b/scripts/gendeclarations.lua @@ -87,6 +87,15 @@ local spaces = any_amount(branch( any_character )), lit('\n') + ), + -- Linemarker inserted by preprocessor + concat( + lit('# '), + any_amount(concat( + neg_look_ahead(lit('\n')), + any_character + )), + lit('\n') ) )) local typ_part = concat( @@ -206,6 +215,8 @@ while init ~= nil do declaration = declaration:gsub('/%*.-%*/', '') declaration = declaration:gsub('//.-\n', '\n') + declaration = declaration:gsub('# .-\n', '') + declaration = declaration:gsub('\n', ' ') declaration = declaration:gsub('%s+', ' ') declaration = declaration:gsub(' ?%( ?', '(') @@ -220,6 +231,7 @@ while init ~= nil do else non_static = non_static .. declaration end + init = e end end end diff --git a/src/nvim/eval.c b/src/nvim/eval.c index f291d9f302..8a98eae21f 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -6363,8 +6363,8 @@ static int get_env_tv(char_u **arg, typval_T *rettv, int evaluate) len = get_env_len(arg); if (evaluate) { - if (len == 0) { - return FAIL; // Can't be an environment variable. + if (len == 0) { + return FAIL; // Invalid empty name. } cc = name[len]; name[len] = NUL; @@ -8145,11 +8145,17 @@ static void f_eval(typval_T *argvars, typval_T *rettv) if (s != NULL) s = skipwhite(s); + char_u *p = s; if (s == NULL || eval1(&s, rettv, TRUE) == FAIL) { + if (p != NULL && !aborting()) { + EMSG2(_(e_invexpr2), p); + } + need_clr_eos = FALSE; rettv->v_type = VAR_NUMBER; rettv->vval.v_number = 0; - } else if (*s != NUL) + } else if (*s != NUL) { EMSG(_(e_trailing)); + } } /* diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index d06f49a30b..f5cf226da4 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -7167,14 +7167,14 @@ static bool match_file_pat(char_u *pattern, regprog_T **prog, char_u *fname, * 2. the short file name, when the pattern has a '/'. * 3. the tail of the file name, when the pattern has no '/'. */ - if ( - (regmatch.regprog != NULL - && ((allow_dirs - && (vim_regexec(®match, fname, (colnr_T)0) - || (sfname != NULL - && vim_regexec(®match, sfname, (colnr_T)0)))) - || (!allow_dirs && vim_regexec(®match, tail, (colnr_T)0))))) + if (regmatch.regprog != NULL + && ((allow_dirs + && (vim_regexec(®match, fname, (colnr_T)0) + || (sfname != NULL + && vim_regexec(®match, sfname, (colnr_T)0)))) + || (!allow_dirs && vim_regexec(®match, tail, (colnr_T)0)))) { result = true; + } if (prog != NULL) { *prog = regmatch.regprog; @@ -7233,11 +7233,9 @@ file_pat_to_reg_pat ( int no_bslash /* Don't use a backward slash as pathsep */ ) { - size_t size; char_u *endp; char_u *reg_pat; char_u *p; - int i; int nested = 0; int add_dollar = TRUE; @@ -7246,7 +7244,7 @@ file_pat_to_reg_pat ( if (pat_end == NULL) pat_end = pat + STRLEN(pat); - size = 2; /* '^' at start, '$' at end */ + size_t size = 2; // '^' at start, '$' at end. for (p = pat; p < pat_end; p++) { switch (*p) { @@ -7275,7 +7273,7 @@ file_pat_to_reg_pat ( } reg_pat = xmalloc(size + 1); - i = 0; + size_t i = 0; if (pat[0] == '*') while (pat[0] == '*' && pat < pat_end - 1) diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 3217e06ac2..849bc0ea7d 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -7010,10 +7010,7 @@ static void nv_edit(cmdarg_T *cap) break; case 'I': /* "I"nsert before the first non-blank */ - if (vim_strchr(p_cpo, CPO_INSEND) == NULL) - beginline(BL_WHITE); - else - beginline(BL_WHITE|BL_FIX); + beginline(BL_WHITE); break; case 'a': /* "a"ppend is like "i"nsert on the next character. */ diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h index e40234f671..278b3f0872 100644 --- a/src/nvim/option_defs.h +++ b/src/nvim/option_defs.h @@ -95,7 +95,6 @@ #define CPO_EMPTYREGION 'E' /* operating on empty region is an error */ #define CPO_FNAMER 'f' /* set file name for ":r file" */ #define CPO_FNAMEW 'F' /* set file name for ":w file" */ -#define CPO_INSEND 'H' /* "I" inserts before last blank in line */ #define CPO_INTMOD 'i' /* interrupt a read makes buffer modified */ #define CPO_INDENT 'I' /* remove auto-indent more often */ #define CPO_JOINSP 'j' /* only use two spaces for join after '.' */ @@ -144,9 +143,9 @@ * cursor would not move */ /* default values for Vim, Vi and POSIX */ #define CPO_VIM "aABceFs" -#define CPO_VI "aAbBcCdDeEfFHiIjJkKlLmMnoOpPqrRsStuvWxXyZ$!%*-+<>;" +#define CPO_VI "aAbBcCdDeEfFiIjJkKlLmMnoOpPqrRsStuvWxXyZ$!%*-+<>;" #define CPO_ALL \ - "aAbBcCdDeEfFHiIjJkKlLmMnoOpPqrRsStuvWxXyZ$!%*-+<>#{|&/\\.;" + "aAbBcCdDeEfFiIjJkKlLmMnoOpPqrRsStuvWxXyZ$!%*-+<>#{|&/\\.;" /* characters for p_ww option: */ #define WW_ALL "bshl<>[],~" diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index 6726b49e77..133935b9c6 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -3274,7 +3274,7 @@ static lpos_T reg_endzpos[NSUBEXP]; /* idem, end pos */ * Uses curbuf for line count and 'iskeyword'. * If "line_lbr" is true, consider a "\n" in "line" to be a line break. * - * Return TRUE if there is a match, FALSE if not. + * Returns 0 for failure, number of lines contained in the match otherwise. */ static int bt_regexec_nl ( @@ -3293,7 +3293,10 @@ bt_regexec_nl ( ireg_ic = rmp->rm_ic; ireg_icombine = FALSE; ireg_maxcol = 0; - return bt_regexec_both(line, col, NULL) != 0; + + long r = bt_regexec_both(line, col, NULL); + assert(r <= INT_MAX); + return (int)r; } @@ -3312,8 +3315,6 @@ bt_regexec_nl ( static long bt_regexec_multi(regmmatch_T *rmp, win_T *win, buf_T *buf, linenr_T lnum, colnr_T col, proftime_T *tm) { - long r; - reg_match = NULL; reg_mmatch = rmp; reg_buf = buf; @@ -3325,14 +3326,13 @@ static long bt_regexec_multi(regmmatch_T *rmp, win_T *win, buf_T *buf, ireg_icombine = FALSE; ireg_maxcol = rmp->rmm_maxcol; - r = bt_regexec_both(NULL, col, tm); - - return r; + return bt_regexec_both(NULL, col, tm); } /* * Match a regexp against a string ("line" points to the string) or multiple * lines ("line" is NULL, use reg_getline()). + * Returns 0 for failure, number of lines contained in the match otherwise. */ static long bt_regexec_both(char_u *line, colnr_T col, /* column to start looking for match */ @@ -7078,10 +7078,11 @@ static int vim_regexec_both(regmatch_T *rmp, char_u *line, colnr_T col, bool nl) p_re = save_p_re; } - return result; + return result > 0; } // Note: "*prog" may be freed and changed. +// Return TRUE if there is a match, FALSE if not. int vim_regexec_prog(regprog_T **prog, bool ignore_case, char_u *line, colnr_T col) { @@ -7092,6 +7093,7 @@ int vim_regexec_prog(regprog_T **prog, bool ignore_case, char_u *line, } // Note: "rmp->regprog" may be freed and changed. +// Return TRUE if there is a match, FALSE if not. int vim_regexec(regmatch_T *rmp, char_u *line, colnr_T col) { return vim_regexec_both(rmp, line, col, false); @@ -7099,6 +7101,7 @@ int vim_regexec(regmatch_T *rmp, char_u *line, colnr_T col) // Like vim_regexec(), but consider a "\n" in "line" to be a line break. // Note: "rmp->regprog" may be freed and changed. +// Return TRUE if there is a match, FALSE if not. int vim_regexec_nl(regmatch_T *rmp, char_u *line, colnr_T col) { return vim_regexec_both(rmp, line, col, true); @@ -7145,5 +7148,5 @@ long vim_regexec_multi( p_re = save_p_re; } - return result; + return result <= 0 ? 0 : result; } diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 2dedc3db12..ee3eb89bd8 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -27,7 +27,6 @@ SCRIPTS := test_autoformat_join.out \ test76.out test79.out test80.out \ test82.out test83.out \ test86.out test87.out test88.out \ - test96.out \ test_listlbr.out \ test_breakindent.out \ test_argument_count.out \ diff --git a/src/nvim/testdir/test96.in b/src/nvim/testdir/test96.in deleted file mode 100644 index 9d1a2c83a5..0000000000 --- a/src/nvim/testdir/test96.in +++ /dev/null @@ -1,142 +0,0 @@ -This will test for problems in quickfix: -A. incorrectly copying location lists which caused the location list to show a - different name than the file that was actually being displayed. -B. not reusing the window for which the location list window is opened but - instead creating new windows. -C. make sure that the location list window is not reused instead of the window - it belongs to. - -Note: to debug a problem comment out the last ":b 1" in a test and testing will -stop at this point. - -STARTTEST -:so small.vim -: enew -: w! test.out -: b 1 -: " Set up the test environment: -: function! ReadTestProtocol(name) -: let base = substitute(a:name, '\v^test://(.*)%(\.[^.]+)?', '\1', '') -: let word = substitute(base, '\v(.*)\..*', '\1', '') -: -: setl modifiable -: setl noreadonly -: setl noswapfile -: setl bufhidden=delete -: %del _ -: " For problem 2: -: " 'buftype' has to be set to reproduce the constant opening of new windows -: setl buftype=nofile -: -: call setline(1, word) -: -: setl nomodified -: setl nomodifiable -: setl readonly -: exe 'doautocmd BufRead ' . substitute(a:name, '\v^test://(.*)', '\1', '') -: endfunction -: augroup testgroup -: au! -: autocmd BufReadCmd test://* call ReadTestProtocol(expand("<amatch>")) -: augroup END -: let words = [ "foo", "bar", "baz", "quux", "shmoo", "spam", "eggs" ] -: -: let qflist = [] -: for word in words -: call add(qflist, {'filename': 'test://' . word . '.txt', 'text': 'file ' . word . '.txt', }) -: " NOTE: problem 1: -: " intentionally not setting 'lnum' so that the quickfix entries are not -: " valid -: call setloclist(0, qflist, ' ') -: endfor -ENDTEST - -Test A: -STARTTEST -:lrewind -:enew -:lopen -:lnext -:lnext -:lnext -:lnext -:vert split -:wincmd L -:lopen -:wincmd p -:lnext -:"b 1 -:let fileName = expand("%") -:wincmd p -:let locationListFileName = substitute(getline(line('.')), '\([^|]*\)|.*', '\1', '') -:wincmd n -:wincmd K -:b test.out -:let fileName = substitute(fileName, '\\', '/', 'g') -:let locationListFileName = substitute(locationListFileName, '\\', '/', 'g') -:call append(line('$'), "Test A:") -:call append(line('$'), " - file name displayed: " . fileName) -:call append(line('$'), " - quickfix claims that the file name displayed is: " . locationListFileName) -:w -:wincmd o -:b 1 -ENDTEST - -Test B: -STARTTEST -:lrewind -:lopen -:2 -:exe "normal \<CR>" -:wincmd p -:3 -:exe "normal \<CR>" -:wincmd p -:4 -:exe "normal \<CR>" -:let numberOfWindowsOpen = winnr('$') -:wincmd n -:wincmd K -:b test.out -:call append(line('$'), "Test B:") -:call append(line('$'), " - number of window open: " . numberOfWindowsOpen) -:w -:wincmd o -:b 1 -ENDTEST - -Test C: -STARTTEST -:lrewind -:lopen -:" Let's move the location list window to the top to check whether it (the first -:" window found) will be reused when we try to open new windows: -:wincmd K -:2 -:exe "normal \<CR>" -:wincmd p -:3 -:exe "normal \<CR>" -:wincmd p -:4 -:exe "normal \<CR>" -:1wincmd w -:let locationListWindowBufType = &buftype -:2wincmd w -:let bufferName = expand("%") -:wincmd n -:wincmd K -:b test.out -:let bufferName = substitute(bufferName, '\\', '/', 'g') -:call append(line('$'), "Test C:") -:call append(line('$'), " - 'buftype' of the location list window: " . locationListWindowBufType) -:call append(line('$'), " - buffer displayed in the 2nd window: " . bufferName) -:w -:wincmd o -:b 1 -ENDTEST - -STARTTEST -:qa -ENDTEST - diff --git a/src/nvim/testdir/test96.ok b/src/nvim/testdir/test96.ok deleted file mode 100644 index 3498e52f73..0000000000 --- a/src/nvim/testdir/test96.ok +++ /dev/null @@ -1,9 +0,0 @@ - -Test A: - - file name displayed: test://bar.txt - - quickfix claims that the file name displayed is: test://bar.txt -Test B: - - number of window open: 2 -Test C: - - 'buftype' of the location list window: quickfix - - buffer displayed in the 2nd window: test://quux.txt diff --git a/src/nvim/undo.c b/src/nvim/undo.c index d74f1c0b03..ef1ac60599 100644 --- a/src/nvim/undo.c +++ b/src/nvim/undo.c @@ -1035,8 +1035,8 @@ void u_write_undo(char_u *name, int forceit, buf_T *buf, char_u *hash) } } - /* strip any s-bit */ - perm = perm & 0777; + // Strip any sticky and executable bits. + perm = perm & 0666; /* If the undo file already exists, verify that it actually is an undo * file, and delete it. */ diff --git a/src/nvim/version.c b/src/nvim/version.c index 76460959ed..e80b653c00 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -76,7 +76,7 @@ static int included_patches[] = { 710, //709, //708, - //707, + 707, 706, //705, //704, @@ -193,7 +193,7 @@ static int included_patches[] = { //593, //592, //591 NA - //590, + 590, //589 NA 588, //587, @@ -209,7 +209,7 @@ static int included_patches[] = { //577, //576, //575, - //574, + 574, //573, 572, //571 NA @@ -219,7 +219,7 @@ static int included_patches[] = { 567, 566, 565, - //564, + //564 NA 563, //562, 561, @@ -257,7 +257,7 @@ static int included_patches[] = { 529, 528, 527, - //526, + 526, 525, //524, //523 NA diff --git a/test/functional/legacy/096_location_list_spec.lua b/test/functional/legacy/096_location_list_spec.lua new file mode 100644 index 0000000000..2ccfd3530d --- /dev/null +++ b/test/functional/legacy/096_location_list_spec.lua @@ -0,0 +1,190 @@ +-- Test for problems in quickfix/location list: +-- A. incorrectly copying location lists which caused the location list to show a +-- different name than the file that was actually being displayed. +-- B. not reusing the window for which the location list window is opened but +-- instead creating new windows. +-- C. make sure that the location list window is not reused instead of the window +-- it belongs to. + +local helpers = require('test.functional.helpers') +local feed, insert, source = helpers.feed, helpers.insert, helpers.source +local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect + +describe('location list', function() + setup(clear) + + teardown(function() + os.remove('test.out') + end) + + it('is working', function() + -- Set up the test environment. + source( + -- This function serves as a callback which is executed on editing a new + -- buffer. It accepts a "test protocol" file name that looks like + -- "test://foo.txt". It sets some buffer-local settings and populates the + -- buffer with one line consisting of the base name ("foo"). + [[ + function! ReadTestProtocol(name) + let base = substitute(a:name, '\v^test://(.*)%(\.[^.]+)?', '\1', '') + let word = substitute(base, '\v(.*)\..*', '\1', '') + + setl modifiable + setl noreadonly + setl noswapfile + setl bufhidden=delete + %del _ + " For problem 2: + " 'buftype' has to be set to reproduce the constant opening of new windows. + setl buftype=nofile + + call setline(1, word) + + setl nomodified + setl nomodifiable + setl readonly + exe 'doautocmd BufRead ' . substitute(a:name, '\v^test://(.*)', '\1', '') + endfunction + ]] .. + + -- Register the above buffer setup function to be executed before + -- starting to edit a new "test protocol" buffer. + [[ + augroup testgroup + au! + autocmd BufReadCmd test://* call ReadTestProtocol(expand("<amatch>")) + augroup END + ]] .. + + -- Populate the location list of the current window with some test + -- protocol file locations such as "test://foo.txt". + [[ + let words = [ "foo", "bar", "baz", "quux", "shmoo", "spam", "eggs" ] + let qflist = [] + for word in words + call add(qflist, {'filename': 'test://' . word . '.txt', 'text': 'file ' . word . '.txt', }) + " NOTE: problem 1: + " Intentionally not setting 'lnum' so that the quickfix entries are not + " valid. + call setloclist(0, qflist, ' ') + endfor + ]]) + + -- Set up the result buffer "test.out". + execute('enew') + execute('w! test.out') + execute('b 1') + + -- Test A. + + -- Open a new buffer as the sole window, rewind and open the prepopulated + -- location list and navigate through the entries. + execute('lrewind') + execute('enew') + execute('lopen') + execute('lnext', 'lnext', 'lnext', 'lnext') + + -- Split the window, copying the location list, then open the copied + -- location list and again navigate forward. + execute('vert split') + execute('wincmd L') + execute('lopen') + execute('wincmd p') + execute('lnext') + + -- Record the current file name and the file name of the corresponding + -- location list entry, then open the result buffer. + execute('let fileName = expand("%")') + execute('wincmd p') + execute([[let locationListFileName = substitute(getline(line('.')), '\([^|]*\)|.*', '\1', '')]]) + execute('wincmd n') + execute('wincmd K') + execute('b test.out') + + -- Prepare test output and write it to the result buffer. + execute([[let fileName = substitute(fileName, '\\', '/', 'g')]]) + execute([[let locationListFileName = substitute(locationListFileName, '\\', '/', 'g')]]) + execute([[call append(line('$'), "Test A:")]]) + execute([[call append(line('$'), " - file name displayed: " . fileName)]]) + execute([[call append(line('$'), " - quickfix claims that the file name displayed is: " . locationListFileName)]]) + execute('w') + + -- Clean slate for the next test. + execute('wincmd o') + execute('b 1') + + -- Test B. + + -- Rewind the location list, then open it and browse through it by running + -- ":{number}" followed by Enter repeatedly in the location list window. + execute('lrewind') + execute('lopen') + execute('2', [[exe "normal \\<CR>"]]) + execute('wincmd p') + execute('3', [[exe "normal \<CR>"]]) + execute('wincmd p') + execute('4', [[exe "normal \<CR>"]]) + + -- Record the number of windows open, then go back to the result buffer. + execute('let numberOfWindowsOpen = winnr("$")') + execute('wincmd n') + execute('wincmd K') + execute('b test.out') + + -- Prepare test output and write it to the result buffer. + execute('call append(line("$"), "Test B:")') + execute('call append(line("$"), " - number of window open: " . numberOfWindowsOpen)') + execute('w') + + -- Clean slate. + execute('wincmd o') + execute('b 1') + + -- Test C. + + -- Rewind the location list, then open it and again do the ":{number}" plus + -- Enter browsing. But this time, move the location list window to the top + -- to check whether it (the first window found) will be reused when we try + -- to open new windows. + execute('lrewind') + execute('lopen') + execute('wincmd K') + execute('2', [[exe "normal \<CR>"]]) + execute('wincmd p') + execute('3', [[exe "normal \<CR>"]]) + execute('wincmd p') + execute('4', [[exe "normal \<CR>"]]) + + -- Record the 'buftype' of window 1 (the location list) and the buffer name + -- of window 2 (the current "test protocol" buffer), then go back to the + -- result buffer. + execute('1wincmd w') + execute('let locationListWindowBufType = &buftype') + execute('2wincmd w') + execute('let bufferName = expand("%")') + execute('wincmd n') + execute('wincmd K') + execute('b test.out') + + -- Prepare test output and write it to the result buffer. + execute([[let bufferName = substitute(bufferName, '\\', '/', 'g')]]) + execute([[call append(line("$"), "Test C:")]]) + execute([[call append(line('$'), " - 'buftype' of the location list window: " . locationListWindowBufType)]]) + execute([[call append(line('$'), " - buffer displayed in the 2nd window: " . bufferName)]]) + execute('w') + execute('wincmd o') + execute('b 1') + + -- Assert buffer contents. + expect([[ + + Test A: + - file name displayed: test://bar.txt + - quickfix claims that the file name displayed is: test://bar.txt + Test B: + - number of window open: 2 + Test C: + - 'buftype' of the location list window: quickfix + - buffer displayed in the 2nd window: test://quux.txt]]) + end) +end) diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake index 2f83cb8239..dc9d738041 100644 --- a/third-party/cmake/BuildLuarocks.cmake +++ b/third-party/cmake/BuildLuarocks.cmake @@ -58,7 +58,7 @@ list(APPEND THIRD_PARTY_DEPS lua-messagepack lpeg) if(USE_BUNDLED_BUSTED) # The following are only required if we want to run tests # with busted - + add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/stable-busted-deps COMMAND ${LUAROCKS_BINARY} ARGS build lua_cliargs 2.3-3 ${LUAROCKS_BUILDARGS} @@ -79,25 +79,25 @@ if(USE_BUNDLED_BUSTED) COMMAND ${LUAROCKS_BINARY} ARGS build luasocket 3.0rc1-2 ${LUAROCKS_BUILDARGS} COMMAND ${LUAROCKS_BINARY} - ARGS build xml 1.1.1-1 ${LUAROCKS_BUILDARGS} + ARGS build xml 1.1.2-1 ${LUAROCKS_BUILDARGS} COMMAND touch ${DEPS_LIB_DIR}/luarocks/rocks/stable-busted-deps DEPENDS lpeg) add_custom_target(stable-busted-deps DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/stable-busted-deps) - + add_custom_command(OUTPUT ${DEPS_BIN_DIR}/busted COMMAND ${LUAROCKS_BINARY} ARGS build https://raw.githubusercontent.com/Olivine-Labs/busted/v2.0.rc8-0/busted-2.0.rc8-0.rockspec ${LUAROCKS_BUILDARGS} DEPENDS stable-busted-deps) add_custom_target(busted DEPENDS ${DEPS_BIN_DIR}/busted) - + add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/nvim-client COMMAND ${LUAROCKS_BINARY} - ARGS build https://raw.githubusercontent.com/neovim/lua-client/8cc5b6090ac61cd0bba53ba984f15792fbb64573/nvim-client-0.0.1-11.rockspec ${LUAROCKS_BUILDARGS} LIBUV_DIR=${DEPS_INSTALL_DIR} + ARGS build https://raw.githubusercontent.com/neovim/lua-client/0.0.1-12/nvim-client-0.0.1-12.rockspec ${LUAROCKS_BUILDARGS} LIBUV_DIR=${DEPS_INSTALL_DIR} DEPENDS busted libuv) add_custom_target(nvim-client DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/nvim-client) - + list(APPEND THIRD_PARTY_DEPS stable-busted-deps busted nvim-client) endif() |