[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#28402: 25.2; shr.el uses shr-tag-img despite set shr-external-render
From: |
Lars Ingebrigtsen |
Subject: |
bug#28402: 25.2; shr.el uses shr-tag-img despite set shr-external-rendering-functions |
Date: |
Thu, 05 Oct 2017 12:18:40 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) |
Eli Zaretskii <eliz@gnu.org> writes:
> If no objections are voiced in a few days, I will push to the emacs-26
> branch.
Sorry; I didn't have a look at this before you applied.
It mostly looks fine, but this bit isn't:
(defun shr-descend (dom)
- (let ((function
- (intern (concat "shr-tag-" (symbol-name (dom-tag dom))) obarray))
- ;; Allow other packages to override (or provide) rendering
- ;; of elements.
- (external (cdr (assq (dom-tag dom) shr-external-rendering-functions)))
+ (let ((tag-name (dom-tag dom))
(style (dom-attr dom 'style))
(shr-stylesheet shr-stylesheet)
(shr-depth (1+ shr-depth))
@@ -490,12 +498,7 @@ shr-descend
(setq style nil)))
;; If we have a display:none, then just ignore this part of the DOM.
(unless (equal (cdr (assq 'display shr-stylesheet)) "none")
- (cond (external
- (funcall external dom))
- ((fboundp function)
- (funcall function dom))
- (t
- (shr-generic dom)))
+ (shr-indirect-call tag-name dom)
shr rendering of deep HTML structures uses a lot of stack, and we see
this in practice sometimes, where shr refuses to render HTML because
it's too deeply nested (and runs into the Emacs max-depth stack thing).
This indirect call will make the stack 30% deeper, I think? As well as
slower, since it's an extra funcall for each and every HTML node.
So this part should be reverted.
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
- bug#28402: 25.2; shr.el uses shr-tag-img despite set shr-external-rendering-functions, Eli Zaretskii, 2017/10/05
- bug#28402: 25.2; shr.el uses shr-tag-img despite set shr-external-rendering-functions,
Lars Ingebrigtsen <=
- bug#28402: 25.2; shr.el uses shr-tag-img despite set shr-external-rendering-functions, Eli Zaretskii, 2017/10/05
- bug#28402: 25.2; shr.el uses shr-tag-img despite set shr-external-rendering-functions, Lars Ingebrigtsen, 2017/10/05
- bug#28402: 25.2; shr.el uses shr-tag-img despite set shr-external-rendering-functions, Eli Zaretskii, 2017/10/05
- bug#28402: 25.2; shr.el uses shr-tag-img despite set shr-external-rendering-functions, Lars Ingebrigtsen, 2017/10/05
- bug#28402: 25.2; shr.el uses shr-tag-img despite set shr-external-rendering-functions, Eli Zaretskii, 2017/10/05
- bug#28402: 25.2; shr.el uses shr-tag-img despite set shr-external-rendering-functions, Lars Ingebrigtsen, 2017/10/05
- bug#28402: 25.2; shr.el uses shr-tag-img despite set shr-external-rendering-functions, Vasilij Schneidermann, 2017/10/05
- bug#28402: 25.2; shr.el uses shr-tag-img despite set shr-external-rendering-functions, Lars Ingebrigtsen, 2017/10/05
- bug#28402: 25.2; shr.el uses shr-tag-img despite set shr-external-rendering-functions, Eli Zaretskii, 2017/10/06