(select-safe-coding-system): Check coding-category-list more rigidly.

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 9a648f53a3453bf42e87fb5f85171e6d4bce1a1a..42d4eebe2b33593b8d34eb802c36d604f53d239b 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -553,9 +553,14 @@ and TO is ignored."
 
   ;; If the most preferred coding system has the property mime-charset,
   ;; append it to the defaults.
-  (let* ((preferred (symbol-value (car coding-category-list)))
-        (base (coding-system-base preferred)))
-    (and (coding-system-get preferred 'mime-charset)
+  (let ((tail coding-category-list)
+       preferred base)
+    (while (and tail
+               (not (setq preferred (symbol-name (car tail)))))
+      (setq tail (cdr tail)))
+    (and (coding-system-p preferred)
+        (setq base (coding-system-base preferred))
+        (coding-system-get preferred 'mime-charset)
         (not (assq preferred default-coding-system))
         (not (rassq base default-coding-system))
         (setq default-coding-system