From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 24 Nov 2008 21:11:12 +0000 (+0000)
Subject: (diff-sentinel): Take note of diff error return value.
X-Git-Tag: emacs-pretest-23.0.90~1557
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d02b0e305c9ece60aeceee28d0bee2c22e7ea083;p=emacs.git

(diff-sentinel): Take note of diff error return value.
---

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."
     (goto-char (point-max))
     (let ((inhibit-read-only t))
       (insert (format "\nDiff finished%s.  %s\n"
-		      (if (equal 0 code) " (no differences)" "")
+		      (cond ((equal 0 code) " (no differences)")
+			    ((equal 2 code) " (diff error)")
+			    (t ""))
 		      (current-time-string))))))
 
 (defvar diff-old-file nil)