summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThanos Apollo <public@thanosapollo.org>2026-05-03 13:17:11 +0300
committerThanos Apollo <public@thanosapollo.org>2026-05-03 13:17:11 +0300
commit986dcbaf5fe7f38902bd1aedd297c4c1bf192316 (patch)
tree62f8c805a1717bac4d22b2d154743e85ea96f8e5
parent97853f694b8610f7515aa60cb268cbbd116b05a2 (diff)
keep-pred: use and with t inside with-current-buffer
-rw-r--r--keymap-popup.el10
1 files changed, 4 insertions, 6 deletions
diff --git a/keymap-popup.el b/keymap-popup.el
index 1cf9fe3..ba48420 100644
--- a/keymap-popup.el
+++ b/keymap-popup.el
@@ -843,12 +843,10 @@ Frame parameters are taken from `keymap-popup-child-frame-parameters'."
Reads state from BUF. Consumes the reentering flag on read."
(lambda ()
(and (buffer-live-p buf)
- ;; `when', not `and': setq-local returns nil, which
- ;; would short-circuit `and' before reaching t.
- (or (when (buffer-local-value 'keymap-popup--reentering buf)
- (with-current-buffer buf
- (setq-local keymap-popup--reentering nil))
- t)
+ (or (and (buffer-local-value 'keymap-popup--reentering buf)
+ (with-current-buffer buf
+ (setq-local keymap-popup--reentering nil)
+ t))
(or (memq this-command
'(universal-argument universal-argument-more
digit-argument negative-argument