emacs-29 ea0949853f8 2/4: Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/emacs into emacs-29

[Eli Zaretskii]

branch: emacs-29
commit ea0949853f8bdbe3292cbfd9c6c16a073e979e3e
Merge: e388a77cf0b 11592bcfda6
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/emacs into emacs-29
---
 lisp/nxml/xmltok.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/nxml/xmltok.el b/lisp/nxml/xmltok.el
index fb852e5ea5e..6f9df554da0 100644
--- a/lisp/nxml/xmltok.el
+++ b/lisp/nxml/xmltok.el
@@ -738,7 +738,7 @@ and VALUE-END, otherwise a STRING giving the value."
                      ;; avoid slowdowns due to the quadratic
                      ;; complexity of the regexp.  See bug#61514.
                      (when (with-restriction
-                             (point) (+ (point) 10000)
+                             (point) (min (+ (point) 10000) (point-max))
                              (looking-at (concat "[^<>\n]+?"
                                                  (xmltok-attribute regexp))))
                        (unless recovering