* lisp/vc/vc-hg.el (vc-hg-pull, vc-hg-merge-branch): Use vc-hg-program.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c8890a926be06e4ce4709c38a3834deb2b3a149d..da61e7025ad2f167ab6e11724e3f39b8150c18c0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2011-03-10  Glenn Morris  <rgm@gnu.org>
 
+       * vc/vc-hg.el (vc-hg-pull, vc-hg-merge-branch): Use vc-hg-program.
+
        * vc/vc-git.el (vc-git-program): New option.
        (vc-git-branches, vc-git-pull, vc-git-merge-branch, vc-git-command)
        (vc-git--call): Use it.

diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index d283c39362a6d5c10622ab6f16a123ea9884f3d9..4ac7ef15fc7db444b9fe899ba560d87a97524dbe 100644 (file)
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -663,14 +663,15 @@ then attempts to update the working directory."
       (let* ((root (vc-hg-root default-directory))
             (buffer (format "*vc-hg : %s*" (expand-file-name root)))
             (command "pull")
-            (hg-program "hg")
+            (hg-program vc-hg-program)
             ;; Fixme: before updating the working copy to the latest
             ;; state, should check if it's visiting an old revision.
             (args '("-u")))
        ;; If necessary, prompt for the exact command.
        (when prompt
          (setq args (split-string
-                     (read-shell-command "Run Hg (like this): " "hg pull -u"
+                     (read-shell-command "Run Hg (like this): "
+                                         (format "%s pull -u" hg-program)
                                          'vc-hg-history)
                      " " t))
          (setq hg-program (car  args)
@@ -685,7 +686,7 @@ then attempts to update the working directory."
 This runs the command \"hg merge\"."
   (let* ((root (vc-hg-root default-directory))
         (buffer (format "*vc-hg : %s*" (expand-file-name root))))
-    (apply 'vc-do-async-command buffer root "hg" '("merge"))
+    (apply 'vc-do-async-command buffer root vc-hg-program '("merge"))
     (vc-set-async-update buffer)))
 
 ;;; Internal functions