aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorChong Yidong2008-11-24 21:11:12 +0000
committerChong Yidong2008-11-24 21:11:12 +0000
commitd02b0e305c9ece60aeceee28d0bee2c22e7ea083 (patch)
treed1ff02c5bc24420812b57e7874e97d21e0d65577 /lisp
parent27f98b7e613a1f10c7de5aa103bba83167da5569 (diff)
downloademacs-d02b0e305c9ece60aeceee28d0bee2c22e7ea083.tar.gz
emacs-d02b0e305c9ece60aeceee28d0bee2c22e7ea083.zip
(diff-sentinel): Take note of diff error return value.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/diff.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/diff.el b/lisp/diff.el
index e806a615cc7..8fb258cf1e7 100644
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -68,7 +68,9 @@ were found."
68 (goto-char (point-max)) 68 (goto-char (point-max))
69 (let ((inhibit-read-only t)) 69 (let ((inhibit-read-only t))
70 (insert (format "\nDiff finished%s. %s\n" 70 (insert (format "\nDiff finished%s. %s\n"
71 (if (equal 0 code) " (no differences)" "") 71 (cond ((equal 0 code) " (no differences)")
72 ((equal 2 code) " (diff error)")
73 (t ""))
72 (current-time-string)))))) 74 (current-time-string))))))
73 75
74(defvar diff-old-file nil) 76(defvar diff-old-file nil)