From 462112ae0b64fa3ea062c4b2635a81495ec132a6 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Thu, 27 May 2021 00:38:33 +0200 Subject: [PATCH] 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 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) -- 2.39.5