From 5202cb56add070eb7d9fe8015f2a4edd57a628f9 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 6 Dec 2016 20:31:54 -0500 Subject: [PATCH] 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) --- lisp/vc/vc-bzr.el | 7 ++++++- lisp/vc/vc-git.el | 7 ++++++- lisp/vc/vc-hg.el | 6 +++++- 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." args (cddr args))) (require 'vc-dispatcher) (let ((buf (apply 'vc-bzr-async-command command args))) - (with-current-buffer buf (vc-run-delayed (vc-compilation-mode 'bzr))) + (with-current-buffer buf + (vc-run-delayed + (vc-compilation-mode 'bzr) + (setq-local compile-command + (concat vc-bzr-program " " command " " + (if args (mapconcat 'identity args " ") ""))))) (vc-set-async-update buf)))) (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." args (cddr args))) (require 'vc-dispatcher) (apply 'vc-do-async-command buffer root git-program command args) - (with-current-buffer buffer (vc-run-delayed (vc-compilation-mode 'git))) + (with-current-buffer buffer + (vc-run-delayed + (vc-compilation-mode 'git) + (setq-local compile-command + (concat git-program " " command " " + (if args (mapconcat 'identity args " ") ""))))) (vc-set-async-update buffer))) (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." args (cddr args))) (apply 'vc-do-async-command buffer root hg-program command args) (with-current-buffer buffer - (vc-run-delayed (vc-compilation-mode 'hg))) + (vc-run-delayed + (vc-compilation-mode 'hg) + (setq-local compile-command + (concat hg-program " " command " " + (if args (mapconcat 'identity args " ") ""))))) (vc-set-async-update buffer))))) (defun vc-hg-pull (prompt) -- 2.39.2