Merge branch 'master' of https://git.gnus.org/gnus

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c6e7108..85d900b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * shr.el (shr-insert): Fix the way to fold lines.
+
 2010-11-25  Julien Danjou  <julien@danjou.info>
 
        * shr-color.el (shr-color->hexadecimal): Use color-rgb->hex

diff --git a/lisp/shr.el b/lisp/shr.el
index 9078e52..1746c9a 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -254,7 +254,7 @@ redirects somewhere else."
        (while (and (> (current-column) shr-width)
                    (progn
                      (setq found (shr-find-fill-point))
-                     (not (eolp))))
+                     (not (or (bolp) (eolp)))))
          (when (eq (preceding-char) ? )
            (delete-char -1))
          (insert "\n")