[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/evil-escape 67843e9dd4 041/133: Fix recursive `f` input du
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/evil-escape 67843e9dd4 041/133: Fix recursive `f` input during isearch in certain buffers |
Date: |
Wed, 3 Jan 2024 21:59:51 -0500 (EST) |
branch: elpa/evil-escape
commit 67843e9dd4518fba8aa8a26170653a94a7a1c27d
Author: syl20bnr <sylvain.benner@gmail.com>
Commit: syl20bnr <sylvain.benner@gmail.com>
Fix recursive `f` input during isearch in certain buffers
---
evil-escape.el | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/evil-escape.el b/evil-escape.el
index a3fe358944..07ece6271e 100644
--- a/evil-escape.el
+++ b/evil-escape.el
@@ -5,7 +5,7 @@
;; Author: Sylvain Benner <sylvain.benner@gmail.com>
;; Keywords: convenience editing evil
;; Created: 22 Oct 2014
-;; Version: 2.12
+;; Version: 2.13
;; Package-Requires: ((emacs "24") (evil "1.0.9"))
;; URL: https://github.com/syl20bnr/evil-escape
@@ -303,13 +303,15 @@ the underlying major or minor modes map.
Once the command KEY passed through MAP the function HFUNC is removed
from the `post-command-hook'."
(if (lookup-key map key)
+ ;; first pass
(define-key map key nil)
+ ;; second pass
(let ((escape-func (evil-escape--escape-function-symbol from)))
(define-key map key escape-func)
(remove-hook 'post-command-hook hfunc))))
(defun evil-escape--emacs-state-passthrough ()
- "Allow next command KEY to pass through `evil-emcs-state-map'"
+ "Allow next command KEY to pass through `evil-emacs-state-map'"
(evil-escape--passthrough "emacs-state"
(evil-escape--first-key)
evil-emacs-state-map
@@ -319,9 +321,11 @@ from the `post-command-hook'."
"Setup a pass through for emacs state map"
(when (eq 'emacs evil-state)
(add-hook 'post-command-hook 'evil-escape--emacs-state-passthrough)
- (setq unread-command-events
- (append unread-command-events (listify-key-sequence
- (evil-escape--first-key))))))
+ (unless (or (and (boundp 'isearch-mode) (symbol-value 'isearch-mode))
+ (minibufferp))
+ (setq unread-command-events
+ (append unread-command-events (listify-key-sequence
+ (evil-escape--first-key)))))))
(defun evil-escape--escape
(keys callback &optional shadowed-func insert-func delete-func)
@@ -361,5 +365,3 @@ DELETE-FUNC when calling CALLBACK. "
(evil-escape--execute-shadowed-func shadowed-func))))))
(provide 'evil-escape)
-
-;;; evil-escape.el ends here
- [nongnu] elpa/evil-escape 0b62cb6637 025/133: Fix multiple inserted occurrences of `f` in isearch and ex-command context, (continued)
- [nongnu] elpa/evil-escape 0b62cb6637 025/133: Fix multiple inserted occurrences of `f` in isearch and ex-command context, ELPA Syncer, 2024/01/03
- [nongnu] elpa/evil-escape 6cb4fa408a 026/133: Add evil-iedit-state, ELPA Syncer, 2024/01/03
- [nongnu] elpa/evil-escape 6d46b81bbc 030/133: Fix regression for evil-iedit-state, ELPA Syncer, 2024/01/03
- [nongnu] elpa/evil-escape 3637f13210 055/133: Correctly handle iedit-state, ELPA Syncer, 2024/01/03
- [nongnu] elpa/evil-escape da5498d25e 035/133: Correctly restore evil-lisp-state shadowed function by evil-escape, ELPA Syncer, 2024/01/03
- [nongnu] elpa/evil-escape cf3e18673d 051/133: Undefine mapping on first key when evil-escape is disabled, ELPA Syncer, 2024/01/03
- [nongnu] elpa/evil-escape cbfc43840f 063/133: Ensure that map is defined when undefining keys, ELPA Syncer, 2024/01/03
- [nongnu] elpa/evil-escape b8c9b4631d 049/133: Add support for helm-ag-edit, ELPA Syncer, 2024/01/03
- [nongnu] elpa/evil-escape b205051996 056/133: More stable passthrough, ELPA Syncer, 2024/01/03
- [nongnu] elpa/evil-escape afa9c9c321 067/133: Fixes #37 Capital r deletes a char inappropriately, ELPA Syncer, 2024/01/03
- [nongnu] elpa/evil-escape 67843e9dd4 041/133: Fix recursive `f` input during isearch in certain buffers,
ELPA Syncer <=
- [nongnu] elpa/evil-escape e78ffcdbeb 036/133: Explicitly disable any running transient map, ELPA Syncer, 2024/01/03
- [nongnu] elpa/evil-escape e556c7a6b6 057/133: Fix line highlight flicker on escape, ELPA Syncer, 2024/01/03
- [nongnu] elpa/evil-escape 05d9e5fc80 052/133: Don't break deft-mode, ELPA Syncer, 2024/01/03
- [nongnu] elpa/evil-escape 457386c7bc 043/133: Generalize passthrough, ELPA Syncer, 2024/01/03
- [nongnu] elpa/evil-escape 6c6379c19b 065/133: Update README for 3.0, ELPA Syncer, 2024/01/03
- [nongnu] elpa/evil-escape bc054dbe1e 059/133: Add documentation to generated wrapper functions, ELPA Syncer, 2024/01/03
- [nongnu] elpa/evil-escape 1488a2c9c3 037/133: When replaying macro, pass shadow func, ELPA Syncer, 2024/01/03
- [nongnu] elpa/evil-escape f8fe5c98d2 083/133: Add `evil-escape-inhibit-functions`, ELPA Syncer, 2024/01/03
- [nongnu] elpa/evil-escape b0d033794c 089/133: Fix typo in docstring of evil-escape-mode, ELPA Syncer, 2024/01/03
- [nongnu] elpa/evil-escape 1c4b0efc06 100/133: Allow evil-escape in normal state if it makes sense, ELPA Syncer, 2024/01/03