[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 31ecbf8: Better decoding of HTML payload in Rmail
|
From: |
Eli Zaretskii |
|
Subject: |
[Emacs-diffs] master 31ecbf8: Better decoding of HTML payload in Rmail |
|
Date: |
Sat, 28 Feb 2015 12:04:53 +0000 |
branch: master
commit 31ecbf8d513540855aa07588f6746942aed453ba
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Better decoding of HTML payload in Rmail
lisp/mail/rmailmm.el (rmail-mime-insert-html): Decode HTML payload
when the charset is only given by the HTML <head>, and allow to
specify the encoding with "C-x RET c".
---
lisp/ChangeLog | 6 ++++++
lisp/mail/rmailmm.el | 17 +++++++++++++++++
2 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b9681d3..1cfd08f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-28 Eli Zaretskii <address@hidden>
+
+ * mail/rmailmm.el (rmail-mime-insert-html): Decode HTML payload
+ when the charset is only given by the HTML <head>, and allow to
+ specify the encoding with "C-x RET c".
+
2015-02-27 Mark Laws <address@hidden>
Support daemon mode on MS-Windows (bug#19688)
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 120d517..00fc25d 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -661,6 +661,7 @@ HEADER is a header component of a MIME-entity object (see
(transfer-encoding (rmail-mime-entity-transfer-encoding entity))
(charset (cdr (assq 'charset (cdr (rmail-mime-entity-type entity)))))
(buffer (current-buffer))
+ (case-fold-search t)
coding-system)
(if charset (setq coding-system (coding-system-from-name charset)))
(or (and coding-system (coding-system-p coding-system))
@@ -674,6 +675,22 @@ HEADER is a header component of a MIME-entity object (see
(ignore-errors (base64-decode-region (point-min) (point-max))))
((string= transfer-encoding "quoted-printable")
(quoted-printable-decode-region (point-min) (point-max))))
+ ;; Some broken MUAs state the charset only in the HTML <head>,
+ ;; so if we don't have a non-trivial coding-system at this
+ ;; point, make one last attempt to find it there.
+ (if (eq coding-system 'undecided)
+ (save-excursion
+ (goto-char (point-min))
+ (when (re-search-forward
+ "^<html><head><meta[^;]*; charset=\\([-a-zA-Z0-9]+\\)"
+ nil t)
+ (setq coding-system (coding-system-from-name (match-string 1)))
+ (or (and coding-system (coding-system-p coding-system))
+ (setq coding-system 'undecided)))
+ ;; Finally, let them manually force decoding if they know it.
+ (if (and (eq coding-system 'undecided)
+ (not (null coding-system-for-read)))
+ (setq coding-system coding-system-for-read))))
(decode-coding-region (point-min) (point) coding-system)
(if (and
(or (not rmail-mime-coding-system) (consp rmail-mime-coding-system))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 31ecbf8: Better decoding of HTML payload in Rmail,
Eli Zaretskii <=