Fix another shr infloop in the filling code

(shr-find-fill-point): Off by one error in comparison with the
indentation.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c764f97338909ab278bf79c51546e268f14f1d39..379e49dc11d2cdc3b71e7b0deeafe5b7b1a5613c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,8 @@
        infloop.
        (shr-insert): Fill repeatedly long texts, so that Japanese is
        formatted correctly (bug#16263).
+       (shr-find-fill-point): Off by one error in comparison with the
+       indentation.
 
 2013-12-26  João Távora <joaotavora@gmail.com>
 

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index a4cfdfeb0c130863882c86800466573d61a27266..1a555100a21aa4e36b0ed3fdd7b56adb5c593971 100644 (file)
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -478,7 +478,7 @@ size, and full-buffer size."
     (backward-char 1))
   (let ((bp (point))
        failed)
-    (while (not (or (setq failed (< (current-column) shr-indentation))
+    (while (not (or (setq failed (<= (current-column) shr-indentation))
                    (eq (preceding-char) ? )
                    (eq (following-char) ? )
                    (shr-char-breakable-p (preceding-char))
@@ -486,7 +486,8 @@ size, and full-buffer size."
                    (and (shr-char-kinsoku-bol-p (preceding-char))
                         (shr-char-breakable-p (following-char))
                         (not (shr-char-kinsoku-bol-p (following-char))))
-                   (shr-char-kinsoku-eol-p (following-char))))
+                   (shr-char-kinsoku-eol-p (following-char))
+                   (bolp)))
       (backward-char 1))
     (if failed
        ;; There's no breakable point, so we give it up.
@@ -508,7 +509,7 @@ size, and full-buffer size."
         (while (and (not (memq (preceding-char) (list ?\C-@ ?\n ? )))
                     (shr-char-kinsoku-eol-p (preceding-char)))
           (backward-char 1))
-        (when (setq failed (< (current-column) shr-indentation))
+        (when (setq failed (<= (current-column) shr-indentation))
           ;; There's no breakable point that doesn't violate kinsoku,
           ;; so we look for the second best position.
           (while (and (progn
@@ -528,7 +529,7 @@ size, and full-buffer size."
                      (not (memq (preceding-char) (list ?\C-@ ?\n ? )))
                      (or (shr-char-kinsoku-eol-p (preceding-char))
                          (shr-char-kinsoku-bol-p (following-char)))))))
-        (when (setq failed (< (current-column) shr-indentation))
+        (when (setq failed (<= (current-column) shr-indentation))
           ;; There's no breakable point that doesn't violate kinsoku,
           ;; so we go to the second best position.
           (if (looking-at "\\(\\c<+\\)\\c<")