summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2009-12-14 17:12:18 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2009-12-14 17:12:18 +0000
commit110de3bb16877fc9ffcf2e89a7d7438315197ac2 (patch)
treea84c52d66aaeccdb83f07556f93864ef772ec490 /lisp
parent86b5e14c2d5e62d26fae6b0796e4e3c73769d2c5 (diff)
downloademacs-110de3bb16877fc9ffcf2e89a7d7438315197ac2.tar.gz
(vc-hg-working-revision): Make sure the command is executed in a
known environment so that we can parse the output. (Bug#4417)
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/vc-hg.el12
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 149cb6c7b22..a1d81fb1873 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,8 @@
2009-12-14 Dan Nicolaescu <dann@ics.uci.edu>
* vc-hg.el (vc-hg-print-log): Fix argument order.
+ (vc-hg-working-revision): Make sure the command is executed in a
+ known environment so that we can parse the output. (Bug#4417)
2009-12-14 Chong Yidong <cyd@stupidchicken.com>
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index 5a90b66e8b5..91e9d682f88 100644
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -202,10 +202,14 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
standard-output
(setq status
(condition-case nil
- ;; Ignore all errors.
- (process-file
- "hg" nil t nil
- "log" "-l1" (file-relative-name file))
+ (let ((process-environment
+ ;; Avoid localization of messages so we can parse the output.
+ (append (list "TERM=dumb" "LANGUAGE=C" "HGRC=")
+ process-environment)))
+ ;; Ignore all errors.
+ (process-file
+ "hg" nil t nil
+ "log" "-l1" (file-relative-name file)))
;; Some problem happened. E.g. We can't find an `hg'
;; executable.
(error nil)))))))