Mercurial > hg

changeset 2315:c4a2d8502cc0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Emacs: adapt read-file-name invocation for (non-X)Emacs 21.4. this patch deters hg-read-file-name from passing hg-file-history to read-file-name as 6th parameter in non-X Emacs environment.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Thu, 18 May 2006 22:43:09 -0700
parents e9b5749e4de3
children 6d0a9de9a8ac
files contrib/mercurial.el
diffstat 1 files changed, 11 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/mercurial.el	Thu May 18 22:35:41 2006 -0700
+++ b/contrib/mercurial.el	Thu May 18 22:43:09 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-config ()
   "Return an alist of (key . value) pairs of Mercurial config data.