[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/evil-goggles f5e98355f4 135/225: Use one function for `evi
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/evil-goggles f5e98355f4 135/225: Use one function for `evil-paste-after` and `evil-paste-before` advices |
Date: |
Wed, 12 Jan 2022 08:59:02 -0500 (EST) |
branch: elpa/evil-goggles
commit f5e98355f4c0640b7f31f98fe468d473582e2ff5
Author: Evgeni Kolev <evgenysw@gmail.com>
Commit: Evgeni Kolev <evgenysw@gmail.com>
Use one function for `evil-paste-after` and `evil-paste-before` advices
---
evil-goggles.el | 32 ++++++++++----------------------
1 file changed, 10 insertions(+), 22 deletions(-)
diff --git a/evil-goggles.el b/evil-goggles.el
index 1cc16f1026..1ac3aee981 100644
--- a/evil-goggles.el
+++ b/evil-goggles.el
@@ -521,27 +521,15 @@ BEG END are arguments of the original function."
evil-goggles-paste-face "Face for paste action"
evil-goggles-paste-duration "Duration of hint when pasting")
-(defun evil-goggles--evil-paste-after-advice (orig-fun count &optional
register yank-handler)
- "Around-advice for function `evil-paste-after'.
+(defun evil-goggles--evil-paste-advice (orig-fun count &optional register
yank-handler)
+ "Around-advice for functions `evil-paste-after' and `evil-paste-before'.
ORIG-FUN is the original function.
COUNT REGISTER YANK-HANDLER are the arguments of the original function."
- (let ((was-in-normal-state (evil-normal-state-p))
- (orig-fun-result (evil-goggles--funcall-preserve-interactive orig-fun
count register yank-handler)))
- (when was-in-normal-state
- (evil-goggles--evil-paste-show register yank-handler))
- orig-fun-result))
-
-(defun evil-goggles--evil-paste-before-advice (orig-fun count &optional
register yank-handler)
- "Around-advice for function `evil-paste-before'.
-
-ORIG-FUN is the original function.
-COUNT REGISTER YANK-HANDLER are the arguments of the original function."
- (let ((was-in-normal-state (evil-normal-state-p))
- (orig-fun-result (evil-goggles--funcall-preserve-interactive orig-fun
count register yank-handler)))
- (when was-in-normal-state
- (evil-goggles--evil-paste-show register yank-handler))
- orig-fun-result))
+ (prog1
+ (evil-goggles--funcall-preserve-interactive orig-fun count register
yank-handler)
+ (when (evil-normal-state-p)
+ (evil-goggles--evil-paste-show register yank-handler))))
(defun evil-goggles--evil-paste-show (register yank-handler)
"Helper fun to show the goggles overlay on the last pasted text.
@@ -726,8 +714,8 @@ COUNT BEG &OPTIONAL END TYPE REGISTER are the arguments of
the original function
(advice-add 'evil-fill-and-move :around
'evil-goggles--evil-fill-and-move-advice))
(when evil-goggles-enable-paste
- (advice-add 'evil-paste-after :around
'evil-goggles--evil-paste-after-advice)
- (advice-add 'evil-paste-before :around
'evil-goggles--evil-paste-before-advice))
+ (advice-add 'evil-paste-after :around 'evil-goggles--evil-paste-advice)
+ (advice-add 'evil-paste-before :around 'evil-goggles--evil-paste-advice))
(when evil-goggles-enable-shift
(advice-add 'evil-shift-left :around 'evil-goggles--evil-shift-advice)
@@ -761,8 +749,8 @@ COUNT BEG &OPTIONAL END TYPE REGISTER are the arguments of
the original function
(advice-remove 'evil-join 'evil-goggles--evil-join-advice)
(advice-remove 'evil-join-whitespace 'evil-goggles--evil-join-advice)
(advice-remove 'evil-fill-and-move
'evil-goggles--evil-fill-and-move-advice)
- (advice-remove 'evil-paste-after 'evil-goggles--evil-paste-after-advice)
- (advice-remove 'evil-paste-before 'evil-goggles--evil-paste-before-advice)
+ (advice-remove 'evil-paste-after 'evil-goggles--evil-paste-advice)
+ (advice-remove 'evil-paste-before 'evil-goggles--evil-paste-advice)
(advice-remove 'evil-shift-left 'evil-goggles--evil-shift-advice)
(advice-remove 'evil-shift-right 'evil-goggles--evil-shift-advice)
(advice-remove 'evil-set-marker 'evil-goggles--evil-set-marker-advice)
- [nongnu] elpa/evil-goggles 1ffd97d6b8 102/225: add support for evil-nerd-commenter, (continued)
- [nongnu] elpa/evil-goggles 1ffd97d6b8 102/225: add support for evil-nerd-commenter, ELPA Syncer, 2022/01/12
- [nongnu] elpa/evil-goggles 33ea1247a7 109/225: Add helper to make evil-goggles use magit-diff-* faces, ELPA Syncer, 2022/01/12
- [nongnu] elpa/evil-goggles e14b865d80 114/225: Don't ignore foreground color when not pulsing. Fix #16, ELPA Syncer, 2022/01/12
- [nongnu] elpa/evil-goggles 856cb548c3 123/225: Define per-action durations, ELPA Syncer, 2022/01/12
- [nongnu] elpa/evil-goggles 8b3889332c 126/225: Use new funcs/macros which support duration per operation, ELPA Syncer, 2022/01/12
- [nongnu] elpa/evil-goggles 90da624f36 115/225: Improve docs, ELPA Syncer, 2022/01/12
- [nongnu] elpa/evil-goggles 92d614e731 119/225: Display the hint after indenting and "replacing with register" #7, ELPA Syncer, 2022/01/12
- [nongnu] elpa/evil-goggles c7e3f6ff17 116/225: Remove incorrectly commited snippet, ELPA Syncer, 2022/01/12
- [nongnu] elpa/evil-goggles 4777cd7849 121/225: Show hint after indenting, not before #7, ELPA Syncer, 2022/01/12
- [nongnu] elpa/evil-goggles 287491d0a0 124/225: Add WIP support for per-action durations, ELPA Syncer, 2022/01/12
- [nongnu] elpa/evil-goggles f5e98355f4 135/225: Use one function for `evil-paste-after` and `evil-paste-before` advices,
ELPA Syncer <=
- [nongnu] elpa/evil-goggles d705bef9d4 134/225: Fix CI failing, ELPA Syncer, 2022/01/12
- [nongnu] elpa/evil-goggles f6519214b8 149/225: Update README.md, ELPA Syncer, 2022/01/12
- [nongnu] elpa/evil-goggles 5db6848df8 154/225: Undo adds should show a blocking hint, ELPA Syncer, 2022/01/12
- [nongnu] elpa/evil-goggles 440324a1ed 161/225: Silence compilation warning for unused lexical variable, ELPA Syncer, 2022/01/12
- [nongnu] elpa/evil-goggles 3dce5937ac 166/225: Pulsing is no longer experimental, ELPA Syncer, 2022/01/12
- [nongnu] elpa/evil-goggles 4d4465fd59 168/225: Improve logic deciding whether to pulse or not, ELPA Syncer, 2022/01/12
- [nongnu] elpa/evil-goggles 3b874c7630 178/225: Set mark advice: show hint on whitespace-only lines, ELPA Syncer, 2022/01/12
- [nongnu] elpa/evil-goggles ca18c944ed 179/225: Show hint on start/stop record macro, ELPA Syncer, 2022/01/12
- [nongnu] elpa/evil-goggles 943382b367 194/225: Add hints for surround, commentary, nerd commenter, ELPA Syncer, 2022/01/12
- [nongnu] elpa/evil-goggles 04d66ddc20 201/225: Add hint for `q`, ELPA Syncer, 2022/01/12