diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2019-09-08 12:01:41 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2019-09-08 12:01:41 +0200 |
| commit | d42d46d11106a9541323e064792b23cc74c0f7f0 (patch) | |
| tree | 885ba1730a69be1563f73b691a2d6f4a78900ed3 /lisp/vc/vc-hg.el | |
| parent | f8143323c7329ea94a05c6b318b0fe2e4c082834 (diff) | |
| download | emacs-d42d46d11106a9541323e064792b23cc74c0f7f0.tar.gz emacs-d42d46d11106a9541323e064792b23cc74c0f7f0.tar.bz2 emacs-d42d46d11106a9541323e064792b23cc74c0f7f0.zip | |
Fix Bug#36090
* lisp/vc/vc-hg.el (vc-hg--pushpull, vc-hg-merge-branch)
(vc-hg-command): Disable pager. (Bug#36090)
Diffstat (limited to 'lisp/vc/vc-hg.el')
| -rw-r--r-- | lisp/vc/vc-hg.el | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index f287adf2423..c2a5a6f70c6 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")) |