[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/meow dd79ccc426: Add shim code for ediff
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/meow dd79ccc426: Add shim code for ediff |
Date: |
Mon, 25 Nov 2024 10:00:31 -0500 (EST) |
branch: elpa/meow
commit dd79ccc4261cf4c206aeb65824d48a567e6bf65f
Author: DogLooksGood <doglooksgood@hotmail.com>
Commit: DogLooksGood <doglooksgood@hotmail.com>
Add shim code for ediff
---
meow-shims.el | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/meow-shims.el b/meow-shims.el
index 95df85bb7e..6405f91a17 100644
--- a/meow-shims.el
+++ b/meow-shims.el
@@ -503,6 +503,15 @@ Argument ENABLE non-nil means turn on."
(remove-hook 'eat-eshell-exit-hook
#'meow--eat-eshell-mode-override-disable)
(remove-hook 'eat-eshell-exit-hook #'meow--update-cursor)))
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ediff
+(defvar meow--ediff-setup nil)
+
+(defun meow--setup-ediff (enable)
+ (if enable
+ (add-hook 'ediff-mode-hook 'meow-motion-mode)
+ (remove-hook 'ediff-mode-hook 'meow-motion-mode)))
+
;; Enable / Disable shims
(defun meow--enable-shims ()
@@ -530,7 +539,8 @@ Argument ENABLE non-nil means turn on."
(eval-after-load "diff-hl" (lambda () (meow--setup-diff-hl t)))
(eval-after-load "quail" (lambda () (meow--setup-input-method t)))
(eval-after-load "skk" (lambda () (meow--setup-ddskk t)))
- (eval-after-load "eat" (lambda () (meow--setup-eat-eshell t))))
+ (eval-after-load "eat" (lambda () (meow--setup-eat-eshell t)))
+ (eval-after-load "ediff" (lambda () (meow--setup-ediff t))))
(defun meow--disable-shims ()
"Remove shim setups."
@@ -550,7 +560,8 @@ Argument ENABLE non-nil means turn on."
(when meow--diff-hl-setup (meow--setup-diff-hl nil))
(when meow--input-method-setup (meow--setup-input-method nil))
(when meow--ddskk-setup (meow--setup-ddskk nil))
- (when meow--eat-eshell-setup (meow--setup-eat-eshell nil)))
+ (when meow--eat-eshell-setup (meow--setup-eat-eshell nil))
+ (when meow--ediff-setup (meow--setup-ediff nil)))
;;; meow-shims.el ends here
(provide 'meow-shims)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [nongnu] elpa/meow dd79ccc426: Add shim code for ediff,
ELPA Syncer <=