branch: elpa/evil-nerd-commenter
commit 4387407615258d5e95f71bfb425cbe92dd813290
Author: Chen Bin <[email protected]>
Commit: Chen Bin <[email protected]>
fixed key binding setup
---
evil-nerd-commenter.el | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/evil-nerd-commenter.el b/evil-nerd-commenter.el
index ecbada54cb..55d4185dee 100644
--- a/evil-nerd-commenter.el
+++ b/evil-nerd-commenter.el
@@ -759,7 +759,7 @@ if NO-EMACS-KEYBINDINGS is t, we don't define keybindings
in EMACS mode."
(global-set-key (kbd "C-c p") 'evilnc-comment-or-uncomment-paragraphs))
;; Install key bindings for evil
- (unless no-evil-keybindings
+ (when (and (not no-evil-keybindings) (fboundp 'evil-mode))
(define-key evil-normal-state-map ",ci" 'evilnc-comment-or-uncomment-lines)
(define-key evil-visual-state-map ",ci" 'evilnc-comment-or-uncomment-lines)
(define-key evil-normal-state-map ",cl"
'evilnc-quick-comment-or-uncomment-to-the-line)
@@ -768,20 +768,14 @@ if NO-EMACS-KEYBINDINGS is t, we don't define keybindings
in EMACS mode."
(define-key evil-visual-state-map ",cc" 'evilnc-copy-and-comment-lines)
(define-key evil-normal-state-map ",cp"
'evilnc-comment-or-uncomment-paragraphs)
(define-key evil-normal-state-map ",cr" 'comment-or-uncomment-region)
- (define-key evil-normal-state-map ",cv"
'evilnc-toggle-invert-comment-line-by-line))
-
- ;; Install operator for evil text objects
- (unless (and no-evil-keybindings (not evilnc-use-comment-object-setup))
- ;; operator to comment at text objects
- (define-key evil-normal-state-map ",." 'evilnc-copy-and-comment-operator)
- (define-key evil-visual-state-map ",." 'evilnc-copy-and-comment-operator)
- (define-key evil-normal-state-map ",," 'evilnc-comment-operator)
- (define-key evil-visual-state-map ",," 'evilnc-comment-operator)
-
- ;; comment itself is text object
- (define-key evil-inner-text-objects-map evilnc-comment-text-object
'evilnc-inner-comment)
- (define-key evil-outer-text-objects-map evilnc-comment-text-object
'evilnc-outer-commenter)))
-
+ (define-key evil-normal-state-map ",cv"
'evilnc-toggle-invert-comment-line-by-line)
+
+ (when evilnc-use-comment-object-setup
+ ;; Install operator for evil text objects
+ (define-key evil-normal-state-map ",." 'evilnc-copy-and-comment-operator)
+ (define-key evil-visual-state-map ",." 'evilnc-copy-and-comment-operator)
+ (define-key evil-normal-state-map ",," 'evilnc-comment-operator)
+ (define-key evil-visual-state-map ",," 'evilnc-comment-operator))))
(defun evilnc-frame-wide-string (s)
"Build summary from S."
