Fixes: debbugs:18940

* vc/vc-hg.el (vc-hg-state): Disable pager.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c70f56f2f992f5a73fc7dd9f9c1a7529ae8f54ac..6db9f206d15c47dd37e16aa73f75a0dfe98db16c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-13  Michael Albinus  <michael.albinus@gmx.de>
+
+       * vc/vc-hg.el (vc-hg-state): Disable pager.  (Bug#18940)
+
 2014-11-10  Kenjiro NAKAYAMA  <nakayamakenjiro@gmail.com>
 
         * 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 df61006ad51c132c487aaa09eabd75210ef984f5..4f13914aa2d1071080f9b7f3107c6b2169d4e29f 100644 (file)
--- 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)))))))