[Emacs-diffs] Changes to emacs/lisp/mail/rmail.el

[Eli Zaretskii]

Index: emacs/lisp/mail/rmail.el
diff -u emacs/lisp/mail/rmail.el:1.425 emacs/lisp/mail/rmail.el:1.426
--- emacs/lisp/mail/rmail.el:1.425      Wed Apr 19 09:55:40 2006
+++ emacs/lisp/mail/rmail.el    Sat May 20 17:36:07 2006
@@ -624,7 +624,7 @@
 ;;;###autoload
 (defvar rmail-mime-charset-pattern
   (concat "^content-type:[ ]*text/plain;"
-         "\\(?:[ \t\n]*\\(format\\|delsp\\)=\"?[-a-z0-9]+\"?;\\)*"
+         "\\(?:[ \t\n]*\\(?:format\\|delsp\\)=\"?[-a-z0-9]+\"?;\\)*"
          "[ \t\n]*charset=\"?\\([^ \t\n\";]+\\)\"?")
   "Regexp to match MIME-charset specification in a header of message.
 The first parenthesized expression should match the MIME-charset name.")
@@ -1994,7 +1994,7 @@
                                           (re-search-backward
                                            rmail-mime-charset-pattern
                                            start t))))
-                                 (intern (downcase (match-string 2))))))
+                                 (intern (downcase (match-string 1))))))
                         (rmail-decode-region start (point) mime-charset)))))
               ;; Add an X-Coding-System: header if we don't have one.
               (save-excursion
@@ -2155,7 +2155,7 @@
                                       (re-search-backward
                                        rmail-mime-charset-pattern
                                        start t))))
-                             (intern (downcase (match-string 2))))))
+                             (intern (downcase (match-string 1))))))
                     (rmail-decode-region start (point) mime-charset)))
               (save-excursion
                 (goto-char start)