branch: externals/hiddenquote
commit 0b7cd760ea00a7e34566473e23db43ec1cabc182
Author: Mauro Aranda <[email protected]>
Commit: Mauro Aranda <[email protected]>
Avoid lambda in hook
This change also makes customizing
hiddenquote-mark-syllable-after-isearch more reliable, since there's
no need to restart the puzzle.
* hiddenquote.el (hiddenquote-maybe-mark-syllable-after-isearch): New
function.
(hiddenquote-create-grid): Install it in isearch-end-hook.
---
hiddenquote.el | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/hiddenquote.el b/hiddenquote.el
index 74d486a8b1..b6cd5537cd 100644
--- a/hiddenquote.el
+++ b/hiddenquote.el
@@ -398,6 +398,15 @@ Used locally in the definitions buffer, to
highlight/unhighlight them.")
(file-name-as-directory source)
(file-name-as-directory hiddenquote-directory))))
+(defun hiddenquote-maybe-mark-syllable-after-isearch ()
+ "Mark syllable when exiting isearch with success.
+
+Only marks the syllable if `hiddenquote-mark-syllable-after-isearch' is
+non-nil."
+ (when (and hiddenquote-mark-syllable-after-isearch
+ (equal (this-command-keys) [return]))
+ (widget-button-press (point))))
+
(defun hiddenquote-widget-backward ()
"Compatibility function, to avoid `widget-backward' to skip widgets."
(unless (eobp)
@@ -614,12 +623,8 @@ Returns the `hiddenquote-grid' widget created."
(setq buffer-read-only t)
(setq hiddenquote-buffer cbuff)
(add-hook 'kill-buffer-hook #'hiddenquote-refuse-kill-buffer nil t)
- (when hiddenquote-mark-syllable-after-isearch
- (add-hook 'isearch-mode-end-hook
- (lambda ()
- (when (equal (this-command-keys) [return])
- (widget-button-press (point))))
- nil t))
+ (add-hook 'isearch-mode-end-hook
+ #'hiddenquote-maybe-mark-syllable-after-isearch nil t)
(when (< emacs-major-version 28)
(add-hook 'widget-backward-hook
#'hiddenquote-widget-backward nil t))
