Merge from origin/emacs-30

0d493864cee Fix indentation of XML comments
1a2c29b5317 Improve Tramp's make-process handling for Solaris
a7dffc2ea38 Document 'time-stamp-time-zone' in Emacs Manual
0b4eb525b69 Make treesit--simple-indent-eval more permissive (bug#78065)
ed7b55f6bf1 Adapt Tramp tests
b172a1478c1 ; * doc/lispref/tips.texi (Library Headers): Fix wording ...
81629b2b2ba ; * lisp/gnus/mail-source.el (mail-sources): Fix a typo (...

1 files changed, 2 insertions, 0 deletions

diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 1f2c7e81a09..ae27824fdc9 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -1523,6 +1523,8 @@ of the line.  This expects the xmltok-* variables to be set up as by
         ((progn
            (goto-char pos)
            (forward-line -1)
+           (while (looking-at "^[[:blank:]]*$")
+             (forward-line -1))
            (<= (point) xmltok-start))
          (goto-char (+ xmltok-start (length open-delim)))
          (when (and (string= open-delim "<!--")