--- a/scripts/svn-diff-editor	Wed Dec 18 09:20:53 2013 +0100
+++ b/scripts/svn-diff-editor	Wed Dec 18 22:16:35 2013 +0100
@@ -1,6 +1,27 @@
 #!/bin/sh
 
-echo >> "$2"
-cat "$1" >> "$2"
-rm "$1"
-$EDITOR "$2"
+case "${EDITOR}" in
+    "")
+        EDITOR="vi"
+        ;;
+    emacs)
+        EDITOR="$EDITOR -nw"
+        ;;
+    gvim|vim)
+        EDITOR="$EDITOR -f -o"
+        ;;
+esac
+
+SVNTMP="$1"
+cleanup_exit() {
+    rm -rf "$SVNTMP"
+}
+
+# Remove temporary files even if we get interrupted
+trap "cleanup_exit" 0 # normal exit
+trap "exit 255" HUP INT QUIT ABRT TERM
+
+#echo >> "$2"
+#cat "$1" >> "$2"
+#rm "$1"
+$EDITOR "$2" "$1"