[Emacs-diffs] emacs/lisp ChangeLog ediff-util.el

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     09/11/29 23:52:20

Modified files:
        lisp           : ChangeLog ediff-util.el 

Log message:
        (ediff-minibuffer-with-setup-hook): New compatibility macro.
        (ediff-read-file-name): Use it instead of `minibuffer-with-setup-hook'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16764&r2=1.16765
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ediff-util.el?cvsroot=emacs&r1=1.101&r2=1.102

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16764
retrieving revision 1.16765
diff -u -b -r1.16764 -r1.16765
--- ChangeLog   29 Nov 2009 23:34:06 -0000      1.16764
+++ ChangeLog   29 Nov 2009 23:52:16 -0000      1.16765
@@ -1,5 +1,12 @@
 2009-11-29  Juri Linkov  <address@hidden>
 
+       * ediff-util.el (ediff-minibuffer-with-setup-hook):
+       New compatibility macro.
+       (ediff-read-file-name): Use it instead of
+       `minibuffer-with-setup-hook'.
+
+2009-11-29  Juri Linkov  <address@hidden>
+
        Add defcustom to define the cycling order of `recenter-top-bottom'.
        (Bug#4981)
 

Index: ediff-util.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-util.el,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- ediff-util.el       25 Nov 2009 17:15:24 -0000      1.101
+++ ediff-util.el       29 Nov 2009 23:52:20 -0000      1.102
@@ -3091,6 +3091,12 @@
   )
 
 
+;; for compatibility
+(defmacro ediff-minibuffer-with-setup-hook (fun &rest body)
+  `(if (fboundp 'minibuffer-with-setup-hook)
+       (minibuffer-with-setup-hook ,fun ,@body)
+     ,@body))
+
 ;; This is adapted from a similar function in `emerge.el'.
 ;; PROMPT should not have a trailing ': ', so that it can be modified
 ;; according to context.
@@ -3118,7 +3124,7 @@
                        (and default-file (list default-file))
                        default-dir)))
        f)
-    (setq f (minibuffer-with-setup-hook
+    (setq f (ediff-minibuffer-with-setup-hook
                (lambda () (when defaults
                             (setq minibuffer-default defaults)))
              (read-file-name