From a85cf0d9fe03713cfae31415208cbd49d3227ae1 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Thu, 13 Nov 2014 16:26:51 +0100 Subject: [PATCH] Fixes: debbugs:18940 * vc/vc-hg.el (vc-hg-state): Disable pager. --- lisp/ChangeLog | 4 ++++ lisp/vc/vc-hg.el | 24 ++++++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c70f56f2f99..6db9f206d15 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-11-13 Michael Albinus + + * vc/vc-hg.el (vc-hg-state): Disable pager. (Bug#18940) + 2014-11-10 Kenjiro NAKAYAMA * net/eww.el(eww-form-file(defface)): New defface of file upload form. diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index df61006ad51..4f13914aa2d 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -207,14 +207,22 @@ highlighting the Log View buffer." ;; Ignore all errors. (let ((process-environment ;; Avoid localization of messages so we - ;; can parse the output. - (append (list "TERM=dumb" "LANGUAGE=C") - process-environment))) - (process-file - vc-hg-program nil t nil - "--config" "alias.status=status" - "--config" "defaults.status=" - "status" "-A" (file-relative-name file))) + ;; can parse the output. Disable pager. + (append + (list "TERM=dumb" "LANGUAGE=C" "HGPLAIN=1") + process-environment))) + (if (file-remote-p file) + (process-file + "env" nil t nil + "HGPLAIN=1" vc-hg-program + "--config" "alias.status=status" + "--config" "defaults.status=" + "status" "-A" (file-relative-name file)) + (process-file + vc-hg-program nil t nil + "--config" "alias.status=status" + "--config" "defaults.status=" + "status" "-A" (file-relative-name file)))) ;; Some problem happened. E.g. We can't find an `hg' ;; executable. (error nil))))))) -- 2.39.5