branch: elpa/evil-nerd-commenter
commit 2730820b9ccedf758c8a0428ee2c994c9fc415dd
Author: Chen Bin <[email protected]>
Commit: Chen Bin <[email protected]>
fixed: evil-copy-and-comment-operator does not copy in visual-mode
---
.gitignore | 1 +
evil-nerd-commenter-operator.el | 9 ++++++++-
evil-nerd-commenter.el | 4 ++--
pkg.sh | 2 +-
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index 208721001a..b59619e3e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
/.emacs.desktop
/.emacs.desktop.lock
.elc
+deps/
auto-save-list
tramp
.\#*
diff --git a/evil-nerd-commenter-operator.el b/evil-nerd-commenter-operator.el
index 65820bb3a2..24f8ecde80 100644
--- a/evil-nerd-commenter-operator.el
+++ b/evil-nerd-commenter-operator.el
@@ -175,11 +175,17 @@ Or expand the region to contain whole lines if it's not
comment and certain cond
(evil-first-non-blank)))
(evil-define-operator evilnc-copy-and-comment-operator (begin end)
- "Inserts an out commented copy of the text from BEGIN to END."
+ "Inserts a commented copy of the text from BEGIN to END."
:move-point (not evilnc-original-above-comment-when-copy-and-comment)
(interactive "<r>")
(evil-with-single-undo
+ ;; yank original text
(evil-yank-lines begin end nil 'lines)
+
+ (when (evil-visual-state-p)
+ ;; `evil-paste-before' does not work in visual state.
+ (evil-normal-state))
+
(cond
(evilnc-original-above-comment-when-copy-and-comment
(let* ((p (point)))
@@ -187,6 +193,7 @@ Or expand the region to contain whole lines if it's not
comment and certain cond
(goto-char begin)
(evil-paste-before 1)
(goto-char p)))
+
(t
(goto-char end)
(evil-paste-before 1)
diff --git a/evil-nerd-commenter.el b/evil-nerd-commenter.el
index ac487410a6..4bb77eae05 100644
--- a/evil-nerd-commenter.el
+++ b/evil-nerd-commenter.el
@@ -3,7 +3,7 @@
;; Author: Chen Bin <chenbin DOT sh AT gmail.com>
;; URL: http://github.com/redguardtoo/evil-nerd-commenter
-;; Version: 3.5.2
+;; Version: 3.5.3
;; Package-Requires: ((emacs "24.4"))
;; Keywords: convenience evil
;;
@@ -760,7 +760,7 @@ Then we operate the expanded region. NUM is ignored."
(defun evilnc-version ()
"The version number."
(interactive)
- (message "3.5.2"))
+ (message "3.5.3"))
(defvar evil-normal-state-map)
(defvar evil-visual-state-map)
diff --git a/pkg.sh b/pkg.sh
index 6950ef636a..890a7c3b1f 100755
--- a/pkg.sh
+++ b/pkg.sh
@@ -1,6 +1,6 @@
#!/bin/bash
name=evil-nerd-commenter
-version=3.5.2
+version=3.5.3
pkg=$name-$version
mkdir $pkg
cp *.el $pkg
