summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2019-08-23 08:51:35 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2019-08-23 08:51:35 +0200
commitaae9ac275c96438b99d977a6ad6726f5b43d3204 (patch)
treed59b133545fcebc4018cd8c448905f11fc6b601a /lisp
parentb22dffbc2869503f553931ad28a567cbf1507409 (diff)
downloademacs-aae9ac275c96438b99d977a6ad6726f5b43d3204.tar.gz
emacs-aae9ac275c96438b99d977a6ad6726f5b43d3204.tar.bz2
emacs-aae9ac275c96438b99d977a6ad6726f5b43d3204.zip
Avoid an infloop in shr when filling text with :align-to properties
* lisp/net/shr.el (shr-fill-line): Only join together URL buttons if there are any URL buttons.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/net/shr.el2
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index fbd1a9b7661..c0f8c72d5b6 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -719,6 +719,7 @@ size, and full-buffer size."
(insert "\n")
(shr-indent)
(when (and (> (1- gap-start) (point-min))
+ (get-text-property (point) 'shr-url)
;; The link on both sides of the newline are the
;; same...
(equal (get-text-property (point) 'shr-url)
@@ -2363,6 +2364,7 @@ flags that control whether to collect or render objects."
(car (window-text-pixel-size nil (point-min) (point-max)))))))
(defun shr-render-td (dom width fill)
+ (setq d dom)
(let ((cache (intern (format "shr-td-cache-%s-%s" width fill))))
(or (dom-attr dom cache)
(and fill