diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-03-10 00:32:27 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-03-10 00:32:27 -0800 |
| commit | 5ceaac0c61ab70280a67588eeb8536fcddc3f9be (patch) | |
| tree | 26609e3b40c23a6d3bddff9231cbf44052f29467 /lisp/vc | |
| parent | 02da65ff3a35a36e86419a3494286a1eba233e89 (diff) | |
* lisp/vc/vc-hg.el (vc-hg-pull, vc-hg-merge-branch): Use vc-hg-program.
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/vc-hg.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index d283c39362a..4ac7ef15fc7 100644 --- 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 |