diff options
| author |  David Bremner <bremner@debian.org> | 2012-05-23 22:48:16 -0300 |
|---|---|---|
| committer | David Bremner <bremner@debian.org> | 2012-05-23 22:48:16 -0300 |
| commit | 6d44c5af6568d2a559c163ace14d27cc7e2ba1bc (patch) | |
| tree | f8d8290136c602190b8712f3c0e4a7030b7793c7 /emacs | |
| parent | 4c526fe3515e65ddf7ca69bf7bbc0823b4e801a0 (diff) | |
| parent | d9f61c26a1344b123c1812392bc39c32634a099a (diff) | |
Merge branch 'release'
merge 0.13.1 bugfix patches back to master, fixes for emacs reply and
spurious directory document creation.
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/notmuch-lib.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el index 7fa441af..e99b48d1 100644 --- a/emacs/notmuch-lib.el +++ b/emacs/notmuch-lib.el @@ -244,7 +244,12 @@ the given type." current buffer, if possible." (let ((display-buffer (current-buffer))) (with-temp-buffer - (let* ((charset (plist-get part :content-charset)) + ;; In case there is :content, the content string is already converted + ;; into emacs internal format. `gnus-decoded' is a fake charset, + ;; which means no further decoding (to be done by mm- functions). + (let* ((charset (if (plist-member part :content) + 'gnus-decoded + (plist-get part :content-charset))) (handle (mm-make-handle (current-buffer) `(,content-type (charset . ,charset))))) ;; If the user wants the part inlined, insert the content and ;; test whether we are able to inline it (which includes both |