[elpa] externals/hyperbole f2a5c27 22/51: Fixed errors in using hyrolo-logic operators

[Stefan Monnier]

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

    Fixed errors in using hyrolo-logic operators
---
 Changes         |  8 ++++++++
 hyrolo-logic.el |  2 +-
 hyrolo.el       | 12 +++++-------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Changes b/Changes
index e9f06ed..6290319 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,13 @@
 2020-02-12  Bob Weiner  <rsw@gnu.org>
 
+* hyrolo.el (hyrolo-verify): Removed check of (stringp hyrolo-match-regexp) 
since may have
+    done a logical search which does not set that regexp.  This resolved an 
error when
+    using {q} to quit from the hyrolo match buffer.
+
+* hyrolo-logic.el (hyrolo-map-logic): Fixed function call.
+    Changed: (match-string-no-properties hyrolo-entry-regexp
+         To: (match-string-no-properties hyrolo-entry-group-number)
+
 * hsys-org.el (hsys-org-hbut-activate-p): Defined and added to 
org-metareturn-hook so local binding
     of M-RET in org-mode activates Hyperbole buttons (doesn't run full set of 
Action Key actions).
     (org-link): Updated to utilize newer org-link-open-from-string function 
when available.
diff --git a/hyrolo-logic.el b/hyrolo-logic.el
index 1e34b99..ba0f392 100644
--- a/hyrolo-logic.el
+++ b/hyrolo-logic.el
@@ -184,7 +184,7 @@ of applications of SEXP that matched entries."
                  (setq end-entry-hdr (match-end hyrolo-entry-group-number)
                        start (match-beginning hyrolo-entry-group-number)
                        next-entry-exists nil
-                       curr-entry-level-len (length 
(match-string-no-properties hyrolo-entry-regexp))
+                       curr-entry-level-len (length 
(match-string-no-properties hyrolo-entry-group-number))
                        end (hyrolo-to-entry-end include-sub-entries 
curr-entry-level-len))
                  (let ((result (eval sexp)))
                    (or count-only
diff --git a/hyrolo.el b/hyrolo.el
index 1e8bda5..e592379 100644
--- a/hyrolo.el
+++ b/hyrolo.el
@@ -460,12 +460,10 @@ search for the current match string rather than regular 
expression."
     (hyrolo-isearch-for-regexp hyrolo-match-regexp)))
 
 (defun hyrolo-verify ()
-  "Verify point is in a rolo match buffer and a match query has been 
performed, then execute rest of forms, BODY."
-  (cond ((not (stringp hyrolo-match-regexp))
-        (error "(HyRolo): Invoke a rolo search expression first"))
-       ((not (equal (buffer-name) hyrolo-display-buffer))
-        (error "(HyRolo): Use this command in the %s match buffer"
-               hyrolo-display-buffer))))
+  "Verify point is in a rolo match buffer."
+  (when (not (equal (buffer-name) hyrolo-display-buffer))
+    (error "(HyRolo): Use this command in the %s match buffer"
+          hyrolo-display-buffer)))
 
 ;;;###autoload
 (defun hyrolo-kill (name &optional file)
@@ -1485,7 +1483,7 @@ file are added.")
 
 (defconst hyrolo-match-regexp nil
   "Last regular expression used to search the rolo.
-Nil before a search is done.
+Nil before a search is done, including after a logical search is done.
 String search expressions are converted to regular expressions.")
 
 (defvar hyrolo--wconfig nil