(mh-version): Use mh-e-RCS-id rather than mh-e-version

[gnu-emacs] / lisp / diff.el

diff --git a/lisp/diff.el b/lisp/diff.el
index 2d681b8af27b07a95e680ecb4f2d4f7ba4d99b56..4e8f829fdaf5f21af424cecce87e55303fa6a233 100644 (file)
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -1,6 +1,6 @@
 ;;; diff.el --- Run `diff' in compilation-mode.
 
-;; Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
 
 ;; Keywords: unix, tools
 
@@ -17,8 +17,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
 
@@ -41,7 +42,7 @@
   '(
     ;; -u format: @@ -OLDSTART,OLDEND +NEWSTART,NEWEND @@
     ("^@@ -\\([0-9]+\\),[0-9]+ \\+\\([0-9]+\\),[0-9]+ @@$" 1 2)
-  
+
     ;; -c format: *** OLDSTART,OLDEND ****
     ("^\\*\\*\\* \\([0-9]+\\),[0-9]+ \\*\\*\\*\\*$" 1 nil)
     ;;            --- NEWSTART,NEWEND ----
@@ -57,7 +58,7 @@
     ;; -n format: {a,d,c}OLDSTART LINES-CHANGED
     ("^[adc]\\([0-9]+\\)\\( [0-9]+\\)?$" 1)
     )
-  "Alist (REGEXP OLD-IDX NEW-IDX) of regular expressions to match difference 
+  "Alist (REGEXP OLD-IDX NEW-IDX) of regular expressions to match difference
 sections in \\[diff] output.  If REGEXP matches, the OLD-IDX'th
 subexpression gives the line number in the old file, and NEW-IDX'th
 subexpression gives the line number in the new file.  If OLD-IDX or NEW-IDX
@@ -223,16 +224,15 @@ With prefix arg, prompt for diff switches."
          ;; Avoid frightening people with "abnormally terminated"
          ;; if diff finds differences.
          (set (make-local-variable 'compilation-exit-message-function)
-              (lambda (proc msg)
-                (let ((code (process-exit-status proc)))
-                  (if (eq (process-status proc) 'exit)
-                      (cond ((zerop code)
-                             '("finished (no differences)\n" . "finished"))
-                            ((= code 1)
-                             '("finished\n" . "finished"))
-                            (t
-                             (cons msg code)))
-                    (cons msg code)))))
+              (lambda (status code msg)
+                (cond ((not (eq status 'exit))
+                       (cons msg code))
+                      ((zerop code)
+                       '("finished (no differences)\n" . "no differences"))
+                      ((= code 1)
+                       '("finished\n" . "differences found"))
+                      (t
+                       (cons msg code)))))
          (set (make-local-variable 'diff-old-file) old)
          (set (make-local-variable 'diff-new-file) new)
          (set (make-local-variable 'diff-old-temp-file) old-alt)