shr.el (shr-insert): Don't break long line if it is because of kinsoku-bol characters...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 39f21d5..c796525 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * shr.el (shr-insert): Don't break long line if it is because of
+       kinsoku-bol characters in the line end.
+
 2010-11-11  Andrew Cohen  <cohen@andy.bu.edu>
 
        * nnir.el (nnir-request-move-article): Fix to provide original group

diff --git a/lisp/shr.el b/lisp/shr.el
index e0ea76c..88e078b 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -235,20 +235,24 @@ redirects somewhere else."
                                  (aref elem 0)))))
          (delete-char -1)))
       (insert elem)
-      (while (> (current-column) shr-width)
-       (unless (prog1
-                   (shr-find-fill-point)
-                 (when (eq (preceding-char) ? )
-                   (delete-char -1))
-                 (insert "\n"))
-         (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)))
-       (when (> shr-indentation 0)
-         (shr-indent))
-       (end-of-line))
-      (insert " "))
+      (let (found)
+       (while (and (> (current-column) shr-width)
+                   (progn
+                     (setq found (shr-find-fill-point))
+                     (not (eolp))))
+         (unless (prog1
+                     found
+                   (when (eq (preceding-char) ? )
+                     (delete-char -1))
+                   (insert "\n"))
+           (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)))
+         (when (> shr-indentation 0)
+           (shr-indent))
+         (end-of-line))
+       (insert " ")))
     (unless (string-match "[ \t\n]\\'" text)
       (delete-char -1)))))