Merge from origin/emacs-30

a0f740c88d8 ; * lisp/progmodes/flymake.el: Fix "Maintainer" header
a9433858131 ; * etc/AUTHORS: Update.
762b85be27b ; Revert "; * admin/authors.el (authors-valid-file-names)...
e24d568b565 ; Revert "Revert "; * admin/authors.el (authors-ignored-f...
2d723a280b3 Revert "; * admin/authors.el (authors-ignored-files): Add...
2a5b129509f Revert "; * admin/authors.el (authors-ignored-files): Ign...
0db53f14a29 ; * admin/authors.el (authors-ignored-files): Ignore Unic...
6734b60c0c3 ; * admin/authors.el (authors-valid-file-names): Ignore U...
d809d53afc0 ; * admin/authors.el (authors-ignored-files): Add removed...
766f69bab12 ; * etc/NEWS: Announce VC-dir "Tracking" header. (bug#68183)
37a097d8663 ; * admin/authors.el (authors-aliases): Fix regexps.
0fb50e26316 ; * admin/MAINTAINERS: Spencer Baugh maintains flymake.el.
d05d8c336c8 xwidget: Fix xwidget-at misinterpreting non-xwidget text-...
13f69f254cf Fix rare segfaults due to freed fontsets
427fb319dab ; * lisp/simple.el (use-region-beginning, use-region-end)...

# Conflicts:
#	admin/MAINTAINERS
#	etc/NEWS

3 files changed, 8 insertions, 4 deletions

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index e72f25fd0cd..9a6b62ca254 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003-2024 Free Software Foundation, Inc.
 
 ;; Author: Pavel Kobyakov <pk_at_work@yahoo.com>
-;; Maintainer: João Távora <joaotavora@gmail.com>
+;; Maintainer: Spencer Baugh <sbaugh@janestreet.com>
 ;; Version: 1.3.7
 ;; Keywords: c languages tools
 ;; Package-Requires: ((emacs "26.1") (eldoc "1.14.0") (project "0.7.1"))
diff --git a/lisp/simple.el b/lisp/simple.el
index 2453a129d0a..eedc5768fe2 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -7085,11 +7085,15 @@ point otherwise."
   :group 'editing-basics)
 
 (defun use-region-beginning ()
-  "Return the start of the region if `use-region-p'."
+  "Return the start of the region if `use-region-p' returns non-nil.
+This is a convenience function to use in `interactive' forms of
+commands that need to act on the region when it is active."
   (and (use-region-p) (region-beginning)))
 
 (defun use-region-end ()
-  "Return the end of the region if `use-region-p'."
+  "Return the end of the region if `use-region-p' returns non-nil.
+This is a convenience function to use in `interactive' forms of
+commands that need to act on the region when it is active."
   (and (use-region-p) (region-end)))
 
 (defun use-region-noncontiguous-p ()
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index bf5987d742f..c5a84db6d4a 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -81,7 +81,7 @@ This returns the result of `make-xwidget'."
 (defun xwidget-at (pos)
   "Return xwidget at POS."
   (let* ((disp (get-text-property pos 'display))
-         (xw (car (cdr (cdr disp)))))
+         (xw (ignore-errors (car (cdr (cdr disp))))))
     (when (xwidget-live-p xw) xw)))