shr.el (shr-remove-trailing-whitespace): Really delete the padding on too-wide lines.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 59796c9df4f036dd8fe09dee2b3baebd4638804f..9ac21e5a33e98d441d27d41efe2a1eb1235a9140 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-15  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * shr.el (shr-remove-trailing-whitespace): Really delete the padding on
+       too-wide lines.
+
 2012-02-15  Paul Eggert  <eggert@cs.ucla.edu>
 
        * shr.el (shr-rescale-image): Undo previous change; see

diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index a8bbc77a4b1b633ad1ddb60e9f1d3076b25a1904..f3d7503292642789cdaab586067ae856e34e686d 100644 (file)
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -160,7 +160,7 @@ DOM should be a parse tree as generated by
       (goto-char start)
       (while (not (eobp))
        (end-of-line)
-       (when (> (current-column) width)
+       (when (> (shr-previous-newline-padding-width (current-column)) width)
          (dolist (overlay (overlays-at (point)))
            (when (overlay-get overlay 'before-string)
              (overlay-put overlay 'before-string nil))))