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

…rfluous condition in chekcing whether a coding system is safe or not.
PureAbstract · Oct 13, 2013 · f55a6d8 · f55a6d8
1 parent 558dbba
commit f55a6d8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git 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
@@ -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))))