aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2013-12-27 16:43:54 +0100
committerLars Ingebrigtsen2013-12-27 16:43:54 +0100
commite572a7d8000768b45d005e30b1869dd7ef469200 (patch)
treedf057e9fb4bfc94fbaebf2618a609e73bd422acd
parenta4151f3b49ab27fb81135602064c99cac6d4b3e0 (diff)
downloademacs-e572a7d8000768b45d005e30b1869dd7ef469200.tar.gz
emacs-e572a7d8000768b45d005e30b1869dd7ef469200.zip
* net/shr.el (shr-insert): Don't infloop if the width is zero.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/shr.el1
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2782cc4e64c..861b3ba3d60 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-12-27 Lars Ingebrigtsen <larsi@gnus.org>
2
3 * net/shr.el (shr-insert): Don't infloop if the width is zero.
4
12013-12-27 Stefan Monnier <monnier@iro.umontreal.ca> 52013-12-27 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * icomplete.el (icomplete-show-matches-on-no-input): Default to nil 7 * icomplete.el (icomplete-show-matches-on-no-input): Default to nil
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 1a555100a21..b29ae6ce848 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -456,6 +456,7 @@ size, and full-buffer size."
456 (setq shr-state nil) 456 (setq shr-state nil)
457 (let (found) 457 (let (found)
458 (while (and (> (current-column) shr-width) 458 (while (and (> (current-column) shr-width)
459 (> shr-width 0)
459 (progn 460 (progn
460 (setq found (shr-find-fill-point)) 461 (setq found (shr-find-fill-point))
461 (not (eolp)))) 462 (not (eolp))))