Mercurial > emacs
changeset 66894:0b958d61a229
2005-11-15 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-util (ediff-make-temp-file): use proper file-name-handler
operation
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Tue, 15 Nov 2005 18:49:33 +0000 |
| parents | 7c76da84383b |
| children | 19cbdf0a14b4 |
| files | lisp/ChangeLog lisp/ediff-util.el |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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>
--- 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