(find-coding-systems-for-charsets): Check charset type before

getting :charset-list.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3cada00ad6e6b694cd608a27dc8afd41c2f981de..bc0a9f9be761e07682e55124aee8221e23a01cc0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,19 @@
+2002-09-14  Dave Love  <fx@gnu.org>
+
+       * international/mule-cmds.el (charset): Move.
+       (language-info-custom-alist): Move.  Alter :set.
+       (find-coding-systems-for-charsets): Check charset type before
+       getting :charset-list.
+
+       * language/ind-util.el (iscii-to-ucs-region): Fix typo.
+
 2002-09-12  Kenichi Handa  <handa@etl.go.jp>
 
        * international/mule-conf.el (emacs-mule, iso-2022-7bit) 
        (iso-2022-7bit-ss2, iso-2022-7bit-lock, iso-2022-8bit-ss2) 
        (compound-text, ctext-no-compositions): Cancel provious change.
 
-2002-09-09  Dave Love  <d.love@dl.ac.uk>
+2002-09-09  Dave Love  <fx@gnu.org>
 
        * wid-edit.el (widget-string-complete): New.
        (widget-coding-system-prompt-value-history): Deleted.

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 5933e385e35a3199cb419445ca071327059f190a..bd6ccf00b344d68caf3061569b02c6472df5b653 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -457,7 +457,9 @@ Emacs, but is unlikely to be what you really want now."
        (t
         (let (codings)
           (dolist (cs (coding-system-list t))
-            (let ((cs-charsets (coding-system-get cs :charset-list))
+            (let ((cs-charsets (and (eq 'charset
+                                        (coding-system-get cs :coding-type))
+                                    (coding-system-get cs :charset-list)))
                   (charsets charsets))
               (if (coding-system-get cs :ascii-compatible-p)
                   (add-to-list 'cs-charsets 'ascii))