[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115254: [Gnus] Allow overriding charset in some dec
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] trunk r115254: [Gnus] Allow overriding charset in some decoding functions |
Date: |
Wed, 27 Nov 2013 06:39:51 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115254
revision-id: address@hidden
parent: address@hidden
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2013-11-27 06:39:37 +0000
message:
[Gnus] Allow overriding charset in some decoding functions
modified:
lisp/gnus/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1433
lisp/gnus/gnus-art.el gnusart.el-20091113204419-o5vbwnq5f7feedwu-1108
lisp/gnus/gnus-html.el gnushtml.el-20100830061315-kvhf6jd956enbbtd-1
lisp/gnus/mm-view.el mmview.el-20091113204419-o5vbwnq5f7feedwu-1976
lisp/gnus/rfc2231.el rfc2231.el-20091113204419-o5vbwnq5f7feedwu-1987
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2013-11-27 01:59:37 +0000
+++ b/lisp/gnus/ChangeLog 2013-11-27 06:39:37 +0000
@@ -1,5 +1,13 @@
2013-11-27 Katsumi Yamaoka <address@hidden>
+ * gnus-art.el (article-de-quoted-unreadable)
+ (article-de-base64-unreadable, gnus-mime-copy-part)
+ * gnus-html.el (gnus-article-html)
+ * mm-view.el (mm-inline-text-html-render-with-w3)
+ (mm-inline-text-html-render-with-w3m-standalone)
+ * rfc2231.el (rfc2231-decode-encoded-string):
+ Allow overriding charset by mm-charset-override-alist.
+
* gnus-art.el (gnus-article-browse-html-parts):
Replace LWSPs with ` 's in header.
=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el 2013-11-27 01:59:37 +0000
+++ b/lisp/gnus/gnus-art.el 2013-11-27 06:39:37 +0000
@@ -2665,7 +2665,7 @@
(string-match "quoted-printable" type))))
(article-goto-body)
(quoted-printable-decode-region
- (point) (point-max) (mm-charset-to-coding-system charset))))))
+ (point) (point-max) (mm-charset-to-coding-system charset nil t))))))
(defun article-de-base64-unreadable (&optional force read-charset)
"Translate a base64 article.
@@ -2696,7 +2696,8 @@
(narrow-to-region (point) (point-max))
(base64-decode-region (point-min) (point-max))
(mm-decode-coding-region
- (point-min) (point-max) (mm-charset-to-coding-system charset)))))))
+ (point-min) (point-max)
+ (mm-charset-to-coding-system charset nil t)))))))
(eval-when-compile
(require 'rfc1843))
@@ -5247,7 +5248,8 @@
(switch-to-buffer (generate-new-buffer filename))
(if (or coding-system
(and charset
- (setq coding-system (mm-charset-to-coding-system charset))
+ (setq coding-system (mm-charset-to-coding-system
+ charset nil t))
(not (eq coding-system 'ascii))))
(progn
(mm-enable-multibyte)
=== modified file 'lisp/gnus/gnus-html.el'
--- a/lisp/gnus/gnus-html.el 2013-09-13 07:19:15 +0000
+++ b/lisp/gnus/gnus-html.el 2013-11-27 06:39:37 +0000
@@ -143,7 +143,8 @@
(charset (mail-content-type-get (mm-handle-type handle)
'charset)))
(when (and charset
- (setq charset (mm-charset-to-coding-system charset))
+ (setq charset (mm-charset-to-coding-system
+ charset nil t))
(not (eq charset 'ascii)))
(insert (prog1
(mm-decode-coding-string (buffer-string) charset)
=== modified file 'lisp/gnus/mm-view.el'
--- a/lisp/gnus/mm-view.el 2013-07-06 23:40:56 +0000
+++ b/lisp/gnus/mm-view.el 2013-11-27 06:39:37 +0000
@@ -175,7 +175,7 @@
(match-end 2))))
(if (fboundp 'w3-coding-system-for-mime-charset)
(w3-coding-system-for-mime-charset bsubstr)
- (mm-charset-to-coding-system bsubstr))))
+ (mm-charset-to-coding-system bsubstr nil t))))
(delete-region (point-min) (point-max))
(insert (mm-decode-string text charset))))
(save-window-excursion
@@ -343,9 +343,10 @@
'charset)
(symbol-name mail-parse-charset)))
cs)
- (unless (and charset
- (setq cs (mm-charset-to-coding-system charset))
- (not (eq cs 'ascii)))
+ (if (and charset
+ (setq cs (mm-charset-to-coding-system charset nil t))
+ (not (eq cs 'ascii)))
+ (setq charset (format "%s" (mm-coding-system-to-mime-charset cs)))
;; The default.
(setq charset "iso-8859-1"
cs 'iso-8859-1))
=== modified file 'lisp/gnus/rfc2231.el'
--- a/lisp/gnus/rfc2231.el 2013-01-01 09:11:05 +0000
+++ b/lisp/gnus/rfc2231.el 2013-11-27 06:39:37 +0000
@@ -215,7 +215,8 @@
\"''This%20is%20%2A%2A%2Afun%2A%2A%2A\", or
\"This is ***fun***\"."
(string-match "\\`\\(?:\\([^']+\\)?'\\([^']+\\)?'\\)?\\(.+\\)" string)
- (let ((coding-system (mm-charset-to-coding-system (match-string 1 string)))
+ (let ((coding-system (mm-charset-to-coding-system
+ (match-string 1 string) nil t))
;;(language (match-string 2 string))
(value (match-string 3 string)))
(mm-with-unibyte-buffer
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115254: [Gnus] Allow overriding charset in some decoding functions,
Katsumi Yamaoka <=