Capitalizing is not always correct, since some environment like "IPA".

Delete nil, error-proof.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2d64a1e..46cb722 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+1999-12-07 11:45:10  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+       * mm-util.el (mm-find-charset-region): Don't capitalize.  Delete
+       nil.
+
 1999-12-07  Per Abrahamsen  <abraham@dina.kvl.dk>
 
        * nnslashdot.el (nnslashdot-request-list): There were two

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 8006fec..9b1082d 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -310,12 +310,12 @@ See also `with-temp-file' and `with-output-to-string'."
       (save-restriction
        (narrow-to-region b e)
        (goto-char (point-min))
-       (let ((entry (assoc (capitalize current-language-environment)
+       (let ((entry (assoc current-language-environment 
                            language-info-alist)))
          (skip-chars-forward "\0-\177")
          (if (eobp)
              '(ascii)
-           (list 'ascii (car (last (assq 'charset entry)))))))))))
+           (delq nil (list 'ascii (cadr (assq 'charset entry)))))))))))
 
 (defun mm-read-charset (prompt)
   "Return a charset."