procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Backport: Fixes: debbugs:18940

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

Conflicts:
	lisp/ChangeLog
This commit is contained in:
Michael Albinus 2014-11-13 16:26:51 +01:00
parent 1040099b36
commit 260cedec96
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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).

24
lisp/vc/vc-hg.el
View file

@ -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)))))))