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

Fix shr table rendering infloop

Browse source 
* net/shr.el (shr-make-table-1): Add a sanity check that allows
progression on degenerate tables.
(shr-rescale-image): ImageMagick animated images currently doesn't
work.
This commit is contained in:
Lars Magne Ingebrigtsen 2013-06-30 15:11:41 +02:00
parent a47cbd64fa
commit 2fae38e5f9
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2013-06-30 Lars Magne Ingebrigtsen <larsi@gnus.org>
* net/shr.el (shr-make-table-1): Add a sanity check that allows
progression on degenerate tables.
(shr-rescale-image): ImageMagick animated images currently doesn't
work.
2013-06-30 Juanma Barranquero <lekktu@gmail.com>
Some fixes and improvements for desktop frame restoration.

6
lisp/net/shr.el
View file

@ -762,6 +762,7 @@ If EXTERNAL, browse the URL using `shr-external-browser'."
"Rescale DATA, if too big, to fit the current buffer.
If FORCE, rescale the image anyway."
(if (or (not (fboundp 'imagemagick-types))
(eq (image-type-from-data data) 'gif)
(not (get-buffer-window (current-buffer))))
(create-image data nil t :ascent 100)
(let ((edges (window-inside-pixel-edges
@ -1473,7 +1474,10 @@ ones, in case fg and bg are nil."
(setq width
(if column
(aref widths width-column)
0))
10))
;; Sanity check for degenerate tables.
(when (zerop width)
(setq width 10))
(when (and fill
(setq colspan (cdr (assq :colspan (cdr column)))))
(setq colspan (string-to-number colspan))