bug#21387: 24.3; ediff bug with french

bug#21387: 24.3; ediff bug with french

[Mathieu Brisson]

ediff fails with the same symptom present in
http://stackoverflow.com/questions/9242651/emacs-ediff-error-no-newline-at-end-of-file 

but in french. I assume it is a bug, and not a misconfiguration on my
side.
Thanks! BTW, emacs is a great tool, thank s for developping this awesome
editor!
Bye,
Mathieu.

bug#21387: 24.3; ediff bug with french

[Lars Ingebrigtsen]

[-- Attachment #1: Type: text/plain, Size: 421 bytes --]

Mathieu Brisson <brissonmathieu@ovh.fr> writes:

> ediff fails with the same symptom present in
> http://stackoverflow.com/questions/9242651/emacs-ediff-error-no-newline-at-end-of-file
> but in french. I assume it is a bug, and not a misconfiguration on my
> side.

Steps to reproduce:

echo -n foo > /tmp/foo1
echo bar > /tmp/foo2

LANGUAGE=de_DE src/emacs -Q /tmp/di.el

(ediff-files "/tmp/foo1" "/tmp/foo2")

Result:


[-- Attachment #2: Type: image/png, Size: 52800 bytes --]

[-- Attachment #3: Type: text/plain, Size: 1021 bytes --]


Well, we obviously can't add all the languages in the world to
`ediff-diff-ok-lines-regexp', but we can run diff in a known
environment.

Any comments?  Is this the best way to do this sort of stuff?  The
LOCALE/LANGUAGE/LC_* variables can be kinda confusing.

diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index adb6ce8053..38c546729e 100644
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -1146,7 +1146,10 @@ ediff-exec-process
 	 (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)


-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

bug#21387: 24.3; ediff bug with french

[Lars Ingebrigtsen]

Lars Ingebrigtsen <larsi@gnus.org> writes:

> Any comments?  Is this the best way to do this sort of stuff?  The
> LOCALE/LANGUAGE/LC_* variables can be kinda confusing.

There were no comments, so I've now pushed this change.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

bug#21387: 24.3; ediff bug with french

[Eli Zaretskii]

> From: Lars Ingebrigtsen <larsi@gnus.org>
> Date: Thu, 27 May 2021 00:38:56 +0200
> Cc: 21387@debbugs.gnu.org
> 
> Lars Ingebrigtsen <larsi@gnus.org> writes:
> 
> > Any comments?  Is this the best way to do this sort of stuff?  The
> > LOCALE/LANGUAGE/LC_* variables can be kinda confusing.
> 
> There were no comments, so I've now pushed this change.

FTR, please note that this fix is 100% reliable only on Posix systems.
MS-Windows's setlocale doesn't heed the LC_* environment variables,
unless the program was built with the Gnulib replacement for
setlocale, or took special care to access the environment from the
application code.  Some programs do, others don't, so don't expect
this to work for every port of Diff out there.