[elpa] externals/hyperbole 0de5941334 1/2: Improve Org cmd overrides; make work when called from kbd macros

[ELPA Syncer]

branch: externals/hyperbole
commit 0de59413348551508dec35ad165f16007b7ea6f6
Author: Bob Weiner <rsw@gnu.org>
Commit: Bob Weiner <rsw@gnu.org>

    Improve Org cmd overrides; make work when called from kbd macros
---
 ChangeLog     | 11 +++++++++++
 hui-mini.el   | 12 ++++--------
 hui-select.el |  6 +++---
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7338519a78..cc979c4e3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2022-08-29  Bob Weiner  <rsw@gnu.org>
+
+* hui-select.el (hui-select-goto-matching-delimiter, hui-select-thing):
+  hui-mini.el (hui-search-web): Use Org cmd if matching key binding
+    called from a keyboard macro.
+
+* hui-mini.el (hui-search-web): If in Org mode and uses org-sparse-tree
+    binding call that instead (previously would call hsys-org-todo-occur
+    for more todo filtering functionality but org has a dispatch menu
+    on this key with multiple functions).
+
 2022-08-28  Bob Weiner  <rsw@gnu.org>
 
 * kotl/klink.el (klink:act): Ensure 'hact' value is returned, not
diff --git a/hui-mini.el b/hui-mini.el
index 1d01e720b9..b5285bb2d2 100644
--- a/hui-mini.el
+++ b/hui-mini.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    15-Oct-91 at 20:13:17
-;; Last-Mod:     29-Aug-22 at 00:19:54 by Bob Weiner
+;; Last-Mod:     29-Aug-22 at 21:26:10 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -531,16 +531,12 @@ constructs.  If not given, the top level Hyperbole menu 
is used."
   (interactive)
   (let* ((key (hypb:cmd-key-vector #'hui-search-web hyperbole-mode-map))
         (org-key-cmd (and (derived-mode-p 'org-mode)
-                          (called-interactively-p 'interactive)
+                          (called-interactively-p 'any)
                           (equal (this-single-command-keys) key)
                           (lookup-key org-mode-map key))))
     (if org-key-cmd
-       ;; Prevent a conflict with {C-c /} binding in Org mode; use
-       ;; more flexible, filtering Hyperbole version of this Org command
-       ;; if Org mode binding has not been changed.
-       (call-interactively (if (eq org-key-cmd #'org-sparse-tree)
-                               #'hsys-org-todo-occur
-                             org-key-cmd))
+       ;; Prevent a conflict with {C-c /} binding in Org mode
+       (call-interactively org-key-cmd)
       ;;
       ;; No key conflicts, perform normal Hyperbole operation
       (hyperbole 'web))))
diff --git a/hui-select.el b/hui-select.el
index 3fdc43d009..a12a151561 100644
--- a/hui-select.el
+++ b/hui-select.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    19-Oct-96 at 02:25:27
-;; Last-Mod:     18-Jun-22 at 21:58:08 by Mats Lidell
+;; Last-Mod:     29-Aug-22 at 21:27:41 by Bob Weiner
 ;;
 ;; Copyright (C) 1996-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -305,7 +305,7 @@ The non-nil value returned is the function to call to 
select that syntactic unit
     (let* ((key (hypb:cmd-key-vector #'hui-select-goto-matching-delimiter
                                     hyperbole-mode-map))
           (org-key-cmd (and (derived-mode-p 'org-mode)
-                            (called-interactively-p 'interactive)
+                            (called-interactively-p 'any)
                             (equal (this-single-command-keys) key)
                             (lookup-key org-mode-map key))))
       (cond (org-key-cmd
@@ -415,7 +415,7 @@ interactively, the type of selection is displayed in the 
minibuffer."
          nil)))
   (let* ((key (hypb:cmd-key-vector #'hui-select-thing hyperbole-mode-map))
         (org-key-cmd (and (derived-mode-p 'org-mode)
-                          (called-interactively-p 'interactive)
+                          (called-interactively-p 'any)
                           (equal (this-single-command-keys) key)
                           (lookup-key org-mode-map key))))
     (cond (org-key-cmd