# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1148017587 25200
# Node ID 6d0a9de9a8ac1270a78cd1887451379ad977264c
# Parent  3d58376a7103fcfb73da76768a908c337ad11e10# Parent  c4a2d8502cc09cbceb36a8639473642238302b3f
merge emacs patches.

diff -r 3d58376a7103 -r 6d0a9de9a8ac contrib/mercurial.el
--- a/contrib/mercurial.el	Thu May 18 22:44:36 2006 -0700
+++ b/contrib/mercurial.el	Thu May 18 22:46:27 2006 -0700
@@ -382,14 +382,17 @@
       (set-buffer hg-prev-buffer))
     (let ((path (or default (buffer-file-name))))
       (if (or (not path) current-prefix-arg)
-	  (expand-file-name
-	   (read-file-name (format "File, directory or pattern%s: "
-				   (or prompt ""))
-			   (and path (file-name-directory path))
-			   nil nil
-			   (and path (file-name-nondirectory path))
-			   'hg-file-history))
-	path))))
+          (expand-file-name
+           (eval (list* 'read-file-name
+                        (format "File, directory or pattern%s: "
+                                (or prompt ""))
+                        (and path (file-name-directory path))
+                        nil nil
+                        (and path (file-name-nondirectory path))
+                        (if hg-running-xemacs
+                            (cons (quote 'hg-file-history) nil)
+                          nil))))
+        path))))
 
 (defun hg-read-number (&optional prompt default)
   "Read a integer value."