[Emacs-diffs] trunk r117873: Fix HTML rendering by shr-insert-document in Rmail.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117873
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/4258
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2014-09-13 12:25:38 +0300
message:
  Fix HTML rendering by shr-insert-document in Rmail.
  
   lisp/mail/rmailmm.el (rmail-mime-insert-html): Decode the HTML part
   using the specified transfer-encoding, if any, or 'undecided'.
   (rmail-mime-render-html-shr): Bind shr-width to nil, so lines are
   broken at the window margin.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/mail/rmailmm.el           rmailmm.el-20091113204419-o5vbwnq5f7feedwu-8815

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-09-13 09:20:15 +0000
+++ b/lisp/ChangeLog    2014-09-13 09:25:38 +0000
@@ -2,6 +2,8 @@
 
        * mail/rmailmm.el (rmail-mime-insert-html): Decode the HTML part
        using the specified transfer-encoding, if any, or 'undecided'.
+       (rmail-mime-render-html-shr): Bind shr-width to nil, so lines are
+       broken at the window margin.
 
 2013-12-27  Ken Olum  <address@hidden>
 

=== modified file 'lisp/mail/rmailmm.el'
--- a/lisp/mail/rmailmm.el      2014-09-13 09:20:15 +0000
+++ b/lisp/mail/rmailmm.el      2014-09-13 09:25:38 +0000
@@ -694,7 +694,12 @@
        ;; Image retrieval happens asynchronously, but meanwhile
        ;; `rmail-swap-buffers' may have been run, leaving
        ;; `shr-image-fetched' trying to insert the image in the wrong buffer.
-       (shr-inhibit-images t))
+       (shr-inhibit-images t)
+       ;; Bind shr-width to nil to force shr-insert-document break
+       ;; the lines at the window margin.  The default is
+       ;; fill-column, whose default value is too small, and screws
+       ;; up display of the quoted messages.
+       shr-width)
     (shr-insert-document dom)))
 
 (defun rmail-mime-render-html-lynx (source-buffer)