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 99ec4d32b9ad73c99907fbea7b69c8745cf2718d..ee76e27c103aaff0610f17dd0d673dcc6555442d 100644 (file)
--- 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 9db05ad143b4f8edf0bd550369d08fdf7e91ec97..caa927f2113803d118c19365fda57dc1c36efd18 100644 (file)
--- 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