[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/evil-anzu fbf975f676 26/27: Merge pull request #10 from Ce
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/evil-anzu fbf975f676 26/27: Merge pull request #10 from CeleritasCelery/master |
Date: |
Thu, 6 Jan 2022 03:59:32 -0500 (EST) |
branch: elpa/evil-anzu
commit fbf975f676d96c17f22fd5bd3db26c156a2cdb0f
Merge: 9bca6ca14d 012bbb192f
Author: Fredrik Bergroth <fbergroth@gmail.com>
Commit: GitHub <noreply@github.com>
Merge pull request #10 from CeleritasCelery/master
only enable evil-anzu if anzu-mode is enabled
---
evil-anzu.el | 50 +++++++++++++++++++++++++++++++++-----------------
1 file changed, 33 insertions(+), 17 deletions(-)
diff --git a/evil-anzu.el b/evil-anzu.el
index 194e918049..f404f6770b 100644
--- a/evil-anzu.el
+++ b/evil-anzu.el
@@ -28,30 +28,46 @@
(require 'evil)
(require 'anzu)
-(defadvice evil-search (after evil-anzu-compat (string forward &optional
regexp-p start) activate)
- (anzu--cons-mode-line-search)
- (let ((isearch-regexp regexp-p))
- (anzu--update string)))
+(defun evil-anzu-start-search (string forward &optional regexp-p start)
+ (when anzu-mode (anzu--cons-mode-line-search)
+ (let ((isearch-regexp regexp-p))
+ (anzu--update string))))
-(defadvice evil-ex-find-next (after evil-anzu-compat (&optional pattern
direction nowrap) activate)
+(defun evil-anzu-search-next (&optional pattern direction nowrap)
"Make anzu work with the 'evil-search search module.
If PATTERN is not specified the current global pattern
`evil-ex-search-pattern' is used."
- (anzu--cons-mode-line-search)
- (let* ((isearch-regexp t) ; all evil-ex searches are regexp searches
- (current-pattern (or pattern evil-ex-search-pattern))
- (regexp (evil-ex-pattern-regex current-pattern)))
- (save-match-data ; don't let anzu's searching mess up evil
- (anzu--update regexp))))
-
-(defadvice evil-flash-hook (after evil-anzu-compat activate)
+ (when anzu-mode
+ (anzu--cons-mode-line-search)
+ (let* ((isearch-regexp t) ; all evil-ex searches are regexp searches
+ (current-pattern (or pattern evil-ex-search-pattern))
+ (regexp (evil-ex-pattern-regex current-pattern)))
+ (save-match-data ; don't let anzu's searching mess up evil
+ (anzu--update regexp)))))
+
+(defun evil-anzu-prevent-flicker (&optional force)
;; Prevent flickering, only run if timer is not active
- (unless (memq evil-flash-timer timer-list)
- (anzu--reset-mode-line)))
+ (when anzu-mode
+ (unless (memq evil-flash-timer timer-list)
+ (anzu--reset-mode-line))))
-(defadvice evil-ex-delete-hl (after evil-anzu-compat (name) activate)
- (when (eq name 'evil-ex-search)
+(defun evil-anzu-reset (name)
+ (when (and anzu-mode
+ (eq name 'evil-ex-search))
(anzu--reset-mode-line)))
+(advice-add 'evil-search :after #'evil-anzu-start-search)
+(advice-add 'evil-ex-find-next :after #'evil-anzu-search-next)
+(advice-add 'evil-flash-hook :after #'evil-anzu-prevent-flicker)
+(advice-add 'evil-ex-delete-hl :after #'evil-anzu-reset)
+
+(defun evil-anzu-unload-function ()
+ "unload evil anzu"
+ (advice-remove 'evil-search #'evil-anzu-start-search)
+ (advice-remove 'evil-ex-find-next #'evil-anzu-search-next)
+ (advice-remove 'evil-flash-hook #'evil-anzu-prevent-flicker)
+ (advice-remove 'evil-ex-delete-hl #'evil-anzu-reset)
+ nil)
+
(provide 'evil-anzu)
;;; evil-anzu.el ends here
- [nongnu] branch elpa/evil-anzu created (now d3f6ed4773), ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-anzu 911c43022e 01/27: init repos, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-anzu c2318e6aad 04/27: Merge pull request #1 from syohex/disable-highlight-when-flash, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-anzu 374bea49a3 14/27: Add configuration example, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-anzu 6cac9c1fef 16/27: Make anzu work with the 'evil-search search module, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-anzu 995141132b 17/27: Merge pull request #6 from GordonGustafson/master, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-anzu fbf975f676 26/27: Merge pull request #10 from CeleritasCelery/master,
ELPA Syncer <=
- [nongnu] elpa/evil-anzu 012bbb192f 25/27: add unload feature function, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-anzu c5f8dd4aa0 05/27: add evil dependency, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-anzu 47624e12ca 11/27: Update readme, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-anzu a041db15bd 20/27: Fix melpa stable link, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-anzu 183e42a7e4 21/27: Update README, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-anzu 58d9f8f099 02/27: Add sample configuration, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-anzu cb42ec7d77 03/27: remove anzu status when evil-flash-hook is called, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-anzu d08a2e92f9 06/27: add screencasts, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-anzu 3837e74d86 07/27: Add URL meta information, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-anzu 0bbb681a4d 08/27: Update README, ELPA Syncer, 2022/01/06