Don't infloop when we can't find a good place to break lines in shr

(shr-insert): Don't infloop if we can't find a good place to break
the line.

Fixes: debbugs:16256

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 18f0a9f22fe22d989b4c29a7f63277347accaa8a..76e175919e43ff7eb9db5c123bd944a4442ad435 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -12,6 +12,8 @@
 2013-12-25  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * net/shr.el (shr-visit-file): Remove debugging function.
+       (shr-insert): Don't infloop if we can't find a good place to break
+       the line (bug#16256).
 
 2013-12-25  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 5b8ab28c837209ddefde72a83b0a7775502f1f2f..93e2be0086ada68fc4d14051413910b1fa81cb7a 100644 (file)
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -455,11 +455,10 @@ size, and full-buffer size."
       (insert elem)
       (setq shr-state nil)
       (let (found)
-       (while (and (> (current-column) shr-width)
-                   (> shr-width 0)
-                   (progn
-                     (setq found (shr-find-fill-point))
-                     (not (eolp))))
+       (when (and (> (current-column) shr-width)
+                  (progn
+                    (setq found (shr-find-fill-point))
+                    (not (eolp))))
          (when (eq (preceding-char) ? )
            (delete-char -1))
          (insert "\n")
@@ -528,12 +527,12 @@ 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)))))))
-        (if (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<")
-                (goto-char (match-end 1))
-              (forward-char 1))))
+        (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<")
+              (goto-char (match-end 1))
+            (forward-char 1))))
        ((shr-char-kinsoku-bol-p (following-char))
         ;; Find forward the point where kinsoku-bol characters end.
         (let ((count 4))