From: Basil L. Contovounesios <contovob@tcd.ie>
Date: Fri, 17 Jul 2020 11:04:09 +0000 (+0100)
Subject: ; Simplify last change in shr.el
X-Git-Tag: emacs-28.0.90~6992
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bcb58180c75fb5cfc3329b1be81e4350bac15335;p=emacs.git

; Simplify last change in shr.el

* lisp/net/shr.el (shr-max-columns): Simplify some function calls.
---

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