Index: ossp-pkg/svs/ChangeLog
RCS File: /v/ossp/cvs/ossp-pkg/svs/ChangeLog,v
rcsdiff -q -kk '-r1.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/svs/ChangeLog,v' 2>/dev/null
--- ChangeLog	2004/12/16 16:39:37	1.2
+++ ChangeLog	2004/12/17 09:52:08	1.3
@@ -10,6 +10,10 @@
 
   Changes between 1.0.0 and 1.0.1 (14-Dec-2004 to 16-Dec-2004):
 
+    *) When editing a file look for corresponding .rej file
+       and if found and the editor is Vim, open both files. 
+       [Ralf S. Engelschall]
+
     *) When searching for *.orig files, sort the resulting filename
        list to make sure we deterministically produce patches.
        [Ralf S. Engelschall]
Index: ossp-pkg/svs/svs.sh
RCS File: /v/ossp/cvs/ossp-pkg/svs/svs.sh,v
rcsdiff -q -kk '-r1.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/svs/svs.sh,v' 2>/dev/null
--- svs.sh	2004/12/16 16:39:37	1.2
+++ svs.sh	2004/12/17 09:52:08	1.3
@@ -57,7 +57,11 @@
 
             #   edit file
             chmod u+w $file
-            ${EDITOR-vi} $file
+            if [ ".${EDITOR-vi}" = .vim -a -f $file.rej ]; then
+                ${EDITOR-vi} -o2 $file $file.rej
+            else
+                ${EDITOR-vi} $file
+            fi
 
             #   check for editing results
             if cmp $file.orig $file >/dev/null 2>&1; then