- needed to modify this patch as it collides with the runtime-update patch

This commit is contained in:
Karsten Hopp 2007-01-23 11:21:56 +00:00
parent 6329cae978
commit 22de7395fa

158
7.0.187
View File

@ -1,3 +1,5 @@
# KH: Modified as it collides with the runtime-update patch
To: vim-dev@vim.org To: vim-dev@vim.org
Subject: patch 7.0.187 Subject: patch 7.0.187
Fcc: outbox Fcc: outbox
@ -12,101 +14,67 @@ Problem: Can't source a remote script properly.
Solution: Add the SourceCmd event. (Charles Campbell) Solution: Add the SourceCmd event. (Charles Campbell)
Files: runtime/doc/autocmd.txt, src/ex_cmds2.c, src/fileio.c, src/vim.h Files: runtime/doc/autocmd.txt, src/ex_cmds2.c, src/fileio.c, src/vim.h
diff -urN runtime/doc/autocmd.txt runtime/doc/autocmd.txt.new
*** ../vim-7.0.186/runtime/doc/autocmd.txt Sun May 7 17:07:33 2006 --- runtime/doc/autocmd.txt 2006-09-08 17:26:31.000000000 -0400
--- runtime/doc/autocmd.txt Tue Jan 16 21:29:14 2007 +++ runtime/doc/autocmd.txt 2007-01-23 06:17:46.000000000 -0500
*************** @@ -1,4 +1,4 @@
*** 1,4 **** -*autocmd.txt* For Vim version 7.0. Last change: 2006 Aug 29
! *autocmd.txt* For Vim version 7.0. Last change: 2006 May 06 +*autocmd.txt* For Vim version 7.0. Last change: 2007 Jan 16
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
--- 1,4 ---- @@ -279,6 +279,7 @@
! *autocmd.txt* For Vim version 7.0. Last change: 2007 Jan 16 |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
VIM REFERENCE MANUAL by Bram Moolenaar +|SourceCmd| before sourcing a Vim script |Cmd-event|
***************
*** 279,284 **** |VimResized| after the Vim window size changed
--- 279,285 ---- |FocusGained| Vim got input focus
|FuncUndefined| a user function is used but it isn't defined @@ -695,10 +696,16 @@
|SpellFileMissing| a spell file is used but it can't be found *SourcePre*
|SourcePre| before sourcing a Vim script SourcePre Before sourcing a Vim script. |:source|
+ |SourceCmd| before sourcing a Vim script |Cmd-event| <afile> is the name of the file being sourced.
+ *SourceCmd*
|VimResized| after the Vim window size changed +SourceCmd When sourcing a Vim script. |:source|
|FocusGained| Vim got input focus + <afile> is the name of the file being sourced.
*************** + The autocommand must source this file.
*** 690,699 **** + |Cmd-event|
Can be used to check for any changed files. *SpellFileMissing*
*SourcePre* SpellFileMissing When trying to load a spell checking file and
SourcePre Before sourcing a Vim script. |:source| - it can't be found. <amatch> is the language,
*SpellFileMissing* - 'encoding' also matters. See
SpellFileMissing When trying to load a spell checking file and + it can't be found. The pattern is matched
! it can't be found. <amatch> is the language, + against the language. <amatch> is the
! 'encoding' also matters. See + language, 'encoding' also matters. See
|spell-SpellFileMissing|. |spell-SpellFileMissing|.
*StdinReadPost* *StdinReadPost*
StdinReadPost After reading from the stdin into the buffer, StdinReadPost After reading from the stdin into the buffer,
--- 701,717 ---- @@ -1224,8 +1231,8 @@
Can be used to check for any changed files.
*SourcePre* *Cmd-event*
SourcePre Before sourcing a Vim script. |:source| When using one of the "*Cmd" events, the matching autocommands are expected to
+ <afile> is the name of the file being sourced. -do the file reading or writing. This can be used when working with a special
+ *SourceCmd* -kind of file, for example on a remote system.
+ SourceCmd When sourcing a Vim script. |:source| +do the file reading, writing or sourcing. This can be used when working with
+ <afile> is the name of the file being sourced. +a special kind of file, for example on a remote system.
+ The autocommand must source this file. CAREFUL: If you use these events in a wrong way, it may have the effect of
+ |Cmd-event| making it impossible to read or write the matching files! Make sure you test
*SpellFileMissing* your autocommands properly. Best is to use a pattern that will never match a
SpellFileMissing When trying to load a spell checking file and @@ -1238,9 +1245,10 @@
! it can't be found. The pattern is matched original file isn't needed for recovery. You might want to do this only when
! against the language. <amatch> is the you expect the file to be modified.
! language, 'encoding' also matters. See
|spell-SpellFileMissing|. -The |v:cmdarg| variable holds the "++enc=" and "++ff=" argument that are
*StdinReadPost* -effective. These should be used for the command that reads/writes the file.
StdinReadPost After reading from the stdin into the buffer, -The |v:cmdbang| variable is one when "!" was used, zero otherwise.
*************** +For file read and write commands the |v:cmdarg| variable holds the "++enc="
*** 1219,1226 **** +and "++ff=" argument that are effective. These should be used for the command
+that reads/writes the file. The |v:cmdbang| variable is one when "!" was
*Cmd-event* +used, zero otherwise.
When using one of the "*Cmd" events, the matching autocommands are expected to
! do the file reading or writing. This can be used when working with a special See the $VIMRUNTIME/plugin/netrw.vim for examples.
! kind of file, for example on a remote system.
CAREFUL: If you use these events in a wrong way, it may have the effect of
making it impossible to read or write the matching files! Make sure you test
your autocommands properly. Best is to use a pattern that will never match a
--- 1238,1245 ----
*Cmd-event*
When using one of the "*Cmd" events, the matching autocommands are expected to
! do the file reading, writing or sourcing. This can be used when working with
! a special kind of file, for example on a remote system.
CAREFUL: If you use these events in a wrong way, it may have the effect of
making it impossible to read or write the matching files! Make sure you test
your autocommands properly. Best is to use a pattern that will never match a
***************
*** 1233,1241 ****
original file isn't needed for recovery. You might want to do this only when
you expect the file to be modified.
! The |v:cmdarg| variable holds the "++enc=" and "++ff=" argument that are
! effective. These should be used for the command that reads/writes the file.
! The |v:cmdbang| variable is one when "!" was used, zero otherwise.
See the $VIMRUNTIME/plugin/netrw.vim for examples.
--- 1252,1261 ----
original file isn't needed for recovery. You might want to do this only when
you expect the file to be modified.
! For file read and write commands the |v:cmdarg| variable holds the "++enc="
! and "++ff=" argument that are effective. These should be used for the command
! that reads/writes the file. The |v:cmdbang| variable is one when "!" was
! used, zero otherwise.
See the $VIMRUNTIME/plugin/netrw.vim for examples.
*** ../vim-7.0.186/src/ex_cmds2.c Tue Aug 29 17:28:56 2006 *** ../vim-7.0.186/src/ex_cmds2.c Tue Aug 29 17:28:56 2006
--- src/ex_cmds2.c Tue Jan 16 18:30:40 2007 --- src/ex_cmds2.c Tue Jan 16 18:30:40 2007
*************** ***************