X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-show.el;h=f29428ad98154c233ace674a122801bbe013d97a;hb=3687418526b155668578c1d70ccd6d9b63de2200;hp=b3e339e35071b63a9b486bb765f706e65b4b6ac3;hpb=021906d6ec60360b5587ae08657fd6caa9a71b17;p=notmuch diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index b3e339e3..f29428ad 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -702,7 +702,7 @@ message at DEPTH in the current thread." (let ((start (if button (button-start button) (point)))) - (insert (notmuch-get-bodypart-content msg part notmuch-show-process-crypto)) + (insert (notmuch-get-bodypart-text msg part notmuch-show-process-crypto)) (save-excursion (save-restriction (narrow-to-region start (point-max)) @@ -711,9 +711,9 @@ message at DEPTH in the current thread." (defun notmuch-show-insert-part-text/calendar (msg part content-type nth depth button) (insert (with-temp-buffer - (insert (notmuch-get-bodypart-content msg part notmuch-show-process-crypto)) - ;; notmuch-get-bodypart-content provides "raw", non-converted - ;; data. Replace CRLF with LF before icalendar can use it. + (insert (notmuch-get-bodypart-text msg part notmuch-show-process-crypto)) + ;; notmuch-get-bodypart-text does no newline conversion. + ;; Replace CRLF with LF before icalendar can use it. (goto-char (point-min)) (while (re-search-forward "\r\n" nil t) (replace-match "\n" nil nil))