diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2014-11-13 16:26:51 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2014-11-15 17:52:14 +0100 |
| commit | 260cedec96d52993c3798c4e6d844fbf30b82a8b (patch) | |
| tree | 15cd5485e899f4306b6b44c47ad9288d7a73450c /lisp | |
| parent | 1040099b36b5df41453e7de9c9d9bf129c493c31 (diff) | |
| download | emacs-260cedec96d52993c3798c4e6d844fbf30b82a8b.tar.gz | |
Backport: Fixes: debbugs:18940
* vc/vc-hg.el (vc-hg-state): Disable pager.
Conflicts:
lisp/ChangeLog
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc/vc-hg.el | 24 |
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))))))) |