branch: elpa/evil-nerd-commenter
commit dcaf98583533534038bd1b621dfcc20a541e7d3f
Author: Chen Bin <[email protected]>
Commit: Chen Bin <[email protected]>
fixed: v1.2.2 and v1.2.1 cannot be installed
---
README.org | 2 +-
evil-nerd-commenter-pkg.el | 2 +-
evil-nerd-commenter.el | 76 ++++++++++++++++++++--------------------------
pkg.sh | 2 +-
4 files changed, 36 insertions(+), 46 deletions(-)
diff --git a/README.org b/README.org
index b1873cd958..650cc62d2c 100644
--- a/README.org
+++ b/README.org
@@ -1,4 +1,4 @@
-* evil-nerd-commenter (current version 1.2.2)
+* evil-nerd-commenter (current version 1.2.3)
*Please note this program could be used independently without evil-mode!*
diff --git a/evil-nerd-commenter-pkg.el b/evil-nerd-commenter-pkg.el
index bc3cefb28d..141240bc5f 100644
--- a/evil-nerd-commenter-pkg.el
+++ b/evil-nerd-commenter-pkg.el
@@ -1,2 +1,2 @@
-(define-package "evil-nerd-commenter" "1.2.2"
+(define-package "evil-nerd-commenter" "1.2.3"
"Comment/uncomment lines efficiently. Like Nerd Commenter in
Vim")
diff --git a/evil-nerd-commenter.el b/evil-nerd-commenter.el
index fb09cf9c7a..9fe313673d 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.2
+;; Version: 1.2.3
;; Keywords: commenter vim line evil
;;
;; This file is not part of GNU Emacs.
@@ -316,52 +316,42 @@ Paragraphs are separated by empty lines."
(define-key evil-normal-state-map ",cr" 'comment-or-uncomment-region)
)))
-;;;###autoload
-(defun evilnc-define-comment-operator ()
- "Attempts to define the comment operator evilnc-comment-operator.
-
-Will only work if 'evil-define-operator is defined and
'evilnc-comment-operator is not."
- (interactive)
- (when (and (fboundp 'evil-define-operator)
- (not (fboundp 'evilnc-comment-operator)))
- (evil-define-operator evilnc-comment-operator (beg end type register
yank-handler)
- "Comments text from BEG to END with TYPE.
-Save in REGISTER or in the kill-ring with YANK-HANDLER."
- (interactive "<R><x><y>")
- (unless register
- (let ((text (filter-buffer-substring beg end)))
- (unless (string-match-p "\n" text)
- ;; set the small delete register
- (evil-set-register ?- text))))
- (evil-yank beg end type register yank-handler)
- (cond
- ((eq type 'block)
- (let ((newpos (evilnc--extend-to-whole-comment beg end) ))
- (evil-apply-on-block #'comment-or-uncomment-region (nth 0 newpos)
(nth 1 newpos) nil)
- )
- )
- ((and (eq type 'line)
- (= end (point-max))
- (or (= beg end)
- (/= (char-before end) ?\n))
- (/= beg (point-min))
- (= (char-before beg) ?\n))
- (comment-or-uncomment-region (1- beg) end))
- (t
- (let ((newpos (evilnc--extend-to-whole-comment beg end) ))
- (comment-or-uncomment-region (nth 0 newpos) (nth 1 newpos))
- )
- ))
- ;; place cursor on beginning of line
- (when (and (evil-called-interactively-p)
- (eq type 'line))
- (evil-first-non-blank)))))
-
;; Attempt to define the operator on first load.
;; Will only work if evil has been loaded
(eval-after-load 'evil
'(progn
- (evilnc-define-comment-operator)
+ (evil-define-operator evilnc-comment-operator (beg end type register
yank-handler)
+ "Comments text from BEG to END with TYPE.
+Save in REGISTER or in the kill-ring with YANK-HANDLER."
+ (interactive "<R><x><y>")
+ (unless register
+ (let ((text (filter-buffer-substring beg end)))
+ (unless (string-match-p "\n" text)
+ ;; set the small delete register
+ (evil-set-register ?- text))))
+ (evil-yank beg end type register yank-handler)
+ (cond
+ ((eq type 'block)
+ (let ((newpos (evilnc--extend-to-whole-comment beg end) ))
+ (evil-apply-on-block #'comment-or-uncomment-region (nth 0 newpos)
(nth 1 newpos) nil)
+ )
+ )
+ ((and (eq type 'line)
+ (= end (point-max))
+ (or (= beg end)
+ (/= (char-before end) ?\n))
+ (/= beg (point-min))
+ (= (char-before beg) ?\n))
+ (comment-or-uncomment-region (1- beg) end))
+ (t
+ (let ((newpos (evilnc--extend-to-whole-comment beg end) ))
+ (comment-or-uncomment-region (nth 0 newpos) (nth 1 newpos))
+ )
+ ))
+ ;; place cursor on beginning of line
+ (when (and (evil-called-interactively-p)
+ (eq type 'line))
+ (evil-first-non-blank)))
(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)
))
diff --git a/pkg.sh b/pkg.sh
index 95144b797a..e3b753361c 100755
--- a/pkg.sh
+++ b/pkg.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-pkg=evil-nerd-commenter-1.2.2
+pkg=evil-nerd-commenter-1.2.3
mkdir $pkg
cp README.org $pkg
cp *.el $pkg
