From: Eli Zaretskii Date: Sat, 9 Nov 2019 19:40:53 +0000 (+0200) Subject: Fix an error in selecting encoding when writing zip files X-Git-Tag: emacs-27.0.90~683 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a1a724d73afae87b8c4daa2d64382be06fa37d0e;p=emacs.git Fix an error in selecting encoding when writing zip files * lisp/international/mule-cmds.el (select-safe-coding-system): Treat no-conversion-multibyte that came from find-auto-coding the same as no-conversion for the purposes of encoding. The same logic that considers no-conversion always safe should do the same with no-conversion-multibyte. (Bug#38155) --- diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 1edf80d14c8..e4f5bb2a5f0 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -896,6 +896,11 @@ It is highly recommended to fix it before writing to a file." ;; other setting. (let ((base (coding-system-base auto-cs))) (unless (memq base '(nil undecided)) + ;; For encoding, no-conversion-multibyte is the same as + ;; no-conversion. + (if (eq base 'no-conversion-multibyte) + (setq auto-cs 'no-conversion + base 'no-conversion)) (setq default-coding-system (list (cons auto-cs base))) (setq no-other-defaults t))))