[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/hyperbole f2a5c27 22/51: Fixed errors in using hyrolo-l
From: |
Stefan Monnier |
Subject: |
[elpa] externals/hyperbole f2a5c27 22/51: Fixed errors in using hyrolo-logic operators |
Date: |
Sun, 12 Jul 2020 18:10:12 -0400 (EDT) |
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
- [elpa] externals/hyperbole 9a94a8f 19/51: Fix hproperty:item-highlight-color init error; add regional 'throw', (continued)
- [elpa] externals/hyperbole 9a94a8f 19/51: Fix hproperty:item-highlight-color init error; add regional 'throw', Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 45fff9a 23/51: Many bug fixes and improvements, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 6e55a34 34/51: Fix ebut:get calls to send file as 3rd arg, not 2nd, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole b430d10 36/51: hpath:find: Was called with point in the source, not referent buffer, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 3d26ccb 40/51: Fix require of 'help-mode' instead of 'help' to remedy 'make bin', Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 56e88ca 47/51: Merge branch 'master' of hyperbole, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 2f52190 44/51: Koutliner: Add support for Emacs visual-line commands, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 2253ac2 50/51: V7.1.2 release, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 7184b30 51/51: Fix ibut:delete, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 07c0664 21/51: Org-mode local binding of M-RET activates Hyperbole implicit buttons, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole f2a5c27 22/51: Fixed errors in using hyrolo-logic operators,
Stefan Monnier <=
- [elpa] externals/hyperbole ecc8f36 24/51: Smart Key live window resizing and frame dragging; auto-autoload gen, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole cb7827c 26/51: Swapping buffer improvements; handle grep lines with null separators, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 73fed44 28/51: Fix in-buffer text as ebut label; allow line/col in link-to-file, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole f98ce2a 29/51: Fix colorized display of HyRolo match terms on initial use., Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 7a14688 30/51: Update manual with bottommost modeline frame drags and Bookmarks, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole bf73086 31/51: Generalize in-buffer button completion UI; Hyperbole manual updates, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 9f9b106 35/51: hypb:replace-match-string): Replace with replace-regexp-in-string, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 7d098e4 37/51: kbd-key:normalize: Rewrote and added support for many more keys, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole c050a69 42/51: kotl/klink.el: (require 'kcell): Removed recursive require loop, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 034d672 45/51: Only url encode the user input to the search (#25), Stefan Monnier, 2020/07/12