Mercurial > emacs
comparison lisp/mail/rmail.el @ 90614:8dd8c8286063
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 460-475)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 145-152)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-118
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 15 Oct 2006 02:54:13 +0000 |
parents | a1a25ac6c88a f3db6404bec1 |
children | 02cf29720f31 |
comparison
equal
deleted
inserted
replaced
90613:7a2fdfcc7f71 | 90614:8dd8c8286063 |
---|---|
621 ignored, and all the decoding work is done by a feature specified by | 621 ignored, and all the decoding work is done by a feature specified by |
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:[ \t]*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 |
2873 ;; up all over the place. | 2873 ;; up all over the place. |
2874 (setq coding | 2874 (setq coding |
2875 (coding-system-change-eol-conversion | 2875 (coding-system-change-eol-conversion |
2876 coding | 2876 coding |
2877 (coding-system-eol-type old-coding))) | 2877 (coding-system-eol-type old-coding))) |
2878 ;; If old-coding is `undecided', encode-coding-region | |
2879 ;; will not encode the text at all. Find a proper | |
2880 ;; non-trivial encoding to use. | |
2881 (if (memq (coding-system-base old-coding) '(nil undecided)) | |
2882 (setq old-coding | |
2883 (car (find-coding-systems-region msgbeg msgend)))) | |
2878 (setq x-coding-header (point-marker)) | 2884 (setq x-coding-header (point-marker)) |
2879 (narrow-to-region msgbeg msgend) | 2885 (narrow-to-region msgbeg msgend) |
2880 (encode-coding-region (point) msgend old-coding) | 2886 (encode-coding-region (point) msgend old-coding) |
2881 (decode-coding-region (point) msgend coding) | 2887 (decode-coding-region (point) msgend coding) |
2882 (setq last-coding-system-used coding) | 2888 (setq last-coding-system-used coding) |