Merge from origin/emacs-30

6942599dbb2 ; * etc/PROBLEMS: Document problem with menu-bar backgrou...
488801baf7d * lisp/time-stamp.el: Limit field width to two digits.
34bedcd58d7 ; * lisp/progmodes/executable.el: Remove stale comment (b...
327d3e56f6e ; * etc/TODO: Add an item for improving defgroups.
7ae9ccae0ca ; * lisp/net/rcirc.el (rcirc-next-active-buffer): Doc fix...
3e51be94ae6 ; Fix :version tag in browse-url
dffd4a50c64 Revert "Attempt to install package first when upgrading"
fbcb357b9db Fix 'gnus-select-method' custom type
6fd5e02cb9b Fix typo in maps.texi
872a7336dc0 ; * etc/DEBUG: Mention "handle SIGINT" on MS-Windows.
b4bcbabf95c * doc/misc/tramp.texi (FUSE-based methods): Fix sshfs ref...
f8da72b41cd Improve gnus.texi indexing
4a090bd7eab ; * lisp/net/eww.el (eww-browse-with-external-browser): F...
59fa0b1dd6e ; Improve doc strings in compile.el
3d8e49c41a6 Attempt to install package first when upgrading

# Conflicts:
#	lisp/net/browse-url.el
#	lisp/net/eww.el

1 files changed, 3 insertions, 4 deletions

diff --git a/lisp/progmodes/executable.el b/lisp/progmodes/executable.el
index cb4a5eedb80..97baf86e017 100644
--- a/lisp/progmodes/executable.el
+++ b/lisp/progmodes/executable.el
@@ -43,10 +43,9 @@
 ;; It also allows debugging scripts, with an adaptation of compile, as far
 ;; as interpreters give out meaningful error messages.
 
-;; Modes that use this should nconc `executable-map' to the end of their own
-;; keymap and `executable-font-lock-keywords' to the end of their own font
-;; lock keywords.  Their mode-setting commands should call
-;; `executable-set-magic'.
+;; Modes that use this should nconc `executable-font-lock-keywords' to
+;; the end of their own font lock keywords.  Their mode-setting commands
+;; should call `executable-set-magic'.
 
 ;;; Code: