diff options
| author | Chong Yidong | 2010-01-16 16:37:46 -0500 |
|---|---|---|
| committer | Chong Yidong | 2010-01-16 16:37:46 -0500 |
| commit | d4efdaea760ed65a09762a0ebf74da184f5eb5e1 (patch) | |
| tree | 1252abf3582c171bf60c7471b1e528adfb4714cb | |
| parent | bbdc98eff1533440f7f7633acf07b7f29c037a11 (diff) | |
| download | emacs-d4efdaea760ed65a09762a0ebf74da184f5eb5e1.tar.gz emacs-d4efdaea760ed65a09762a0ebf74da184f5eb5e1.zip | |
* vc-dispatcher.el (vc-do-command): Set LC_MESSAGES, so that we
can parse the output of the external commands (Bug#5279).
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc-dispatcher.el | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 40dd8ff0a96..6f346a45a18 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-01-16 Frédéric Perrin <frederic.perrin@resel.fr> | ||
| 2 | |||
| 3 | * vc-dispatcher.el (vc-do-command): Set LC_MESSAGES, so that we | ||
| 4 | can parse the output of the external commands (Bug#5279). | ||
| 5 | |||
| 1 | 2010-01-16 Jari Aalto <jari.aalto@cante.net> | 6 | 2010-01-16 Jari Aalto <jari.aalto@cante.net> |
| 2 | 7 | ||
| 3 | * pcmpl-unix.el (pcmpl-unix-read-passwd-file): Doc fix. | 8 | * pcmpl-unix.el (pcmpl-unix-read-passwd-file): Doc fix. |
diff --git a/lisp/vc-dispatcher.el b/lisp/vc-dispatcher.el index 310cc3dc351..40223c9010d 100644 --- a/lisp/vc-dispatcher.el +++ b/lisp/vc-dispatcher.el | |||
| @@ -320,11 +320,14 @@ case, and the process object in the asynchronous case." | |||
| 320 | (setq squeezed (nconc squeezed files))) | 320 | (setq squeezed (nconc squeezed files))) |
| 321 | (let ((exec-path (append vc-path exec-path)) | 321 | (let ((exec-path (append vc-path exec-path)) |
| 322 | ;; Add vc-path to PATH for the execution of this command. | 322 | ;; Add vc-path to PATH for the execution of this command. |
| 323 | ;; Also, since some functions need to parse the output | ||
| 324 | ;; from external commands, set LC_MESSAGES to C. | ||
| 323 | (process-environment | 325 | (process-environment |
| 324 | (cons (concat "PATH=" (getenv "PATH") | 326 | (cons (concat "PATH=" (getenv "PATH") |
| 325 | path-separator | 327 | path-separator |
| 326 | (mapconcat 'identity vc-path path-separator)) | 328 | (mapconcat 'identity vc-path path-separator)) |
| 327 | process-environment)) | 329 | (cons "LC_MESSAGES=C" |
| 330 | process-environment))) | ||
| 328 | (w32-quote-process-args t)) | 331 | (w32-quote-process-args t)) |
| 329 | (if (eq okstatus 'async) | 332 | (if (eq okstatus 'async) |
| 330 | ;; Run asynchronously. | 333 | ;; Run asynchronously. |