procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Fixes: debbugs:16256
This commit is contained in:
Lars Ingebrigtsen 2013-12-25 23:52:15 +01:00
parent ed78d16c6e
commit f7f071dcf4
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/ChangeLog
View file

@ -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>

21
lisp/net/shr.el
View file

@ -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))