Fix up the padding removal logic

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c61dc0d..de13a27 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/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-13  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * nnimap.el (nnimap-record-commands): New variable.

diff --git a/lisp/shr.el b/lisp/shr.el
index 47622f5..f594a60 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/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))))