aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/diff.el
diff options
context:
space:
mode:
authorMiles Bader2007-08-13 13:41:28 +0000
committerMiles Bader2007-08-13 13:41:28 +0000
commit37cc095b6a175fb5a2fb18fa029eaf3aa3b3fa53 (patch)
tree7fb68e80f66e55100c48b9751cf70c74af2d4bf1 /lisp/diff.el
parent031b6333283be57d971e557b83da31c6be937b0a (diff)
parent9d2db4c6637fe37d75f947063bcb2ecce319a1bc (diff)
downloademacs-37cc095b6a175fb5a2fb18fa029eaf3aa3b3fa53.tar.gz
emacs-37cc095b6a175fb5a2fb18fa029eaf3aa3b3fa53.zip
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-851
Diffstat (limited to 'lisp/diff.el')
-rw-r--r--lisp/diff.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/diff.el b/lisp/diff.el
index 3013f0d769e..b063c07b40f 100644
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -62,7 +62,8 @@
62 62
63(defun diff-sentinel (code) 63(defun diff-sentinel (code)
64 "Code run when the diff process exits. 64 "Code run when the diff process exits.
65CODE is the exit code of the process. It should be 0 iff no diffs were found." 65CODE is the exit code of the process. It should be 0 only if no diffs
66were found."
66 (if diff-old-temp-file (delete-file diff-old-temp-file)) 67 (if diff-old-temp-file (delete-file diff-old-temp-file))
67 (if diff-new-temp-file (delete-file diff-new-temp-file)) 68 (if diff-new-temp-file (delete-file diff-new-temp-file))
68 (save-excursion 69 (save-excursion