Fix problems in shr when indenting tables

* lisp/net/shr.el (shr-mark-fill, shr-insert-table): Fix problems
when block-quoting/<li>-ing a table -- the indentation/prefix was
inserted twice (bug#32277).

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 2f628e1caa2100b69aee00cbeeb65d07f4b7c688..4820d8b43651ed510bb2bd6be8903f29496ca18b 100644 (file)
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1790,7 +1790,8 @@ The preference is a float determined from `shr-prefer-media-type'."
 
 (defun shr-mark-fill (start)
   ;; We may not have inserted any text to fill.
-  (unless (= start (point))
+  (when (and (/= start (point))
+             (not (get-text-property start 'shr-table-id)))
     (put-text-property start (1+ start)
                       'shr-indentation shr-indentation)))
 
@@ -2087,7 +2088,8 @@ flags that control whether to collect or render objects."
                        (setq max (max max (nth 2 column))))
                      max)))
        (dotimes (_ (max height 1))
-         (shr-indent)
+          (when (bolp)
+           (shr-indent))
          (insert shr-table-vertical-line "\n"))
        (dolist (column row)
          (when (> (nth 2 column) -1)