branch: externals/hyperbole
commit c02aa4d41752b745fd8ffa13955f58d027cdc5a5
Author: bw <r...@gnu.org>
Commit: bw <r...@gnu.org>
hypb-ert-def-at-p - fix rexexp bug with Action Key edebug testing
---
ChangeLog | 6 ++++++
hmouse-mod.el | 6 +++---
hypb-ert.el | 7 ++++---
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4ac96cdb42..00ed751672 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-01-01 Bob Weiner <r...@gnu.org>
+
+* hypb-ert.el (hypb-ert-def-at-p): Update doc. Fix grouping ref that was
+ 1 that should have been 2 since optional "\\(-async\\)" added to the
+ regexp.
+
2023-12-31 Bob Weiner <r...@gnu.org>
* hyrolo.el (hyrolo-file-list): Add 'hyrolo-set-file-list' after loading the
hyrolo
diff --git a/hmouse-mod.el b/hmouse-mod.el
index 05868a7973..63040e4539 100644
--- a/hmouse-mod.el
+++ b/hmouse-mod.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 8-Oct-92 at 19:08:31
-;; Last-Mod: 26-Jul-22 at 23:56:52 by Mats Lidell
+;; Last-Mod: 1-Jan-24 at 13:50:23 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -117,7 +117,7 @@ mode, if no other key is pressed while a Smart Key is
depressed."
;;; ************************************************************************
(defun hmouse-mod-disable ()
- "Restore the global keymap to its state prior to enabling of
`hmouse-mod-mode'.
+ "Restore the global keymap to its state prior to enabling `hmouse-mod-mode'.
This stops the Smart Keys from acting as modifier keys."
(use-global-map (if (keymapp hmouse-mod--prior-global-map)
hmouse-mod--prior-global-map
@@ -138,7 +138,7 @@ It accounts for modifier Smart Keys."
(use-global-map hmouse-mod--global-map))
(defun hmouse-mod-execute-command (key count)
- "Execute command associated with keyboard KEY or if KEY is a prefix, record
it.
+ "Execute command on keyboard KEY or if KEY is a prefix, record it.
Second argument COUNT is used as a prefix argument to the command."
(if (stringp key) (setq key (concat hmouse-mod--prefix key)))
(let ((binding (key-binding key))
diff --git a/hypb-ert.el b/hypb-ert.el
index 7f7e5fcc7b..ef97904198 100644
--- a/hypb-ert.el
+++ b/hypb-ert.el
@@ -3,7 +3,7 @@
;; Author: Mats Lidell <ma...@gnu.org> and Bob Weiner <r...@gnu.org>
;;
;; Orig-Date: 31-Mar-21 at 21:11:00
-;; Last-Mod: 30-Dec-23 at 00:38:40 by Bob Weiner
+;; Last-Mod: 1-Jan-24 at 13:10:06 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -87,7 +87,8 @@ See documentation for `ert-select-tests' for TEST-SELECTOR
types.")
;; (memq 'edebug-enter (flatten-tree (ert-test-body (ert-get-test test-sym))))
(defun hypb-ert-def-at-p (&optional start-end-flag)
- "Return test name if on the name in the first line of an ert test def."
+ "Return test name if on the name in the first line of an ert test def.
+With optional START-END-FLAG, return a list of (test-name start-pos end-pos)."
(unless (or (eolp)
(memq (char-after (point))
'(?\( ?\) ?\[ ?\] ?{ ?} ?< ?>)))
@@ -98,7 +99,7 @@ See documentation for `ert-select-tests' for TEST-SELECTOR
types.")
"\\s-*("))
(if start-end-flag
(list (match-string-no-properties 2) (match-beginning 2) (match-end
2))
- (match-string-no-properties 1))))))
+ (match-string-no-properties 2))))))
(defun hypb-ert-run-test-at-definition (test-name &optional debug-it)
"Assume on the name in the first line of an ert test def, eval and run the
test.
