diff options
| author | Kenichi Handa | 2013-10-13 18:25:29 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2013-10-13 18:25:29 +0900 |
| commit | 85b64f021c189466eec8036df2996af409714666 (patch) | |
| tree | 5fc2d3078e24eb792aad915649d9712bbdaeb6e0 | |
| parent | 7d563e363c72828b9b1bbb0181be6a36643ce7af (diff) | |
| download | emacs-85b64f021c189466eec8036df2996af409714666.tar.gz emacs-85b64f021c189466eec8036df2996af409714666.zip | |
international/mule-cmds.el (select-safe-coding-system): Remove a superfluous condition in chekcing whether a coding system is safe or not.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/international/mule-cmds.el | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c3d57e88785..f4508b7bbce 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-10-13 Kenichi Handa <handa@gnu.org> | ||
| 2 | |||
| 3 | * international/mule-cmds.el (select-safe-coding-system): Remove a | ||
| 4 | superfluous condition in chekcing whether a coding system is safe | ||
| 5 | or not. | ||
| 6 | |||
| 1 | 2013-10-11 Stefan Monnier <monnier@iro.umontreal.ca> | 7 | 2013-10-11 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 8 | ||
| 3 | * progmodes/sh-script.el: Provide simpl(e|istic) completion. | 9 | * progmodes/sh-script.el: Provide simpl(e|istic) completion. |
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 588460b657b..63cbfc82979 100644 --- 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." | |||
| 976 | 976 | ||
| 977 | ;; Classify the defaults into safe, rejected, and unsafe. | 977 | ;; Classify the defaults into safe, rejected, and unsafe. |
| 978 | (dolist (elt default-coding-system) | 978 | (dolist (elt default-coding-system) |
| 979 | (if (or (eq (coding-system-type (car elt)) 'undecided) | 979 | (if (memq (cdr elt) codings) |
| 980 | (memq (cdr elt) codings)) | 980 | ;; This is safe. Is it acceptable? |
| 981 | (if (and (functionp accept-default-p) | 981 | (if (and (functionp accept-default-p) |
| 982 | (not (funcall accept-default-p (cdr elt)))) | 982 | (not (funcall accept-default-p (cdr elt)))) |
| 983 | ;; No, not acceptable. | ||
| 983 | (push (car elt) rejected) | 984 | (push (car elt) rejected) |
| 985 | ;; Yes, acceptable. | ||
| 984 | (push (car elt) safe)) | 986 | (push (car elt) safe)) |
| 987 | ;; This is not safe. | ||
| 985 | (push (car elt) unsafe))) | 988 | (push (car elt) unsafe))) |
| 989 | ;; If there are safe ones, the first one is what we want. | ||
| 986 | (if safe | 990 | (if safe |
| 987 | (setq coding-system (car safe)))) | 991 | (setq coding-system (car safe)))) |
| 988 | 992 | ||