From bcb58180c75fb5cfc3329b1be81e4350bac15335 Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" Date: Fri, 17 Jul 2020 12:04:09 +0100 Subject: [PATCH] ; Simplify last change in shr.el * lisp/net/shr.el (shr-max-columns): Simplify some function calls. --- lisp/net/shr.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 1ba615f92a8..b19df8c6ba9 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -2585,9 +2585,8 @@ flags that control whether to collect or render objects." (setq this 0) (dolist (column (dom-children row)) (when (and (not (stringp column)) - (or (eq (dom-tag column) 'td) - (eq (dom-tag column) 'th))) - (setq this (+ (1+ this) (length rowspans))) + (memq (dom-tag column) '(td th))) + (setq this (+ 1 this (length rowspans))) ;; We have a rowspan, which we emulate later in rendering ;; by adding an extra column to the following rows. (when-let* ((span (dom-attr column 'rowspan))) -- 2.39.5