[nongnu] elpa/evil-nerd-commenter 76fd0c5692 160/235: go to original column after copy and comment

[ELPA Syncer]

branch: elpa/evil-nerd-commenter
commit 76fd0c5692e9852a2d6fc6c0ce0e782792c28ddd
Author: Chen Bin <chenbin.sh@gmail.com>
Commit: Chen Bin <chenbin.sh@gmail.com>

    go to original column after copy and comment
---
 README.org             |  2 +-
 evil-nerd-commenter.el | 47 ++++++++++++++++++++++++++---------------------
 pkg.sh                 |  2 +-
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/README.org b/README.org
index b96bb78f26..1454fb347a 100644
--- a/README.org
+++ b/README.org
@@ -1,4 +1,4 @@
-* evil-nerd-commenter (v3.1.1)
+* evil-nerd-commenter (v3.1.2)
 
 
[[http://melpa.org/#/evil-nerd-commenter][file:http://melpa.org/packages/evil-nerd-commenter-badge.svg]]
 
[[http://stable.melpa.org/#/evil-nerd-commenter][file:http://stable.melpa.org/packages/evil-nerd-commenter-badge.svg]]
 
diff --git a/evil-nerd-commenter.el b/evil-nerd-commenter.el
index 433dd8ad29..c50d0fb164 100644
--- a/evil-nerd-commenter.el
+++ b/evil-nerd-commenter.el
@@ -4,7 +4,7 @@
 
 ;; Author: Chen Bin <chenbin.sh@gmail.com>
 ;; URL: http://github.com/redguardtoo/evil-nerd-commenter
-;; Version: 3.1.1
+;; Version: 3.1.2
 ;; Keywords: commenter vim line evil
 ;;
 ;; This file is not part of GNU Emacs.
@@ -109,8 +109,7 @@
 (autoload 'count-lines "simple")
 
 (defvar evilnc-original-above-comment-when-copy-and-comment nil
-  "Original text is above commented out when using 
`evilnc-copy-and-comment-lines'
- and `evilnc-copy-and-comment-operator'.")
+  "Original text is abovl commentn using `evilnc-copy-and-comment-lines'and 
`evilnc-copy-and-comment-operator'.")
 
 (defvar evilnc-invert-comment-line-by-line nil
   "If t then invert region comment status line by line.
@@ -356,6 +355,7 @@ Code snippets embedded in Org-mode is identified and right 
`major-mode' is used.
 (defvar web-mode-engine)
 
 (defun evilnc--warn-on-web-mode (is-comment)
+  "Check certain part of html code IS-COMMENT."
   (let* ((comment-operation (concat "web-mode-"
                                     (if is-comment "comment-" "uncomment-")
                                     web-mode-engine
@@ -605,23 +605,28 @@ Then we operate the expanded region.  NUM is ignored."
     (forward-line (1+ num))
     (setq num (- 0 num)))
 
-  (evilnc--operation-on-lines-or-region
-   '(lambda (beg end)
-      (evilnc--fix-buggy-major-modes)
-      (let* ((str (buffer-substring-no-properties beg end)))
-        (cond
-         (evilnc-original-above-comment-when-copy-and-comment
-          (let* ((p (point)))
-            (comment-region beg end)
-            (goto-char beg)
-            (insert-before-markers (concat str "\n"))
-            (goto-char p)))
-         (t
-          (goto-char end)
-          (newline 1)
-          (insert-before-markers str)
-          (comment-region beg end)))))
-   num))
+  (let* ((original-column (current-column)))
+    (evilnc--operation-on-lines-or-region
+     '(lambda (beg end)
+        (evilnc--fix-buggy-major-modes)
+        (let* ((str (buffer-substring-no-properties beg end)))
+          (cond
+           (evilnc-original-above-comment-when-copy-and-comment
+            (let* ((p (point)))
+              (comment-region beg end)
+              (goto-char beg)
+              (insert-before-markers (concat str "\n"))
+              (goto-char p)))
+           (t
+            (goto-char end)
+            (newline 1)
+            (insert-before-markers str)
+            (comment-region beg end)))))
+     num)
+    ;; Go to original column after evilnc-copy-and-comment-lines
+    ;; @see https://github.com/redguardtoo/evil-nerd-commenter/issues/79
+    ;; Thanks for Kevin Brubeck (AKA unhammer) for idea/implementation
+    (move-to-column original-column)))
 
 ;;;###autoload
 (defun evilnc-comment-and-kill-ring-save (&optional num)
@@ -685,7 +690,7 @@ Then we operate the expanded region.  NUM is ignored."
 (defun evilnc-version ()
   "The version number."
   (interactive)
-  (message "3.1.1"))
+  (message "3.1.2"))
 
 (defvar evil-normal-state-map)
 (defvar evil-visual-state-map)
diff --git a/pkg.sh b/pkg.sh
index 506c880f58..31ffc71ba5 100755
--- a/pkg.sh
+++ b/pkg.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 name=evil-nerd-commenter
-version=3.1.1
+version=3.1.2
 pkg=$name-$version
 mkdir $pkg
 cp *.el $pkg