diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/ediff-util.el | 2 |
2 files changed, 4 insertions, 1 deletions
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 |