summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/international/mule-cmds.el5
1 files changed, 5 insertions, 0 deletions
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))))