diff options
| author | Glenn Morris | 2011-03-10 00:32:27 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-03-10 00:32:27 -0800 |
| commit | 5ceaac0c61ab70280a67588eeb8536fcddc3f9be (patch) | |
| tree | 26609e3b40c23a6d3bddff9231cbf44052f29467 /lisp/vc | |
| parent | 02da65ff3a35a36e86419a3494286a1eba233e89 (diff) | |
| download | emacs-5ceaac0c61ab70280a67588eeb8536fcddc3f9be.tar.gz emacs-5ceaac0c61ab70280a67588eeb8536fcddc3f9be.zip | |
* 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." | |||
| 663 | (let* ((root (vc-hg-root default-directory)) | 663 | (let* ((root (vc-hg-root default-directory)) |
| 664 | (buffer (format "*vc-hg : %s*" (expand-file-name root))) | 664 | (buffer (format "*vc-hg : %s*" (expand-file-name root))) |
| 665 | (command "pull") | 665 | (command "pull") |
| 666 | (hg-program "hg") | 666 | (hg-program vc-hg-program) |
| 667 | ;; Fixme: before updating the working copy to the latest | 667 | ;; Fixme: before updating the working copy to the latest |
| 668 | ;; state, should check if it's visiting an old revision. | 668 | ;; state, should check if it's visiting an old revision. |
| 669 | (args '("-u"))) | 669 | (args '("-u"))) |
| 670 | ;; If necessary, prompt for the exact command. | 670 | ;; If necessary, prompt for the exact command. |
| 671 | (when prompt | 671 | (when prompt |
| 672 | (setq args (split-string | 672 | (setq args (split-string |
| 673 | (read-shell-command "Run Hg (like this): " "hg pull -u" | 673 | (read-shell-command "Run Hg (like this): " |
| 674 | (format "%s pull -u" hg-program) | ||
| 674 | 'vc-hg-history) | 675 | 'vc-hg-history) |
| 675 | " " t)) | 676 | " " t)) |
| 676 | (setq hg-program (car args) | 677 | (setq hg-program (car args) |
| @@ -685,7 +686,7 @@ then attempts to update the working directory." | |||
| 685 | This runs the command \"hg merge\"." | 686 | This runs the command \"hg merge\"." |
| 686 | (let* ((root (vc-hg-root default-directory)) | 687 | (let* ((root (vc-hg-root default-directory)) |
| 687 | (buffer (format "*vc-hg : %s*" (expand-file-name root)))) | 688 | (buffer (format "*vc-hg : %s*" (expand-file-name root)))) |
| 688 | (apply 'vc-do-async-command buffer root "hg" '("merge")) | 689 | (apply 'vc-do-async-command buffer root vc-hg-program '("merge")) |
| 689 | (vc-set-async-update buffer))) | 690 | (vc-set-async-update buffer))) |
| 690 | 691 | ||
| 691 | ;;; Internal functions | 692 | ;;; Internal functions |