Merge remote branch 'origin/no-gnus'

[gnus] / lisp / shr.el

diff --git a/lisp/shr.el b/lisp/shr.el
index 423679a..5021eab 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -375,8 +375,8 @@ size, and full-buffer size."
          (when (eq (preceding-char) ? )
            (delete-char -1))
          (insert "\n")
+         (put-text-property (1- (point)) (point) 'shr-break t)
          (unless found
-           (put-text-property (1- (point)) (point) 'shr-break t)
            ;; No space is needed at the beginning of a line.
            (when (eq (following-char) ? )
              (delete-char 1)))
@@ -1379,7 +1379,8 @@ ones, in case fg and bg are nil."
     (while (not (eobp))
       (end-of-line)
       (setq current (+ current (current-column)))
-      (unless (get-text-property (point) 'shr-break)
+      (if (get-text-property (point) 'shr-break)
+         (incf current)
        (setq max (max max current)
              current 0))
       (forward-line 1))