diff lisp/files.el @ 863:42375619fa45

[xemacs-hg @ 2002-06-04 06:03:59 by andyp] merge 21.4 windows changes, minimally tested
author andyp
date Tue, 04 Jun 2002 06:05:53 +0000
parents e7ee5f8bde58
children 5df795348f45
line wrap: on
line diff
--- a/lisp/files.el	Mon Jun 03 12:24:14 2002 +0000
+++ b/lisp/files.el	Tue Jun 04 06:05:53 2002 +0000
@@ -2989,7 +2989,7 @@
 	    (if (not (file-exists-p file-name))
 		(error "File %s no longer exists!" file-name))
 	    (widen)
-	    (insert-file-contents file-name t nil nil t)
+	    (insert-file-contents file-name nil nil nil t)
 	    (setq bmin (point-min)
 		  bmax (point-max))))))
     (if (not (and (eq bmin (point-min))
@@ -2997,7 +2997,7 @@
 		  (eq (compare-buffer-substrings 
 		       newbuf bmin bmax (current-buffer) bmin bmax) 0)))
 	newbuf
-      nil)))
+      (and (kill-buffer newbuf) nil))))
 
 (defvar recover-file-diff-program "diff"
   "Absolute or relative name of the `diff' program used by `recover-file'.")