feature/android 9043bef65f9: Merge remote-tracking branch 'origin/master' into feature/android

[Po Lu]

branch: feature/android
commit 9043bef65f9922438a33aee0c90af8ffb266eb91
Merge: 85a9757b3c5 d18c4ef4fea
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Merge remote-tracking branch 'origin/master' into feature/android
---
 etc/NEWS              |  5 +++++
 lisp/Makefile.in      |  3 ++-
 lisp/help.el          | 18 ++++++++++++++++--
 lisp/mail/uudecode.el |  2 +-
 lisp/org/org-macs.el  |  4 ++--
 lisp/wid-edit.el      |  1 +
 6 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index db73a5f138c..78c493998c4 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -36,6 +36,11 @@ See the file 'java/INSTALL' for more details.
 
 * Changes in Emacs 30.1
 
+---
+** New user option 'describe-bindings-outline-rules'.
+This user option controls outline visibility in the output buffer of
+'describe-bindings' when 'describe-bindings-outline' in non-nil.
+
 ** X selection requests are now handled much faster and asynchronously.
 This means it should be less necessary to disable the likes of
 'select-active-regions' when Emacs is running over a slow network
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 4aa01e77e4e..c90237615c6 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -72,9 +72,10 @@ AUTOGENEL = ${loaddefs} ${srcdir}/cus-load.el 
${srcdir}/finder-inf.el \
   ${srcdir}/subdirs.el ${srcdir}/eshell/esh-groups.el
 
 # Set load-prefer-newer for the benefit of the non-bootstrappers.
+# Set org--inhibit-version-check to avoid unnecessarily aborting the build.
 BYTE_COMPILE_FLAGS = \
   --eval "(setq load-prefer-newer t byte-compile-warnings 'all)" \
-  --eval "(setq org--built-in-p t)" $(BYTE_COMPILE_EXTRA_FLAGS)
+  --eval "(setq org--inhibit-version-check t)" $(BYTE_COMPILE_EXTRA_FLAGS)
 # ... but we must prefer .elc files for those in the early bootstrap.
 compile-first: BYTE_COMPILE_FLAGS = $(BYTE_COMPILE_EXTRA_FLAGS)
 
diff --git a/lisp/help.el b/lisp/help.el
index 6eac037df2c..4c5382ff285 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -727,6 +727,21 @@ Return nil if KEYS is nil."
   :group 'help
   :version "29.1")
 
+(defcustom describe-bindings-outline-rules '((match-regexp . "Key 
translations"))
+  "Visibility rules for outline sections of `describe-bindings'.
+This is used as the value of `outline-default-rules' in the
+output buffer of `describe-bindings' when
+`describe-bindings-outline' is non-nil, otherwise this option
+doesn't have any effect."
+  :type '(choice (const :tag "Hide unconditionally" nil)
+                 (set :tag "Show section unless"
+                      (cons :tag "Heading matches regexp"
+                            (const match-regexp)  string)
+                      (cons :tag "Custom function returns non-nil"
+                            (const custom-function) function)))
+  :group 'help
+  :version "30.1")
+
 (declare-function outline-hide-subtree "outline")
 
 (defun describe-bindings (&optional prefix buffer)
@@ -756,8 +771,7 @@ or a buffer name."
                       outline-minor-mode-use-buttons 'insert
                       ;; Hide the longest body.
                       outline-default-state 1
-                      outline-default-rules
-                      '((match-regexp . "Key translations")))
+                      outline-default-rules describe-bindings-outline-rules)
           (outline-minor-mode 1)
           (save-excursion
             (goto-char (point-min))
diff --git a/lisp/mail/uudecode.el b/lisp/mail/uudecode.el
index 7b3bad9e25c..4b9acd922d8 100644
--- a/lisp/mail/uudecode.el
+++ b/lisp/mail/uudecode.el
@@ -40,7 +40,7 @@ input and write the converted data to its standard output."
   :type '(repeat string))
 
 (defcustom uudecode-use-external
-  (executable-find uudecode-decoder-program)
+  (not (not (executable-find uudecode-decoder-program)))
   "Use external uudecode program."
   :version "22.1"
   :type 'boolean)
diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index aef05bc6ee6..b8e026553b3 100644
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -36,7 +36,7 @@
 
 ;;; Org version verification.
 
-(defconst org--built-in-p nil
+(defvar org--inhibit-version-check nil
   "When non-nil, assume that Org is a part of Emacs source.
 For internal use only.  See Emacs bug #62762.
 This variable is only supposed to be changed by Emacs build scripts.")
@@ -49,7 +49,7 @@ This variable is only supposed to be changed by Emacs build 
scripts.")
   ;; `org-assert-version' calls would fail using strict
   ;; `org-git-version' check because the generated Org version strings
   ;; will not match.
-  `(unless (or org--built-in-p (equal (org-release) ,(org-release)))
+  `(unless (or org--inhibit-version-check (equal (org-release) ,(org-release)))
      (warn "Org version mismatch.  Org loading aborted.
 This warning usually appears when a built-in Org version is loaded
 prior to the more recent Org version.
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 4c52d827980..b9e18a94e3c 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -4064,6 +4064,7 @@ is inline."
   :button-prefix 'widget-push-button-prefix
   :button-suffix 'widget-push-button-suffix
   :format "%{%t%}: %[Toggle%]  %v\n"
+  :match (lambda (_widget value) (booleanp value))
   :on "on (non-nil)"
   :off "off (nil)")