git-svn-id: https://svn.cambridge.iain.cx/profile/trunk@138 6be0d1a5-5cfe-0310-89b6...

diff --git a/.vim/script/p4 b/.vim/script/p4
index b226c87..402634d 100644 (file)
--- a/.vim/script/p4
+++ b/.vim/script/p4
@@ -1,4 +1,4 @@
-" $Id$ vim: set syntax=vim:
+" $Id$ vim: se syntax=vim:
 " Define the function we'll use.  It's easier to do this than to faff about 
 " trying to run a sequence of normal mode commands.
 fun! P4submit()
@@ -24,9 +24,10 @@ fun! P4submit()
         1
         delete
         set nobuflisted
-        set buftype=nofile
+        set buftype=nowrite
         set bufhidden=hide
         setlocal noswapfile
+        file [p4 diff]
 
         " Switch back to the top window and put the cursor by the description.
         wincmd k

diff --git a/.vim/script/svn b/.vim/script/svn
index fcca7e4..8ee0390 100644 (file)
--- a/.vim/script/svn
+++ b/.vim/script/svn
@@ -1,4 +1,4 @@
-" $Id$ vim: set syntax=vim:
+" $Id$ vim: se syntax=vim:
 " Define the function we'll use.  It's easier to do this than to faff about 
 " trying to run a sequence of normal mode commands.
 fun! SVNcommit()
@@ -14,9 +14,10 @@ fun! SVNcommit()
   1
   delete
   se nobuflisted
-  set buftype=nofile
+  set buftype=nowrite
   set bufhidden=hide
   setlocal noswapfile
+  file [svn diff]
 
   " Switch back to the top window.
   wincmd k
@@ -34,10 +35,4 @@ delfunction SVNcommit
 exe "se cmdheight=" . s:cmdheight
 
 " Close the scratch buffer.
-if version >= 700
-  " Vim 7 lets us close the buffer by number.  The changelist is always in #1.
-  au BufWinLeave <buffer=1> qa!
-else
-  " Prior versions can only do it by name.  Fall back to a temporary file.
-  au BufWinLeave /tmp/tmp.*.* qa!
-endif
+au BufWinLeave <buffer=1> qa!