# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1259538736 0
# Node ID ef396422d3f16b487e2bf4ab59f5268e87f8865c
# Parent  c5e66d596cbf4a6e02c5449fb1ee39744ca5e508
(ediff-minibuffer-with-setup-hook): New compatibility macro.
(ediff-read-file-name): Use it instead of `minibuffer-with-setup-hook'.

diff -r c5e66d596cbf -r ef396422d3f1 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Nov 29 23:38:18 2009 +0000
+++ b/lisp/ChangeLog	Sun Nov 29 23:52:16 2009 +0000
@@ -1,3 +1,10 @@
+2009-11-29  Juri Linkov  <juri@jurta.org>
+
+	* 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  <juri@jurta.org>
 
 	Add defcustom to define the cycling order of `recenter-top-bottom'.
diff -r c5e66d596cbf -r ef396422d3f1 lisp/ediff-util.el
--- a/lisp/ediff-util.el	Sun Nov 29 23:38:18 2009 +0000
+++ b/lisp/ediff-util.el	Sun Nov 29 23:52:16 2009 +0000
@@ -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