User: michaelk
Date: 05/11/15 19:51:36
Modified: packages/xemacs-packages/ediff ediff-util.el ChangeLog
Log:
* ediff-util (ediff-make-temp-file): use proper file-name-handler
operation
Revision Changes Path
1.31 +1 -1 XEmacs/packages/xemacs-packages/ediff/ediff-util.el
Index: ediff-util.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-util.el,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- ediff-util.el 2005/11/04 05:43:37 1.30
+++ ediff-util.el 2005/11/15 18:51:35 1.31
@@ -3173,7 +3173,7 @@ Hit \\[ediff-recenter] to reset the wind
(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
1.94 +5 -0 XEmacs/packages/xemacs-packages/ediff/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ChangeLog,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- ChangeLog 2005/11/07 21:44:27 1.93
+++ ChangeLog 2005/11/15 18:51:36 1.94
@@ -1,3 +1,8 @@
+2005-11-15 Michael Kifer <kifer(a)cs.stonybrook.edu>
+
+ * ediff-util (ediff-make-temp-file): use proper file-name-handler
+ operation
+
2005-11-07 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.57 released.
Show replies by date