Move “Fix some broken conditional forms” to master

Revert 2020-01-04T19:17:12Z!eggert@cs.ucla.edu
which recently I installed into the emacs-27 branch by mistake.
These patches are now on master instead (via merging).
Do not merge to master.

1 files changed, 5 insertions, 1 deletions

diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index a33e9266b4b..4482e7d4d23 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -3206,7 +3206,11 @@ CALS (DocBook DTD):
           (while (and (re-search-forward "$" nil t)
                       (not (eobp)))
             (insert "<br />")
-            (forward-char 1))))
+            (forward-char 1)))
+        (unless (and table-html-delegate-spacing-to-user-agent
+                     (progn
+                       (goto-char (point-min))
+                       (looking-at "\\s *\\'")))))
        ((eq language 'cals)
         (table--remove-eol-spaces (point-min) (point-max))
         (if (re-search-forward "\\s +\\'" nil t)