]> git.eshelyaron.com Git - emacs.git/commitdiff
Make "g" in vc push/pull buffers re-push/pull
authorGlenn Morris <rgm@gnu.org>
Wed, 7 Dec 2016 01:31:54 +0000 (20:31 -0500)
committerGlenn Morris <rgm@gnu.org>
Wed, 7 Dec 2016 01:31:54 +0000 (20:31 -0500)
* 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
lisp/vc/vc-git.el
lisp/vc/vc-hg.el

index 4bcab66fb52b533706e297087f9c270ad7d305f9..0fee6df2aa6255eaf3efe854ca42f1dde24891a6 100644 (file)
@@ -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)
index ec0e081743d9ba05b97d863b2b4d490425205729..514b97c26324ae24626c74d904689400164038a6 100644 (file)
@@ -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)
index cee01eeaf37bedf55222c320716d98bf21841a36..29f8df04698cd58848d8998b6f489203346560e9 100644 (file)
@@ -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)