diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2008-11-24 21:11:12 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2008-11-24 21:11:12 +0000 |
| commit | d02b0e305c9ece60aeceee28d0bee2c22e7ea083 (patch) | |
| tree | d1ff02c5bc24420812b57e7874e97d21e0d65577 /lisp/diff.el | |
| parent | 27f98b7e613a1f10c7de5aa103bba83167da5569 (diff) | |
| download | emacs-d02b0e305c9ece60aeceee28d0bee2c22e7ea083.tar.gz emacs-d02b0e305c9ece60aeceee28d0bee2c22e7ea083.tar.bz2 emacs-d02b0e305c9ece60aeceee28d0bee2c22e7ea083.zip | |
(diff-sentinel): Take note of diff error return value.
Diffstat (limited to 'lisp/diff.el')
| -rw-r--r-- | lisp/diff.el | 4 |
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." (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) |