master 462112a: Fix ediff message parsing in non-English locales

[Lars Ingebrigtsen]

branch: master
commit 462112ae0b64fa3ea062c4b2635a81495ec132a6
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Fix ediff message parsing in non-English locales
    
    * lisp/vc/ediff-diff.el (ediff-exec-process): Run diff in the C
    locale to enable parsing the messages (bug#21387).
---
 lisp/vc/ediff-diff.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index b93dfc8..270c99e 100644
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -1146,7 +1146,10 @@ are ignored."
         (if (string-match "buffer" (symbol-name ediff-job-name))
             ediff-coding-system-for-write
           ediff-coding-system-for-read))
-       args)
+        (process-environment
+         ;; Avoid localization of messages so we can parse the output.
+         (cons "LC_MESSAGES=C" process-environment))
+        args)
     (setq args (append (split-string options)
                        (mapcar (lambda (file)
                                  (when (stringp file)