branch: elpa/evil-nerd-commenter
commit 7c75a0e782fae7c2a0ac66ceaca5b059cf8cc910
Author: Chen Bin <[email protected]>
Commit: Chen Bin <[email protected]>
fixed: initialize error when set up hotkeys
---
README.org | 4 +---
evil-nerd-commenter-pkg.el | 2 +-
evil-nerd-commenter.el | 18 ++++++++++--------
pkg.sh | 2 +-
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/README.org b/README.org
index 8096fbf3a1..b1873cd958 100644
--- a/README.org
+++ b/README.org
@@ -1,4 +1,4 @@
-* evil-nerd-commenter (current version 1.2.1)
+* evil-nerd-commenter (current version 1.2.2)
*Please note this program could be used independently without evil-mode!*
@@ -51,8 +51,6 @@ Further explanation, the content of evilnc-default-hotkeys is:
(define-key evil-normal-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 ",," 'evilnc-comment-operator)
- (define-key evil-visual-state-map ",," 'evilnc-comment-operator)
))
#+END_SRC
diff --git a/evil-nerd-commenter-pkg.el b/evil-nerd-commenter-pkg.el
index 0892fadcc6..bc3cefb28d 100644
--- a/evil-nerd-commenter-pkg.el
+++ b/evil-nerd-commenter-pkg.el
@@ -1,2 +1,2 @@
-(define-package "evil-nerd-commenter" "1.2.1"
+(define-package "evil-nerd-commenter" "1.2.2"
"Comment/uncomment lines efficiently. Like Nerd Commenter in
Vim")
diff --git a/evil-nerd-commenter.el b/evil-nerd-commenter.el
index d7255846c4..fb09cf9c7a 100644
--- a/evil-nerd-commenter.el
+++ b/evil-nerd-commenter.el
@@ -4,7 +4,7 @@
;; Author: Chen Bin <[email protected]>
;; URL: http://github.com/redguardtoo/evil-nerd-commenter
-;; Version: 1.2.1
+;; Version: 1.2.2
;; Keywords: commenter vim line evil
;;
;; This file is not part of GNU Emacs.
@@ -47,6 +47,13 @@
;;; Code:
+;; Example, presss ",,a{" will change C code:
+;; {printf("hello");} => /* {printf("hello");}*/
+;; google "vim text object for more syntax"
+(defcustom evilnc-hotkey-comment-operator ",," "The hot key for
evilnc-comment-operator to (un)comment text object"
+ :type 'string
+ :group 'evil-nerd-commenter)
+
;; shamelessly copied from goto-line
(defun evilnc--goto-line (line)
(save-restriction
@@ -307,13 +314,6 @@ Paragraphs are separated by empty lines."
(define-key evil-normal-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)
- ;; Please note evilnc-comment-operator require evil-mode
- ;; press key ",," which is default value
evilnc-operator-to-comment-text-object
- ;; example, presss ",,a{" will change C code:
- ;; {printf("hello");} to /* {printf("hello");}*/
- ;; google "vim text object for more syntax"
- (define-key evil-normal-state-map ",," 'evilnc-comment-operator)
- (define-key evil-visual-state-map ",," 'evilnc-comment-operator)
)))
;;;###autoload
@@ -362,6 +362,8 @@ Save in REGISTER or in the kill-ring with YANK-HANDLER."
(eval-after-load 'evil
'(progn
(evilnc-define-comment-operator)
+ (define-key evil-normal-state-map evilnc-hotkey-comment-operator
'evilnc-comment-operator)
+ (define-key evil-visual-state-map evilnc-hotkey-comment-operator
'evilnc-comment-operator)
))
(provide 'evil-nerd-commenter)
diff --git a/pkg.sh b/pkg.sh
index 3bc4c466e0..95144b797a 100755
--- a/pkg.sh
+++ b/pkg.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-pkg=evil-nerd-commenter-1.2.1
+pkg=evil-nerd-commenter-1.2.2
mkdir $pkg
cp README.org $pkg
cp *.el $pkg