mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Fix problem with non-ASCII characters in ediff error messages

Browse source 
* lisp/vc/ediff-diff.el (ediff-prepare-error-list): Decode the
data from diff before displaying (bug#5050).  This fixes a problem
with displaying raw bytes in the error messages in non-ASCII locales.
This commit is contained in:
Lars Ingebrigtsen 2020-08-20 22:23:35 +02:00
parent ec99055918
commit 9b277a2f8e
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/vc/ediff-diff.el
View file

@ -325,6 +325,10 @@ one optional arguments, diff-number to refine.")
(error-buf ediff-error-buffer))
(ediff-skip-unsuitable-frames)
(switch-to-buffer error-buf)
;; We output data from the diff command using `raw-text' as
;; the coding system, so decode before displaying.
(when (eq ediff-coding-system-for-read 'raw-text)
(decode-coding-region (point-min) (point-max) 'undecided))
(ediff-kill-buffer-carefully ctl-buf)
(user-error "Errors in diff output. Diff output is in %S" diff-buff))))