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 1edf80d14c82f29cf9f479efbc84a31908a90ccb..e4f5bb2a5f05e35a25a2d825bbcdd1f9e0480ca5 100644 (file)
--- 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))))