From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Wed, 26 May 2021 22:38:33 +0000 (+0200)
Subject: Fix ediff message parsing in non-English locales
X-Git-Tag: emacs-28.0.90~2319
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=462112ae0b64fa3ea062c4b2635a81495ec132a6;p=emacs.git

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

diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index b93dfc814c0..270c99ef1fa 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)