aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2016-12-06 20:31:54 -0500
committerGlenn Morris2016-12-06 20:31:54 -0500
commit5202cb56add070eb7d9fe8015f2a4edd57a628f9 (patch)
tree6d1c9eb0c882efdbb6fa73bef5ce829f7ba27b24
parentc95270ad4b48204880ae10ec730eb121ffa14abe (diff)
downloademacs-5202cb56add070eb7d9fe8015f2a4edd57a628f9.tar.gz
emacs-5202cb56add070eb7d9fe8015f2a4edd57a628f9.zip
Make "g" in vc push/pull buffers re-push/pull
* lisp/vc/vc-bzr.el (vc-bzr--pushpull): * lisp/vc/vc-git.el (vc-git--pushpull): * lisp/vc/vc-hg.el (vc-hg--pushpull): Set compile-command so that "g" works. (Bug#11446)
-rw-r--r--lisp/vc/vc-bzr.el7
-rw-r--r--lisp/vc/vc-git.el7
-rw-r--r--lisp/vc/vc-hg.el6
3 files changed, 17 insertions, 3 deletions
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 4bcab66fb52..0fee6df2aa6 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -372,7 +372,12 @@ If PROMPT is non-nil, prompt for the Bzr command to run."
372 args (cddr args))) 372 args (cddr args)))
373 (require 'vc-dispatcher) 373 (require 'vc-dispatcher)
374 (let ((buf (apply 'vc-bzr-async-command command args))) 374 (let ((buf (apply 'vc-bzr-async-command command args)))
375 (with-current-buffer buf (vc-run-delayed (vc-compilation-mode 'bzr))) 375 (with-current-buffer buf
376 (vc-run-delayed
377 (vc-compilation-mode 'bzr)
378 (setq-local compile-command
379 (concat vc-bzr-program " " command " "
380 (if args (mapconcat 'identity args " ") "")))))
376 (vc-set-async-update buf)))) 381 (vc-set-async-update buf))))
377 382
378(defun vc-bzr-pull (prompt) 383(defun vc-bzr-pull (prompt)
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index ec0e081743d..514b97c2632 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -792,7 +792,12 @@ If PROMPT is non-nil, prompt for the Git command to run."
792 args (cddr args))) 792 args (cddr args)))
793 (require 'vc-dispatcher) 793 (require 'vc-dispatcher)
794 (apply 'vc-do-async-command buffer root git-program command args) 794 (apply 'vc-do-async-command buffer root git-program command args)
795 (with-current-buffer buffer (vc-run-delayed (vc-compilation-mode 'git))) 795 (with-current-buffer buffer
796 (vc-run-delayed
797 (vc-compilation-mode 'git)
798 (setq-local compile-command
799 (concat git-program " " command " "
800 (if args (mapconcat 'identity args " ") "")))))
796 (vc-set-async-update buffer))) 801 (vc-set-async-update buffer)))
797 802
798(defun vc-git-pull (prompt) 803(defun vc-git-pull (prompt)
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index cee01eeaf37..29f8df04698 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -1347,7 +1347,11 @@ commands, which only operated on marked files."
1347 args (cddr args))) 1347 args (cddr args)))
1348 (apply 'vc-do-async-command buffer root hg-program command args) 1348 (apply 'vc-do-async-command buffer root hg-program command args)
1349 (with-current-buffer buffer 1349 (with-current-buffer buffer
1350 (vc-run-delayed (vc-compilation-mode 'hg))) 1350 (vc-run-delayed
1351 (vc-compilation-mode 'hg)
1352 (setq-local compile-command
1353 (concat hg-program " " command " "
1354 (if args (mapconcat 'identity args " ") "")))))
1351 (vc-set-async-update buffer))))) 1355 (vc-set-async-update buffer)))))
1352 1356
1353(defun vc-hg-pull (prompt) 1357(defun vc-hg-pull (prompt)