international/mule-cmds.el (select-safe-coding-system): Remove a superfluous conditio...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c3d57e887856c39efe46100fe7eab0b6b4937b95..f4508b7bbceed30cda846f26459e4429b1b0b948 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-13  Kenichi Handa  <handa@gnu.org>
+
+       * international/mule-cmds.el (select-safe-coding-system): Remove a
+       superfluous condition in chekcing whether a coding system is safe
+       or not.
+
 2013-10-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/sh-script.el: Provide simpl(e|istic) completion.

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 588460b657b531a8681969945cf524f155250972..63cbfc82979968034ebd8adcc488497b53657e43 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -976,13 +976,17 @@ It is highly recommended to fix it before writing to a file."
 
        ;; Classify the defaults into safe, rejected, and unsafe.
        (dolist (elt default-coding-system)
-         (if (or (eq (coding-system-type (car elt)) 'undecided)
-                 (memq (cdr elt) codings))
+         (if (memq (cdr elt) codings)
+             ;; This is safe.  Is it acceptable?
              (if (and (functionp accept-default-p)
                       (not (funcall accept-default-p (cdr elt))))
+                 ;; No, not acceptable.
                  (push (car elt) rejected)
+               ;; Yes, acceptable.
                (push (car elt) safe))
+           ;; This is not safe.
            (push (car elt) unsafe)))
+       ;; If there are safe ones, the first one is what we want.
        (if safe
            (setq coding-system (car safe))))