[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master d42d46d: Fix Bug#36090
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master d42d46d: Fix Bug#36090 |
Date: |
Sun, 8 Sep 2019 06:01:51 -0400 (EDT) |
branch: master
commit d42d46d11106a9541323e064792b23cc74c0f7f0
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
Fix Bug#36090
* lisp/vc/vc-hg.el (vc-hg--pushpull, vc-hg-merge-branch)
(vc-hg-command): Disable pager. (Bug#36090)
---
lisp/vc/vc-hg.el | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index f287adf..c2a5a6f 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -1359,6 +1359,8 @@ commands, which only operated on marked files."
(mapcar (lambda (arg) (list "-r" arg)) marked-list)))
(let* ((root (vc-hg-root default-directory))
(buffer (format "*vc-hg : %s*" (expand-file-name root)))
+ ;; Disable pager.
+ (process-environment (cons "HGPLAIN=1" process-environment))
(hg-program vc-hg-program)
args)
;; If necessary, prompt for the exact command.
@@ -1431,7 +1433,9 @@ call \"hg push -r REVS\" to push the specified revisions
REVS."
"Merge incoming changes into the current working directory.
This runs the command \"hg merge\"."
(let* ((root (vc-hg-root default-directory))
- (buffer (format "*vc-hg : %s*" (expand-file-name root))))
+ (buffer (format "*vc-hg : %s*" (expand-file-name root)))
+ ;; Disable pager.
+ (process-environment (cons "HGPLAIN=1" process-environment)))
(apply 'vc-do-async-command buffer root vc-hg-program '("merge"))
(with-current-buffer buffer (vc-run-delayed (vc-compilation-mode 'hg)))
(vc-set-async-update buffer)))
@@ -1442,11 +1446,13 @@ This runs the command \"hg merge\"."
"A wrapper around `vc-do-command' for use in vc-hg.el.
This function differs from vc-do-command in that it invokes
`vc-hg-program', and passes `vc-hg-global-switches' to it before FLAGS."
- (apply 'vc-do-command (or buffer "*vc*") okstatus vc-hg-program file-or-list
- (if (stringp vc-hg-global-switches)
- (cons vc-hg-global-switches flags)
- (append vc-hg-global-switches
- flags))))
+ ;; Disable pager.
+ (let ((process-environment (cons "HGPLAIN=1" process-environment)))
+ (apply 'vc-do-command (or buffer "*vc*") okstatus vc-hg-program
file-or-list
+ (if (stringp vc-hg-global-switches)
+ (cons vc-hg-global-switches flags)
+ (append vc-hg-global-switches
+ flags)))))
(defun vc-hg-root (file)
(vc-find-root file ".hg"))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master d42d46d: Fix Bug#36090,
Michael Albinus <=