Backport: Fixes: debbugs:18940

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

Conflicts:
	lisp/ChangeLog

2 files changed, 21 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6cb3e7f490c..e9b3731aae9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,9 @@
 2014-10-28  Peder O. Klingenberg  <peder@klingenberg.no>  (tiny change)
+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>
 
         * mail/emacsbug.el (report-emacs-bug): Make a better guess at
           envelope-from when reporting through sendmail (bug#19054).
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 372504eb8f3..a66fb9f46f9 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)))))))