From: Michael Kifer <kifer@cs.stonybrook.edu>
Date: Tue, 15 Nov 2005 18:49:33 +0000 (+0000)
Subject: 2005-11-15  Michael Kifer  <kifer@cs.stonybrook.edu>
X-Git-Tag: emacs-pretest-22.0.90~5883
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3cc60763f80392e20ffcbb12c0a33d8a4032f860;p=emacs.git

2005-11-15  Michael Kifer  <kifer@cs.stonybrook.edu>

	* ediff-util (ediff-make-temp-file): use proper file-name-handler
	operation
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 99ec4d32b9a..ee76e27c103 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,9 @@
 	
 	* viper.el (viper-emacs-state-mode-list): Ensure that
 	rcirc-mode buffers come up in Emacs state.
+	
+	* ediff-util (ediff-make-temp-file): use proper file-name-handler
+	operation
 
 2005-11-15  Dan Nicolaescu  <dann@ics.uci.edu>
 
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index 9db05ad143b..caa927f2113 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -3173,7 +3173,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
     (setq f (concat ediff-temp-file-prefix p)
 	  short-f (concat ediff-temp-file-prefix short-p)
   	  f (cond (given-file)
-		  ((find-file-name-handler f 'find-file-noselect)
+		  ((find-file-name-handler f 'insert-file-contents)
 		   ;; to thwart file handlers in write-region, e.g., if file
 		   ;; name ends with .Z or .gz
 		   ;; This is needed so that patches produced by ediff will