diff options
Diffstat (limited to 'runtime/doc')
| -rw-r--r-- | runtime/doc/Makefile | 2 | ||||
| -rw-r--r-- | runtime/doc/autocmd.txt | 3 | ||||
| -rw-r--r-- | runtime/doc/develop.txt | 19 | ||||
| -rw-r--r-- | runtime/doc/editing.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/eval.txt | 53 | ||||
| -rw-r--r-- | runtime/doc/fold.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/gui.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/help.txt | 1 | ||||
| -rw-r--r-- | runtime/doc/index.txt | 3 | ||||
| -rw-r--r-- | runtime/doc/insert.txt | 10 | ||||
| -rw-r--r-- | runtime/doc/motion.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/nvim_terminal_emulator.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 79 | ||||
| -rw-r--r-- | runtime/doc/os_mac.txt | 116 | ||||
| -rw-r--r-- | runtime/doc/repeat.txt | 6 | ||||
| -rw-r--r-- | runtime/doc/starting.txt | 12 | ||||
| -rw-r--r-- | runtime/doc/todo.txt | 6 | ||||
| -rw-r--r-- | runtime/doc/various.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/vi_diff.txt | 37 | ||||
| -rw-r--r-- | runtime/doc/vim_diff.txt | 9 | ||||
| -rw-r--r-- | runtime/doc/windows.txt | 22 |
21 files changed, 136 insertions, 262 deletions
diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile index 07b4226151..7423e63673 100644 --- a/runtime/doc/Makefile +++ b/runtime/doc/Makefile @@ -20,7 +20,7 @@ all: tags html # Use Vim to generate the tags file. Can only be used when Vim has been # compiled and installed. Supports multiple languages. vimtags: $(DOCS) - $(VIMEXE) -u NONE -esX -c "helptags ++t ." -c quit + $(VIMEXE) -u NONE -es -c "helptags ++t ." -c quit # Use "doctags" to generate the tags file. Only works for English! tags: doctags $(DOCS) diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index 7b53bd64ca..a0ed91c95d 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -251,6 +251,7 @@ Name triggered by ~ |SwapExists| detected an existing swap file |TermOpen| when a terminal buffer is starting +|TermClose| when a terminal buffer ends Options |FileType| when the 'filetype' option has been set @@ -871,6 +872,8 @@ TermChanged After the value of 'term' has changed. Useful for re-loading the syntax file to update the colors, fonts and other terminal-dependent settings. Executed for all loaded buffers. + {Nvim} *TermClose* +TermClose When a terminal buffer ends. {Nvim} *TermOpen* TermOpen When a terminal buffer is starting. This can be used to configure the terminal emulator by diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt index 2f96c4c6dc..d0dd741888 100644 --- a/runtime/doc/develop.txt +++ b/runtime/doc/develop.txt @@ -140,18 +140,13 @@ such that most users will enjoy using Vim as it is. Commands and options can be used to adjust Vim to the desire of the user and its environment. -VIM IS... NOT *design-not* - -- Vim is not a shell or an Operating System. You will not be able to run a - shell inside Vim or use it to control a debugger. This should work the - other way around: Use Vim as a component from a shell or in an IDE. - A satirical way to say this: "Unlike Emacs, Vim does not attempt to include - everything but the kitchen sink, but some people say that you can clean one - with it. ;-)" - To use Vim with gdb see: http://www.agide.org and http://clewn.sf.net. -- Vim is not a fancy GUI editor that tries to look nice at the cost of - being less consistent over all platforms. But functional GUI features are - welcomed. +NVIM IS... NOT *design-not* + +Nvim is not an Operating System; instead it should be composed with other +tools, or hosted as a component. Marvim once said: "Unlike Emacs, Nvim does +not attempt to include everything but the kitchen sink, but some people use it +for plumbing." + ============================================================================== 2. Coding style *coding-style* diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index bb3d89e4ac..ffa3f1d673 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1141,8 +1141,8 @@ If you want to always use ":confirm", set the 'confirm' option. |:mkvimrc|, |:mksession|, |:mkview|, |:split|, |:vsplit|, |:tabe|, |:tabnew|, |:cfile|, |:cgetfile|, |:caddfile|, |:lfile|, |:lgetfile|, |:laddfile|, - |:diffsplit|, |:diffpatch|, |:open|, |:pedit|, - |:redir|, |:source|, |:update|, |:visual|, |:vsplit|, + |:diffsplit|, |:diffpatch|, |:pedit|, |:redir|, + |:source|, |:update|, |:visual|, |:vsplit|, and |:qall| if 'confirm' is set. {only in Win32, Athena, Motif, GTK and Mac GUI} When ":browse" is not possible you get an error diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 33ee5b78c1..7b12d2082f 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1763,6 +1763,8 @@ cursor( {lnum}, {col} [, {off}]) cursor( {list}) Number move cursor to position in {list} deepcopy( {expr} [, {noref}]) any make a full copy of {expr} delete( {fname}) Number delete file {fname} +dictwatcheradd({dict}, {pattern}, {callback}) Start watching a dictionary +dictwatcherdel({dict}, {pattern}, {callback}) Stop watching a dictionary did_filetype() Number TRUE if FileType autocommand event used diff_filler( {lnum}) Number diff filler lines about {lnum} diff_hlID( {lnum}, {col}) Number diff highlighting at {lnum}/{col} @@ -1870,10 +1872,13 @@ invert( {expr}) Number bitwise invert isdirectory( {directory}) Number TRUE if {directory} is a directory islocked( {expr}) Number TRUE if {expr} is locked items( {dict}) List key-value pairs in {dict} -job_close({job}) Closes a job with id {job} -job_send({job}, {data}) Writes {data} to {job}'s stdin -job_spawn({name}, {prog}[, {argv}]) - Spawns {prog} as a job associated with {name} +jobclose({job}[, {stream}]) Number Closes a job stream(s) +jobresize({job}, {width}, {height}) + Number Resize {job}'s pseudo terminal window +jobsend({job}, {data}) Number Writes {data} to {job}'s stdin +jobstart({cmd}[, {opts}]) Number Spawns {cmd} as a job +jobstop({job}) Number Stops a job +jobwait({ids}[, {timeout}]) Number Wait for a set of jobs join( {list} [, {sep}]) String join {list} items into one String keys( {dict}) List keys in {dict} len( {expr}) Number the length of {expr} @@ -2661,6 +2666,44 @@ delete({fname}) *delete()* To delete a line from the buffer use |:delete|. Use |:exe| when the line number is in a variable. +dictwatcheradd({dict}, {pattern}, {callback}) *dictwatcheradd()* + Adds a watcher to a dictionary. A dictionary watcher is + identified by three components: + + - A dictionary({dict}); + - A key pattern({pattern}). + - A function({callback}). + + After this is called, every change on {dict} and on keys + matching {pattern} will result in {callback} being invoked. + + For now {pattern} only accepts very simple patterns that can + contain a '*' at the end of the string, in which case it will + match every key that begins with the substring before the '*'. + That means if '*' is not the last character of {pattern}, only + keys that are exactly equal as {pattern} will be matched. + + The {callback} receives three arguments: + + - The dictionary being watched. + - The key which changed. + - A dictionary containg the new and old values for the key. + + The type of change can be determined by examining the keys + present on the third argument: + + - If contains both `old` and `new`, the key was updated. + - If it contains only `new`, the key was added. + - If it contains only `old`, the key was deleted. + + This function can be used by plugins to implement options with + validation and parsing logic. + +dictwatcherdel({dict}, {pattern}, {callback}) *dictwatcherdel()* + Removes a watcher added with |dictwatcheradd()|. All three + arguments must match the ones passed to |dictwatcheradd()| in + order for the watcher to be successfully deleted. + *did_filetype()* did_filetype() Returns non-zero when autocommands are being executed and the FileType event has been triggered at least once. Can be used @@ -2959,6 +3002,8 @@ extend({expr1}, {expr2} [, {expr3}]) *extend()* {expr1} is changed when {expr2} is not empty. If necessary make a copy of {expr1} first. {expr2} remains unchanged. + When {expr1} is locked and {expr2} is not empty the operation + fails. Returns {expr1}. diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt index ef69835462..03dd6a61ba 100644 --- a/runtime/doc/fold.txt +++ b/runtime/doc/fold.txt @@ -362,7 +362,7 @@ zX Undo manually opened and closed folds: re-apply 'foldlevel'. Also forces recomputing folds, like |zx|. *zm* -zm Fold more: Subtract one from 'foldlevel'. If 'foldlevel' was +zm Fold more: Subtract |v:count1| from 'foldlevel'. If 'foldlevel' was already zero nothing happens. 'foldenable' will be set. @@ -371,7 +371,7 @@ zM Close all folds: set 'foldlevel' to 0. 'foldenable' will be set. *zr* -zr Reduce folding: Add one to 'foldlevel'. +zr Reduce folding: Add |v:count1| to 'foldlevel'. *zR* zR Open all folds. This sets 'foldlevel' to highest fold level. diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt index 90f772c46f..c74c31d1fa 100644 --- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -61,10 +61,6 @@ When the GUI starts up initializations are carried out, in this order: ~/.config). The name of the first file found is stored in $MYGVIMRC, unless it was already set. -- If the 'exrc' option is set (which is NOT the default) the file ./.ngvimrc - is sourced, if it exists and isn't the same file as the system or user - gvimrc file. If this file is not owned by you, some security restrictions - apply. When ".ngvimrc" is not found, "_ngvimrc" is tried too. NOTE: All but the first one are not carried out if Vim was started with "-u NONE" and no "-U" argument was given, or when started with "-U NONE". diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt index 76903d50a5..9ca96dfd79 100644 --- a/runtime/doc/help.txt +++ b/runtime/doc/help.txt @@ -160,7 +160,6 @@ Versions ~ |vi_diff.txt| Main differences between Vim and Vi *sys-file-list* Remarks about specific systems ~ -|os_mac.txt| Macintosh |os_win32.txt| MS-Windows *standard-plugin-list* Standard plugins ~ diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index 0238d7cc53..75c986efcd 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1359,8 +1359,7 @@ tag command action ~ |:number| :nu[mber] print lines with line number |:nunmap| :nun[map] like ":unmap" but for Normal mode |:nunmenu| :nunme[nu] remove menu for Normal mode -|:oldfiles| :ol[dfiles] list files that have marks in the ShaDa file -|:open| :o[pen] start open mode (not implemented) +|:oldfiles| :o[ldfiles] list files that have marks in the ShaDa file |:omap| :om[ap] like ":map" but for Operator-pending mode |:omapclear| :omapc[lear] remove all mappings for Operator-pending mode |:omenu| :ome[nu] add menu for Operator-pending mode diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index a48ad0185d..013eb6b97b 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1,4 +1,4 @@ -*insert.txt* For Vim version 7.4. Last change: 2014 Aug 04 +*insert.txt* For Vim version 7.4. Last change: 2015 May 22 VIM REFERENCE MANUAL by Bram Moolenaar @@ -77,9 +77,11 @@ CTRL-W Delete the word before the cursor (see |i_backspacing| about joining lines). See the section "word motions", |word-motions|, for the definition of a word. *i_CTRL-U* -CTRL-U Delete all entered characters in the current line (see - |i_backspacing| about joining lines). - +CTRL-U Delete all entered characters before the cursor in the current + line. If there are no newly entereed characters and + 'backspace'is not empty, delete all characters before the + cursor in the current line. + See |i_backspacing| about joining lines. *i_CTRL-I* *i_<Tab>* *i_Tab* <Tab> or CTRL-I Insert a tab. If the 'expandtab' option is on, the equivalent number of spaces is inserted (use CTRL-V <Tab> to diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt index 5e3fe715ab..7f84f2d2a3 100644 --- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -1,4 +1,4 @@ -*motion.txt* For Vim version 7.4. Last change: 2014 Feb 11 +*motion.txt* For Vim version 7.4. Last change: 2015 Jun 06 VIM REFERENCE MANUAL by Bram Moolenaar @@ -171,6 +171,8 @@ CTRL-H or *CTRL-H* *<BS>* l or *l* <Right> or *<Right>* *<Space>* <Space> [count] characters to the right. |exclusive| motion. + See the 'whichwrap' option for adjusting the behavior + at end of line *0* 0 To the first character of the line. |exclusive| diff --git a/runtime/doc/nvim_terminal_emulator.txt b/runtime/doc/nvim_terminal_emulator.txt index 701c6dc274..6ef3aaebaa 100644 --- a/runtime/doc/nvim_terminal_emulator.txt +++ b/runtime/doc/nvim_terminal_emulator.txt @@ -105,6 +105,8 @@ The configuration variables are only processed when the terminal starts, which is why it needs to be done with the |TermOpen| autocmd or setting global variables before the terminal is started. +There is also a corresponding |TermClose| event. + The terminal cursor can be highlighted via |hl-TermCursor| and |hl-TermCursorNC|. diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index baafe8cbea..2b1044bead 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -980,60 +980,13 @@ A jump table for the options with a short description can be found at |Q_op|. the newly created file). Also see 'backupcopy' and |crontab|. *'balloondelay'* *'bdlay'* -'balloondelay' 'bdlay' number (default: 600) - global - {only available when compiled with the |+balloon_eval| - feature} - Delay in milliseconds before a balloon may pop up. See |balloon-eval|. +'balloondelay' 'bdlay' Removed. {Nvim} - *'ballooneval'* *'beval'* *'noballooneval'* *'nobeval'* -'ballooneval' 'beval' boolean (default off) - global - {only available when compiled with the |+balloon_eval| - feature} - Switch on the |balloon-eval| functionality. + *'ballooneval'* *'beval'* *'noballooneval'* *'nobeval'* +'ballooneval' 'beval' Removed. {Nvim} - *'balloonexpr'* *'bexpr'* -'balloonexpr' 'bexpr' string (default "") - global or local to buffer |global-local| - {only available when compiled with the |+balloon_eval| - feature} - Expression for text to show in evaluation balloon. It is only used - when 'ballooneval' is on. These variables can be used: - - v:beval_bufnr number of the buffer in which balloon is going to show - v:beval_winnr number of the window - v:beval_lnum line number - v:beval_col column number (byte index) - v:beval_text word under or after the mouse pointer - - The evaluation of the expression must not have side effects! - Example: > - function! MyBalloonExpr() - return 'Cursor is at line ' . v:beval_lnum . - \', column ' . v:beval_col . - \ ' of file ' . bufname(v:beval_bufnr) . - \ ' on word "' . v:beval_text . '"' - endfunction - set bexpr=MyBalloonExpr() - set ballooneval -< - NOTE: The balloon is displayed only if the cursor is on a text - character. If the result of evaluating 'balloonexpr' is not empty, - Vim does not try to send a message to an external debugger (Netbeans - or Sun Workshop). - - The expression will be evaluated in the |sandbox| when set from a - modeline, see |sandbox-option|. - - It is not allowed to change text or jump to another window while - evaluating 'balloonexpr' |textlock|. - - To check whether line breaks in the balloon text work use this check: > - if has("balloon_multiline") -< When they are supported "\n" characters will start a new line. If the - expression evaluates to a |List| this is equal to using each List item - as a string and putting "\n" in between them. + *'balloonexpr'* *'bexpr'* +'balloonexpr' 'bexpr' Removed. {Nvim} *'belloff'* *'bo'* 'belloff' 'bo' string (default "") @@ -1538,14 +1491,6 @@ A jump table for the options with a short description can be found at |Q_op|. (gzipped files for example). Unloaded buffers are not scanned for whole-line completion. - The default is ".,w,b,u,t,i", which means to scan: - 1. the current buffer - 2. buffers in other windows - 3. other loaded buffers - 4. unloaded buffers - 5. tags - 6. included files - As you can see, CTRL-N and CTRL-P can be used to do any 'iskeyword'- based expansion (e.g., dictionary |i_CTRL-X_CTRL-K|, included patterns |i_CTRL-X_CTRL-I|, tags |i_CTRL-X_CTRL-]| and normal expansions). @@ -2350,13 +2295,13 @@ 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 - Enables the reading of .nvimrc, .exrc and .ngvimrc in the current - directory. If you switch this option on you should also consider - setting the 'secure' option (see |initialization|). Using a local - .exrc, .nvimrc or .ngvimrc is a potential security leak, use with care! - also see |init.vim| and |gui-init|. + Enables the reading of .nvimrc and .exrc in the current directory. + If you switch this option on you should also consider setting the + 'secure' option (see |initialization|). Using this option comes + with a potential security risk, use with care! This option cannot be set from a |modeline| or in the |sandbox|, for security reasons. + Also see |init.vim| and |gui-init|. *'fileencoding'* *'fenc'* *E213* 'fileencoding' 'fenc' string (default: "") @@ -5342,8 +5287,8 @@ A jump table for the options with a short description can be found at |Q_op|. *'shada'* *'sd'* *E526* *E527* *E528* 'shada' 'sd' string (Vim default for - Win32: '!,100,<50,s10,h,rA:,rB: - others: '!,100,<50,s10,h + Win32: !,'100,<50,s10,h,rA:,rB: + others: !,'100,<50,s10,h Vi default: "") global When non-empty, the shada file is read upon startup and written diff --git a/runtime/doc/os_mac.txt b/runtime/doc/os_mac.txt deleted file mode 100644 index 3eebb7ef0d..0000000000 --- a/runtime/doc/os_mac.txt +++ /dev/null @@ -1,116 +0,0 @@ -*os_mac.txt* For Vim version 7.4. Last change: 2006 Apr 30 - - - VIM REFERENCE MANUAL by Bram Moolenaar et al. - - - *mac* *Mac* *macintosh* *Macintosh* - -This file documents the particularities of the Macintosh version of Vim. - -NOTE: This file is a bit outdated. You might find more useful info here: - http://macvim.org/ - -1. Filename Convention |mac-filename| -2. .vimrc an .vim files |mac-vimfile| -3. FAQ |mac-faq| -4. Known Lack |mac-lack| -5. Mac Bug Report |mac-bug| -6. Compiling Vim |mac-compile| - -There was a Mac port for version 3.0 of Vim. Here are the first few lines -from the old file: - -VIM Release Notes -Initial Macintosh release, VIM version 3.0 -19 October 1994 - -Eric Fischer -<enf1@midway.uchicago.edu>, <eric@jcp.uchicago.edu>, <etaoin@uchicago.edu> -5759 N. Guilford Ave -Indianapolis IN 46220 USA - -============================================================================== -1. Filename Convention *mac-filename* - -Starting with Vim version 7 you can just use the unix path separators with -Vim. In order to determine if the specified filename is relative to the -current folder or absolute (i.e. relative to the "Desktop"), the following -algorithm is used: - - If the path start by a "/", the path is absolute - If the path start by a ":", the path is relative - If the path doesn't start by neither a "/" nor ":", - and a ":" is found before a "/" then the path is absolute -> - :e /HD/text - :e HD:text -< Edit the file "text" of the disk "HD" > - :e :src:main.c - :e src/main.c -< Edit the file "main.c" in the folder "src" in the current folder > - :e os_mac.c -< Edit the file "os_mac.c" in the current folder. - -You can use the |$VIM| and |$VIMRUNTIME| variable. > - - :so $VIMRUNTIME/syntax/syntax.vim - -============================================================================== -2. .vimrc and .vim files *mac-vimfile* - -It is recommended to use Unix style line separators for Vim scripts, thus a -single newline character. - -When starting up Vim will load the $VIMRUNTIME/macmap.vim script to define -default command-key mappings. - -On older systems files starting with a dot "." are discouraged, thus the rc -files are named "vimrc" or "_vimrc" and "gvimrc" or "_gvimrc". These files -can be in any format (mac, dos or unix). - -============================================================================== -3. Mac FAQ *mac-faq* - -On the internet: http://macvim.org/OSX/index.php#FAQ - -Q: I can't enter non-ASCII character in Apple Terminal. -A: Under Window Settings, Emulation, make sure that "Escape non-ASCII - characters" is not checked. - -Q: How do I start the GUI from the command line? -A: Assuming that Vim.app is located in /Applications: - open /Applications/Vim.app - Or: - /Applications/Vim.app/Contents/MacOS/Vim -g {arguments} - -Q: How can I set $PATH to something reasonable when I start Vim.app from the - GUI or with open? -A: The following trick works with most shells. Put it in your vimrc file. - This is included in the system vimrc file included with the binaries - distributed at macvim.org . > - let s:path = system("echo echo VIMPATH'${PATH}' | $SHELL -l") - let $PATH = matchstr(s:path, 'VIMPATH\zs.\{-}\ze\n') - -============================================================================== -4. Mac Lack *mac-lack* - -In a terminal CTRL-^ needs to be entered as Shift-Control-6. CTRL-@ as -Shift-Control-2. - -============================================================================== -5. Mac Bug Report *mac-bug* - -When reporting any Mac specific bug or feature change, please use the vim-mac -maillist |vim-mac|. However, you need to be subscribed. An alternative is to -send a message to the current MacVim maintainers: - - mac@vim.org - -============================================================================== -6. Compiling Vim *mac-compile* - -See the file "src/INSTALLmac.txt" that comes with the source files. - - - vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt index 75384832ec..d029391c60 100644 --- a/runtime/doc/repeat.txt +++ b/runtime/doc/repeat.txt @@ -586,6 +586,9 @@ For example, to profile the one_script.vim script file: > If {fname} already exists it will be silently overwritten. The variable |v:profiling| is set to one. +:prof[ile] stop + Write the logfile and stop profiling. + :prof[ile] pause Don't profile until the following ":profile continue". Can be used when doing something that should not be counted (e.g., an @@ -609,6 +612,9 @@ For example, to profile the one_script.vim script file: > after this command. A :profile command in the script itself won't work. +:prof[ile] dump + Don't wait until exiting Vim and write the current state of + profiling to the log immediately. :profd[el] ... *:profd* *:profdel* Stop profiling for the arguments specified. See |:breakdel| diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index 2c630ed958..572823eca9 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -402,10 +402,9 @@ accordingly. Vim proceeds in this order: initializations until 4. are skipped. Only the "-u" option is interpreted. *system-vimrc* - a. For Unix, MS-DOS, MS-Windows, and Macintosh, the system vimrc file is - read for initializations. The path of this file is shown with the + a. For Unix, MS-Windows, and Macintosh, the system vimrc file is read for + initializations. The path of this file is shown with the ":version" command. Mostly it's "$VIM/vimrc". - For the Macintosh the $VIMRUNTIME/macmap.vim is read. *VIMINIT* *EXINIT* *$MYVIMRC* b. Four places are searched for initializations. The first that exists @@ -1163,13 +1162,14 @@ running) you have additional options: *:wv* *:wviminfo* :wv[iminfo][!] [file] Deprecated alias to |:wshada| command. - *:ol* *:oldfiles* -:ol[dfiles] List the files that have marks stored in the ShaDa + *:o* *:ol* *:oldfiles* +:o[ldfiles][!] List the files that have marks stored in the ShaDa file. This list is read on startup and only changes afterwards with ":rshada!". Also see |v:oldfiles|. The number can be used with |c_#<|. + Use ! to get a file selection prompt. -:bro[wse] ol[dfiles][!] +:bro[wse] o[ldfiles][!] List file names as with |:oldfiles|, and then prompt for a number. When the number is valid that file from the list is edited. diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 65e69a901b..eeed014fdb 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1140,9 +1140,6 @@ Now that colnr_T is int instead of unsigned, more type casts can be removed. 'delcombine' does not work for the command line. (Tony Mechelynck, 2009 Jul 20) -Don't load macmap.vim on startup, turn it into a plugin. (Ron Aaron, -2009 Apr 7) Reminder Apr 14. - Add "no_hlsearch" to winsaveview(). Cursorline highlighting combines with Search ('hlsearch') but not with @@ -1389,9 +1386,6 @@ The utf class table is missing some entries: Visual line mode doesn't highlight properly when 'showbreak' is used and the line doesn't fit. (Dasn, 2008 May 1) -Mac: Move Carbon todo items to os_mac.txt. Note that this version is frozen, -try the Cocoa version. - Mac: After a ":vsplit" the left scrollbar doesn't appear until 'columns' is changed or the window is resized. diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index 1b95cfe7d0..117e977e0d 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -212,7 +212,7 @@ g8 Print the hex values of the bytes used in the equivalent to: > :enew - :call termopen([&sh, &shcf, '{cmd}']) + :call termopen('{cmd}') :startinsert < If no {cmd} is given, 'shellcmdflag' will not be sent diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt index e76c0163b5..fffb923219 100644 --- a/runtime/doc/vi_diff.txt +++ b/runtime/doc/vi_diff.txt @@ -10,33 +10,14 @@ Throughout the help files differences between Vim and Vi/Ex are given in curly braces, like "{not in Vi}". This file only lists what has not been mentioned in other files and gives an overview. -1. Simulated command |simulated-command| -2. Missing options |missing-options| -3. Limits |limits| -4. The most interesting additions |vim-additions| -5. Other vim features |other-features| -6. Command-line arguments |cmdline-arguments| +1. Missing options |missing-options| +2. Limits |limits| +3. The most interesting additions |vim-additions| +4. Other vim features |other-features| +5. Command-line arguments |cmdline-arguments| ============================================================================== -1. Simulated command *simulated-command* - -This command is in Vi, but Vim only simulates it: - - *:o* *:op* *:open* -:[range]o[pen] Works like |:visual|: end Ex mode. - {Vi: start editing in open mode} - -:[range]o[pen] /pattern/ As above, additionally move the cursor to the - column where "pattern" matches in the cursor - line. - -Vim does not support open mode, since it's not really useful. For those -situations where ":open" would start open mode Vim will leave Ex mode, which -allows executing the same commands, but updates the whole screen instead of -only one line. - -============================================================================== -2. Missing options *missing-options* +1. Missing options *missing-options* These options are in the Unix Vi, but not in Vim. @@ -58,7 +39,7 @@ w1200 number (default 23) *'w1200'* w9600 number (default 23) *'w9600'* ============================================================================== -3. Limits *limits* +2. Limits *limits* Vim has only a few limits for the files that can be edited {Vi: can not handle <Nul> characters and characters above 128, has limited line length, many other @@ -102,7 +83,7 @@ don't want a swap file at all, set 'updatecount' to 0, or use the "-n" argument when starting Vim. ============================================================================== -4. The most interesting additions *vim-additions* +3. The most interesting additions *vim-additions* Vi compatibility. |'compatible'| Although Vim is 99% Vi compatible, some things in Vi can be @@ -744,7 +725,7 @@ The "No lines in buffer" message is a normal message instead of an error message, since that may cause a mapping to be aborted. ============================================================================== -6. Command-line arguments *cmdline-arguments* +5. Command-line arguments *cmdline-arguments* Different versions of Vi have different command-line arguments. This can be confusing. To help you, this section gives an overview of the differences. diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index 6124c36dc9..6cbc2aef59 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -24,7 +24,7 @@ these differences. - Use `$XDG_CONFIG_HOME/nvim/init.vim` instead of `.vimrc` for storing configuration. - Use `$XDG_CONFIG_HOME/nvim` instead of `.vim` to store configuration files. -- Use `$XDG_DATA_HOME/shada/main.shada` instead of `.viminfo` for persistent +- Use `$XDG_DATA_HOME/nvim/shada/main.shada` instead of `.viminfo` for persistent session information. ============================================================================== @@ -106,6 +106,7 @@ Additional differences: compatibility reasons. - |:wviminfo| was renamed to |:wshada|, |:rviminfo| to |:rshada|. Old commands are still kept. +- |:oldfiles| supports !. - When writing (|:wshada| without bang or at exit) it merges much more data, and does this according to the timestamp. Vim merges only marks. |shada-merging| @@ -142,6 +143,8 @@ Events: |TabNew| |TabNewEntered| |TabClosed| + |TermOpen| + |TermClose| Highlight groups: |hl-EndOfBuffer| @@ -197,7 +200,7 @@ Other options: 'macatsui' 'shelltype' 'shortname' - 'termencoding' + 'termencoding' (Vim 7.4.852 also removed this for Windows) 'textauto' 'textmode' 'toolbar' @@ -210,12 +213,14 @@ Other commands: :Print :fixdel :mode (no longer accepts an argument) + :open :shell :tearoff Other compile-time features: EBCDIC Emacs tags support + X11 integration (see |x11-selection|) Nvim does not have a built-in GUI and hence the following aliases have been removed: gvim, gex, gview, rgvim, rgview diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt index 95be125c33..c009bec66e 100644 --- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -971,9 +971,10 @@ A buffer can also be unlisted. This means it exists, but it is not in the list of buffers. |unlisted-buffer| -:files[!] *:files* -:buffers[!] *:buffers* *:ls* -:ls[!] Show all buffers. Example: +:files[!] [flags] *:files* +:buffers[!] [flags] *:buffers* *:ls* +:ls[!] [flags] + Show all buffers. Example: 1 #h "/test/text" line 1 ~ 2u "asdf" line 0 ~ @@ -999,6 +1000,21 @@ list of buffers. |unlisted-buffer| + a modified buffer x a buffer with read errors + [flags] can be a combination of the following characters, + which restrict the buffers to be listed: + + modified buffers + - buffers with 'modifiable' off + = readonly buffers + a active buffers + u unlisted buffers (overrides the "!") + h hidden buffers + x buffers with a read error + % current buffer + # alternate buffer + Combining flags means they are "and"ed together, e.g.: + h+ hidden buffers which are modified + a+ active buffers which are modified + *:bad* *:badd* :bad[d] [+lnum] {fname} Add file name {fname} to the buffer list, without loading it. |