Mercurial > vim
changeset 590:de152391f6f9
updated for version 7.0167
author | vimboss |
---|---|
date | Sun, 11 Dec 2005 21:33:32 +0000 |
parents | bc49ed25543d |
children | 36071a92cb76 |
files | Filelist runtime/doc/autocmd.txt runtime/doc/eval.txt runtime/doc/options.txt runtime/doc/tags src/option.h src/structs.h src/version.h |
diffstat | 8 files changed, 58 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/Filelist +++ b/Filelist @@ -444,6 +444,7 @@ RT_ALL = \ runtime/gvimrc_example.vim \ runtime/macros/README.txt \ runtime/macros/dvorak \ + runtime/macros/editexisting.vim \ runtime/macros/hanoi/click.me \ runtime/macros/hanoi/hanoi.vim \ runtime/macros/hanoi/poster \
--- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1,4 +1,4 @@ -*autocmd.txt* For Vim version 7.0aa. Last change: 2005 Dec 07 +*autocmd.txt* For Vim version 7.0aa. Last change: 2005 Dec 11 VIM REFERENCE MANUAL by Bram Moolenaar @@ -18,6 +18,7 @@ 7. Buffer-local autocommands |autocmd-b 8. Groups |autocmd-groups| 9. Executing autocommands |autocmd-execute| 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} @@ -655,10 +656,12 @@ SwapExists Detected an existing swap f select a way to handle the situation, when Vim would ask the user what to do. The |v:swapname| variable holds the name of - the swap file found. - The |v:swapchoice| variable should be set to - a string with one character to tell what Vim - should do next: + the swap file found, <afile> the file being + edited. |v:swapcommand| may contain a command + to be executed in the opened file. + The commands should set the |v:swapchoice| + variable to a string with one character to + tell Vim what should be done next: 'o' open read-only 'e' edit the file anyway 'r' recover @@ -1052,10 +1055,8 @@ It's possible to use the ":au" command i self-modifying command! This can be useful for an autocommand that should execute only once. -There is currently no way to disable the autocommands. If you want to write a -file without executing the autocommands for that type of file, write it under -another name and rename it with a shell command. In some situations you can -use the 'eventignore' option. +If you want to skip autocommands for one command, use the |:noautocmd| command +modifier or the 'eventignore' option. Note: When reading a file (with ":read file" or with a filter command) and the last line in the file does not have an <EOL>, Vim remembers this. At the next @@ -1172,5 +1173,22 @@ The |v:cmdbang| variable is one when "!" See the $VIMRUNTIME/plugin/netrw.vim for examples. +============================================================================== +11. Disabling autocommands *autocmd-disable* + +To disable autocommands for some time use the 'eventignore' option. Note that +this may cause unexpected behavior, make sure you restore 'eventignore' +afterwards, using a |:try| block with |:finally|. + + *:noautocmd* *:noa* +To disable autocommands for just one command use the ":noautocmd" command +modifier. This will set 'eventignore' to "all" for the duration of the +following command. Example: > + + :noautocmd w fname.gz + +This will write the file without triggering the autocommands defined by the +gzip plugin. + vim:tw=78:ts=8:ft=help:norl:
--- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.0aa. Last change: 2005 Dec 07 +*eval.txt* For Vim version 7.0aa. Last change: 2005 Dec 11 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1418,6 +1418,12 @@ v:swapchoice |SwapExists| autocommands c results in the user being asked, as would happen when there is no SwapExists autocommand. The default is empty. + *v:swapcommand* *swapcommand-variable* +v:swapcommand Normal mode ommand to be executed after a file has been + opened. Can be used for a |SwapExists| autocommand to have + another Vim open the file and jump to the right place. For + example, when jumping to a tag the value is ":tag tagname\r". + *v:termresponse* *termresponse-variable* v:termresponse The escape sequence returned by the terminal for the |t_RV| termcap entry. It is set when Vim receives an escape sequence
--- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.0aa. Last change: 2005 Nov 30 +*options.txt* For Vim version 7.0aa. Last change: 2005 Dec 11 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1819,7 +1819,7 @@ A jump table for the options with a shor F When included, a ":write" command with a file name argument will set the file name for the current buffer, if the current buffer doesn't have a file name - yet. + yet. Also see |cpo-P|. *cpo-g* g Goto line 1 when using ":edit" without argument. *cpo-H* @@ -1888,6 +1888,11 @@ A jump table for the options with a shor *cpo-p* p Vi compatible Lisp indenting. When not present, a slightly better algorithm is used. + *cpo-P* + P When included, a ":write" command that appends to a + file will set the file name for the current buffer, if + the current buffer doesn't have a file name yet and + the 'F' flag is also included |cpo-F|. *cpo-q* q When joining multiple lines leave the cursor at the position where it would be when joining two lines.
--- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -2143,6 +2143,7 @@ 90.5 usr_90.txt /*90.5* :map-<script> map.txt /*:map-<script>* :map-<silent> map.txt /*:map-<silent>* :map-<unique> map.txt /*:map-<unique>* +:map-alt-keys map.txt /*:map-alt-keys* :map-local map.txt /*:map-local* :map-script map.txt /*:map-script* :map-silent map.txt /*:map-silent* @@ -2209,6 +2210,8 @@ 90.5 usr_90.txt /*90.5* :nnoremenu gui.txt /*:nnoremenu* :no map.txt /*:no* :no! map.txt /*:no!* +:noa autocmd.txt /*:noa* +:noautocmd autocmd.txt /*:noautocmd* :noh pattern.txt /*:noh* :nohlsearch pattern.txt /*:nohlsearch* :norea map.txt /*:norea* @@ -4227,6 +4230,7 @@ autocmd-buffer-local autocmd.txt /*autoc autocmd-buflocal autocmd.txt /*autocmd-buflocal* autocmd-changes autocmd.txt /*autocmd-changes* autocmd-define autocmd.txt /*autocmd-define* +autocmd-disable autocmd.txt /*autocmd-disable* autocmd-events autocmd.txt /*autocmd-events* autocmd-events-abc autocmd.txt /*autocmd-events-abc* autocmd-execute autocmd.txt /*autocmd-execute* @@ -4532,6 +4536,7 @@ cpo-K options.txt /*cpo-K* cpo-L options.txt /*cpo-L* cpo-M options.txt /*cpo-M* cpo-O options.txt /*cpo-O* +cpo-P options.txt /*cpo-P* cpo-R options.txt /*cpo-R* cpo-S options.txt /*cpo-S* cpo-W options.txt /*cpo-W* @@ -6569,6 +6574,7 @@ suffixes cmdline.txt /*suffixes* suspend starting.txt /*suspend* swap-file recover.txt /*swap-file* swapchoice-variable eval.txt /*swapchoice-variable* +swapcommand-variable eval.txt /*swapcommand-variable* swapfile-changed version4.txt /*swapfile-changed* swapname-variable eval.txt /*swapname-variable* syn-sync-grouphere syntax.txt /*syn-sync-grouphere* @@ -6993,6 +6999,7 @@ v:servername eval.txt /*v:servername* v:shell_error eval.txt /*v:shell_error* v:statusmsg eval.txt /*v:statusmsg* v:swapchoice eval.txt /*v:swapchoice* +v:swapcommand eval.txt /*v:swapcommand* v:swapname eval.txt /*v:swapname* v:termresponse eval.txt /*v:termresponse* v:this_session eval.txt /*v:this_session* @@ -7331,7 +7338,7 @@ z/OS os_390.txt /*z\/OS* z<CR> scroll.txt /*z<CR>* z<Left> scroll.txt /*z<Left>* z<Right> scroll.txt /*z<Right>* -z? spell.txt /*z?* +z= spell.txt /*z=* zA fold.txt /*zA* zC fold.txt /*zC* zD fold.txt /*zD*
--- a/src/option.h +++ b/src/option.h @@ -147,6 +147,7 @@ #define CPO_LINEOFF 'o' #define CPO_OVERNEW 'O' /* silently overwrite new file */ #define CPO_LISP 'p' /* 'lisp' indenting */ +#define CPO_FNAMEAPP 'P' /* set file name for ":w >>file" */ #define CPO_JOINCOL 'q' /* with "3J" use column after first join */ #define CPO_REDO 'r' #define CPO_REMMARK 'R' /* remove marks when filtering */ @@ -179,8 +180,8 @@ #define CPO_CHDIR '.' /* don't chdir if buffer is modified */ /* default values for Vim, Vi and POSIX */ #define CPO_VIM "aABceFs" -#define CPO_VI "aAbBcCdDeEfFgHiIjJkKlLmMnoOpqrRsStuvwWxXyZ$!%*-+<>" -#define CPO_ALL "aAbBcCdDeEfFgHiIjJkKlLmMnoOpqrRsStuvwWxXyZ$!%*-+<>#{|&/\\." +#define CPO_VI "aAbBcCdDeEfFgHiIjJkKlLmMnoOpPqrRsStuvwWxXyZ$!%*-+<>" +#define CPO_ALL "aAbBcCdDeEfFgHiIjJkKlLmMnoOpPqrRsStuvwWxXyZ$!%*-+<>#{|&/\\." /* characters for p_ww option: */ #define WW_ALL "bshl<>[],~"
--- a/src/structs.h +++ b/src/structs.h @@ -432,6 +432,9 @@ typedef struct int keepmarks; /* TRUE when ":keepmarks" was used */ int keepjumps; /* TRUE when ":keepjumps" was used */ int lockmarks; /* TRUE when ":lockmarks" was used */ +# ifdef FEAT_AUTOCMD + char_u *save_ei; /* saved value of 'eventignore' */ +# endif } cmdmod_T; /*
--- a/src/version.h +++ b/src/version.h @@ -36,5 +36,5 @@ #define VIM_VERSION_NODOT "vim70aa" #define VIM_VERSION_SHORT "7.0aa" #define VIM_VERSION_MEDIUM "7.0aa ALPHA" -#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 10)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 10, compiled " +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 11)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 11, compiled "