Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge emacs patches.
authorVadim Gelfer <vadim.gelfer@gmail.com>
Thu, 18 May 2006 22:46:27 -0700
changeset 2317 6d0a9de9a8ac
parent 2316 3d58376a7103 (current diff)
parent 2315 c4a2d8502cc0 (diff)
child 2318 94d628499235
merge emacs patches.
contrib/mercurial.el file | annotate | diff | comparison | revisions 
--- 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."
Mercurial