*** /tmp/ediffirtJOm 2019-07-16 16:38:39.833382599 +0200 --- /home/albinus/src/emacs/lisp/vc/vc-hg.el 2019-07-16 16:33:08.611997269 +0200 *************** *** 1359,1364 **** --- 1359,1366 ---- (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,1437 **** "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)))) (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))) --- 1433,1441 ---- "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))) ! ;; 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,1452 **** "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)))) (defun vc-hg-root (file) (vc-find-root file ".hg")) --- 1446,1458 ---- "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." ! ;; 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"))