From 3b96a16d2e629e5ff8ef9f996382ba6587256082 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 20 May 2006 17:36:45 +0000 Subject: [PATCH] (rmail-mime-charset-pattern): Add "?:" before "format". (rmail-convert-to-babyl-format): Undo the change from 2006-04-19. --- lisp/ChangeLog | 6 ++++++ lisp/mail/rmail.el | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a238259d778..cce330ae9f3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2006-05-20 Eli Zaretskii + + * mail/rmail.el (rmail-mime-charset-pattern): Add "?:" before + "format". + (rmail-convert-to-babyl-format): Undo the change from 2006-04-19. + 2006-05-20 Martin Rudalics * progmodes/hideif.el (show-ifdef-block): Fix bug where parts of diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index faeec5abf02..195eb60830c 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -624,7 +624,7 @@ the variable `rmail-mime-feature'.") ;;;###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 @@ is non-nil if the user has supplied the password interactively. (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 @@ is non-nil if the user has supplied the password interactively. (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) -- 2.39.5