Mercurial > emacs
comparison lisp/mail/rmail.el @ 70771:4ec3b5b35f6d
(rmail-mime-charset-pattern): Add "?:" before "format".
(rmail-convert-to-babyl-format): Undo the change from 2006-04-19.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 20 May 2006 17:36:07 +0000 |
| parents | ac1dd9b38f12 |
| children | 7d4fe4b4afc9 a8190f7e546e |
comparison
equal
deleted
inserted
replaced
| 70770:6fe80a48b58a | 70771:4ec3b5b35f6d |
|---|---|
| 622 the variable `rmail-mime-feature'.") | 622 the variable `rmail-mime-feature'.") |
| 623 | 623 |
| 624 ;;;###autoload | 624 ;;;###autoload |
| 625 (defvar rmail-mime-charset-pattern | 625 (defvar rmail-mime-charset-pattern |
| 626 (concat "^content-type:[ ]*text/plain;" | 626 (concat "^content-type:[ ]*text/plain;" |
| 627 "\\(?:[ \t\n]*\\(format\\|delsp\\)=\"?[-a-z0-9]+\"?;\\)*" | 627 "\\(?:[ \t\n]*\\(?:format\\|delsp\\)=\"?[-a-z0-9]+\"?;\\)*" |
| 628 "[ \t\n]*charset=\"?\\([^ \t\n\";]+\\)\"?") | 628 "[ \t\n]*charset=\"?\\([^ \t\n\";]+\\)\"?") |
| 629 "Regexp to match MIME-charset specification in a header of message. | 629 "Regexp to match MIME-charset specification in a header of message. |
| 630 The first parenthesized expression should match the MIME-charset name.") | 630 The first parenthesized expression should match the MIME-charset name.") |
| 631 | 631 |
| 632 | 632 |
| 1992 (search-forward "\n\n" nil t) | 1992 (search-forward "\n\n" nil t) |
| 1993 (let ((case-fold-search t)) | 1993 (let ((case-fold-search t)) |
| 1994 (re-search-backward | 1994 (re-search-backward |
| 1995 rmail-mime-charset-pattern | 1995 rmail-mime-charset-pattern |
| 1996 start t)))) | 1996 start t)))) |
| 1997 (intern (downcase (match-string 2)))))) | 1997 (intern (downcase (match-string 1)))))) |
| 1998 (rmail-decode-region start (point) mime-charset))))) | 1998 (rmail-decode-region start (point) mime-charset))))) |
| 1999 ;; Add an X-Coding-System: header if we don't have one. | 1999 ;; Add an X-Coding-System: header if we don't have one. |
| 2000 (save-excursion | 2000 (save-excursion |
| 2001 (goto-char start) | 2001 (goto-char start) |
| 2002 (forward-line 1) | 2002 (forward-line 1) |
| 2153 (search-forward "\n\n" nil t) | 2153 (search-forward "\n\n" nil t) |
| 2154 (let ((case-fold-search t)) | 2154 (let ((case-fold-search t)) |
| 2155 (re-search-backward | 2155 (re-search-backward |
| 2156 rmail-mime-charset-pattern | 2156 rmail-mime-charset-pattern |
| 2157 start t)))) | 2157 start t)))) |
| 2158 (intern (downcase (match-string 2)))))) | 2158 (intern (downcase (match-string 1)))))) |
| 2159 (rmail-decode-region start (point) mime-charset))) | 2159 (rmail-decode-region start (point) mime-charset))) |
| 2160 (save-excursion | 2160 (save-excursion |
| 2161 (goto-char start) | 2161 (goto-char start) |
| 2162 (forward-line 3) | 2162 (forward-line 3) |
| 2163 (insert "X-Coding-System: " | 2163 (insert "X-Coding-System: " |