From a94bc430e81fb52b982fc3bdf8da60e585b91f58 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 10 Mar 2006 21:42:59 +0000 Subject: [PATCH] updated for version 7.0220 --- runtime/doc/autocmd.txt | 13 +++++- runtime/doc/eval.txt | 32 ++++++++++++++- runtime/doc/pi_netrw.txt | 6 +-- runtime/doc/spell.txt | 5 ++- runtime/doc/tags | 9 ++++ src/edit.c | 89 ++++++++++++++++++++++++++++++++++------ src/structs.h | 1 + src/version.h | 4 +- 8 files changed, 138 insertions(+), 21 deletions(-) diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index edf3c1e54..6f2a57ec5 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1,4 +1,4 @@ -*autocmd.txt* For Vim version 7.0aa. Last change: 2006 Mar 07 +*autocmd.txt* For Vim version 7.0aa. Last change: 2006 Mar 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -272,6 +272,9 @@ Name triggered by ~ |FileChangedShell| Vim notices that a file changed since editing started |FileChangedRO| before making the first change to a read-only file +|ShellCmdPost| after executing a shell command +|ShellFilterPost| after filtering with a shell command + |FuncUndefined| a user function is used but it isn't defined |SpellFileMissing| a spell file is used but it can't be found |SourcePre| before sourcing a Vim script @@ -667,6 +670,14 @@ RemoteReply When a reply from a Vim that functions as *SessionLoadPost* SessionLoadPost After loading the session file created using the |:mksession| command. + *ShellCmdPost* +ShellCmdPost After executing a shell command with |:!cmd|, + |:shell|, |:make| and |:grep|. Can be used to + check for any changed files. + *ShellFilterPost* +ShellFilterPost After executing a shell command with + ":{range}!cmd", ":w !cmd" or ":r !cmd". + Can be used to check for any changed files. *SourcePre* SourcePre Before sourcing a Vim script. |:source| *SpellFileMissing* diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 007f66cbb..9ca5d71a2 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.0aa. Last change: 2006 Mar 07 +*eval.txt* For Vim version 7.0aa. Last change: 2006 Mar 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1513,6 +1513,7 @@ call( {func}, {arglist} [, {dict}]) char2nr( {expr}) Number ASCII value of first char in {expr} cindent( {lnum}) Number C indent for line {lnum} col( {expr}) Number column nr of cursor or mark +complete({startcol}, {matches}) String set Insert mode completion complete_add( {expr}) Number add completion match complete_check() Number check for key typed during completion confirm( {msg} [, {choices} [, {default} [, {type}]]]) @@ -1958,6 +1959,35 @@ col({expr}) The result is a Number, which is the byte index of the column \let &ve = save_ve < +complete({startcol}, {matches}) *complete()* *E785* + Set the matches for Insert mode completion. + Can only be used in Insert mode. You need to use a mapping + with an expression argument |:map-| or CTRL-R = + |i_CTRL-R|. It does not work after CTRL-O. + {startcol} is the byte offset in the line where the completed + text start. The text up to the cursor is the original text + that will be replaced by the matches. Use col('.') for an + empty string. "col('.') - 1" will replace one character by a + match. + {matches} must be a |List|. Each |List| item is one match. + See |complete-items| for the kind of items that are possible. + Note that the after calling this function you need to avoid + inserting anything that would completion to stop. + The match can be selected with CTRL-N and CTRL-P as usual with + Insert mode completion. The popup menu will appear if + specified, see |ins-completion-menu|. + Example: > + inoremap ListMonths() + + func! ListMonths() + call complete(col('.'), ['January', 'February', 'March', + \ 'April', 'May', 'June', 'July', 'August', 'September', + \ 'October', 'November', 'December']) + return '' + endfunc +< This isn't very useful, but it shows how it works. Note that + an empty string is returned to avoid a zero being inserted. + complete_add({expr}) *complete_add()* Add {expr} to the list of matches. Only to be used by the function specified with the 'completefunc' option. diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt index b7a4ae6c4..ae39789d7 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -881,7 +881,7 @@ Netrw will not work properly with > < If either of these options are present when browsing is attempted, netrw will change them by using noacd and removing the ta suboptions from the -|formatoptions|. +|'formatoptions'|. *netrw-explore* *netrw-pexplore* *netrw-hexplore* *netrw-sexplore* @@ -1134,9 +1134,9 @@ One may use a preview window (currently only for local browsing) by using the PREVIOUS WINDOW *netrw-P* *netrw-prvwin* -To edit a file or directory in the previously used window (see :he |ctrl-w_p|), +To edit a file or directory in the previously used window (see :he |CTRL-W_P|), press a "P". If there's only one window, then the one window will be -horizontally split (above/below splitting is controlled by |g:netrw-alto|, +horizontally split (above/below splitting is controlled by |g:netrw_alto|, and its initial size is controlled by |g:netrw_winsize|). If there's more than one window, the previous window will be re-used on diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index ef8d1ade4..c2dbe1a24 100644 --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -1,4 +1,4 @@ -*spell.txt* For Vim version 7.0aa. Last change: 2006 Mar 05 +*spell.txt* For Vim version 7.0aa. Last change: 2006 Mar 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1536,7 +1536,8 @@ SYLLABLENUM (Hunspell) *spell-SYLLABLENUM* TRY (Myspell, Hunspell, others) *spell-TRY* Vim does not use the TRY item, it is ignored. For making - suggestions the actual characters in the words are used. + suggestions the actual characters in the words are used, that + is much more efficient. WORDCHARS (Hunspell) *spell-WORDCHARS* Used to recognize words. Vim doesn't need it, because there diff --git a/runtime/doc/tags b/runtime/doc/tags index ba89c010e..8f1aeffe1 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -2227,12 +2227,14 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* :map map.txt /*:map* :map! map.txt /*:map!* :map- map.txt /*:map-* +:map- map.txt /*:map-* :map-