# HG changeset patch
# User Michael Kifer <kifer@cs.stonybrook.edu>
# Date 1132080573 0
# Node ID 0b958d61a22927a9296653af317b9c6a52b4277c
# Parent  7c76da84383ba38e48765b3b6b50405904a12b0f
2005-11-15  Michael Kifer  <kifer@cs.stonybrook.edu>

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

diff -r 7c76da84383b -r 0b958d61a229 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Nov 15 18:44:30 2005 +0000
+++ b/lisp/ChangeLog	Tue Nov 15 18:49:33 2005 +0000
@@ -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 -r 7c76da84383b -r 0b958d61a229 lisp/ediff-util.el
--- a/lisp/ediff-util.el	Tue Nov 15 18:44:30 2005 +0000
+++ b/lisp/ediff-util.el	Tue Nov 15 18:49:33 2005 +0000
@@ -3173,7 +3173,7 @@
     (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