(mm-find-mime-charset-region): Fix :mime-charset

part.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 83da327041db6460c7795cdb7a44ea781c5361ac..8b6e35a5a0274730bff7883f00ce1da43950ebb9 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-09  Dave Love  <fx@gnu.org>
+
+       * mm-util.el (mm-find-mime-charset-region): Fix :mime-charset
+       part.
+
 2002-06-26  Dave Love  <fx@gnu.org>
 
        * rfc2047.el (rfc2047-encodable-p): Avoid mm-find-charset-region.

diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 3ae754c246288eaef6adf92d1e95edf79e6b6817..c7866e8ca6c40418947765534748ea2523b0cecc 100644 (file)
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -504,9 +504,9 @@ charset, and a longer list means no appropriate charset."
               (setq systems (delq 'compound-text systems))
               (unless (equal systems '(undecided))
                 (while systems
-                  (let ((cs (or (coding-system-get (pop systems)
-                                                   :mime-charset)
-                                (coding-system-get systems 'mime-charset))))
+                  (let* ((head (pop systems))
+                         (cs (or (coding-system-get head :mime-charset)
+                                 (coding-system-get head 'mime-charset))))
                     (if cs
                         (setq systems nil
                               charsets (list cs))))))
@@ -537,7 +537,7 @@ Use unibyte mode for this."
 (put 'mm-with-unibyte-buffer 'edebug-form-spec '(body))
 
 (defmacro mm-with-unibyte-current-buffer (&rest forms)
-  "Evaluate FORMS with current current buffer temporarily made unibyte.
+  "Evaluate FORMS with current buffer temporarily made unibyte.
 Also bind `default-enable-multibyte-characters' to nil.
 Equivalent to `progn' in XEmacs"
   (let ((multibyte (make-symbol "multibyte"))
@@ -632,7 +632,7 @@ Equivalent to `progn' in XEmacs"
 A buffer may be modified in several ways after reading into the buffer due
 to advanced Emacs features, such as file-name-handlers, format decoding,
 find-file-hooks, etc.
-If INHIBIT is non-nil, inhibit mm-inhibit-file-name-handlers.
+If INHIBIT is non-nil, inhibit `mm-inhibit-file-name-handlers'.
   This function ensures that none of these modifications will take place."
   (let ((format-alist nil)
        (auto-mode-alist (if inhibit nil (mm-auto-mode-alist)))