branch: externals/hyperbole
commit 29ae2e15a8da66c296d6cd2fcf121d27f5b0073e
Author: Mats Lidell <mats.lid...@lidells.se>
Commit: GitHub <nore...@github.com>
Fix hkey-alist vertico test (#700)
---
ChangeLog | 7 +++++++
hui-mouse.el | 4 ++--
test/hui-mouse-tests.el | 18 ++++++++----------
3 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a44d873914..085939169b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2025-04-15 Mats Lidell <ma...@gnu.org>
+
+* hui-mouse.el (hkey-alist): Cleanup. Remove whitespace.
+
+* test/hui-mouse-tests.el (hui-mouse-tests--hkey-alist): Defvar
+ vertico-mode for bound-and-true-p to see the let value.
+
2025-04-14 Bob Weiner <r...@gnu.org>
* test/hui-mouse-tests.el (hui-mouse-tests--hkey-alist): Update with new
diff --git a/hui-mouse.el b/hui-mouse.el
index 49f95df4db..79b9584993 100644
--- a/hui-mouse.el
+++ b/hui-mouse.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 04-Feb-89
-;; Last-Mod: 13-Apr-25 at 14:49:05 by Bob Weiner
+;; Last-Mod: 15-Apr-25 at 12:51:50 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -260,7 +260,7 @@ Its default value is `smart-scroll-down'. To disable it,
set it to
((and (bound-and-true-p vertico-mode)
;; Is vertico prompting for an argument?
(vertico--command-p nil (current-buffer)))
- . ((funcall (lookup-key vertico-map (kbd "M-RET")))
+ . ((funcall (lookup-key vertico-map (kbd "M-RET")))
. (funcall (lookup-key vertico-map (kbd "M-RET")))))
;;
;; If in the minibuffer and reading a non-menu Hyperbole argument
diff --git a/test/hui-mouse-tests.el b/test/hui-mouse-tests.el
index 358804656a..76334cec8d 100644
--- a/test/hui-mouse-tests.el
+++ b/test/hui-mouse-tests.el
@@ -3,7 +3,7 @@
;; Author: Mats Lidell
;;
;; Orig-Date: 15-Mar-25 at 22:39:37
-;; Last-Mod: 15-Apr-25 at 01:03:12 by Bob Weiner
+;; Last-Mod: 15-Apr-25 at 13:13:21 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -34,16 +34,14 @@
(should (equal (hkey-actions)
(cons '(smart-dired-sidebar) '(smart-dired-sidebar)))))
- ;; !! FIXME: In CI/CD tests, the hkey-alist smart-prog-at-tag-p is
- ;; triggering instead of the vertico clause. Works interactively
- ;; but maybe needs more context specification. Disable for now.
;; Vertico
- ;; (let ((ivy-mode nil)
- ;; (vertico-mode t))
- ;; (mocklet ((vertico--command-p => t))
- ;; (should (equal (hkey-actions)
- ;; (cons '(funcall (lookup-key vertico-map (kbd "M-RET")))
- ;; '(funcall (lookup-key vertico-map (kbd
"M-RET"))))))))
+ (defvar vertico-mode)
+ (let ((ivy-mode nil)
+ (vertico-mode t))
+ (mocklet ((vertico--command-p => t))
+ (should (equal (hkey-actions)
+ (cons '(funcall (lookup-key vertico-map (kbd "M-RET")))
+ '(funcall (lookup-key vertico-map (kbd
"M-RET"))))))))
)
(provide 'hui-mouse-tests)
