; 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 1ba615f92a80ce4bdaf8877442ae16342d1b63df..b19df8c6ba96a06fd20627104ec4d6544a9e1aee 100644 (file)
--- 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)))