emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs/lisp diff.el


From: Chong Yidong
Subject: [Emacs-diffs] emacs/lisp diff.el
Date: Mon, 24 Nov 2008 21:11:12 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/11/24 21:11:12

Modified files:
        lisp           : diff.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/diff.el?cvsroot=emacs&r1=1.67&r2=1.68

Patches:
Index: diff.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/diff.el,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- diff.el     6 May 2008 07:57:30 -0000       1.67
+++ diff.el     24 Nov 2008 21:11:12 -0000      1.68
@@ -68,7 +68,9 @@
     (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)




reply via email to

[Prev in Thread] Current Thread [Next in Thread]