[nongnu] elpa/evil-nerd-commenter 904d9ee2ed 179/235: comment operator should be compatible with evil-matchit

[ELPA Syncer]

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

    comment operator should be compatible with evil-matchit
---
 README.org                      |  2 +-
 evil-nerd-commenter-operator.el | 27 +++++++++++++--------------
 evil-nerd-commenter-sdk.el      |  3 ---
 evil-nerd-commenter.el          |  4 ++--
 pkg.sh                          |  2 +-
 5 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/README.org b/README.org
index 02b0276cfe..ea74b59c3a 100644
--- a/README.org
+++ b/README.org
@@ -1,4 +1,4 @@
-* evil-nerd-commenter (v3.3.3)
+* evil-nerd-commenter (v3.3.4)
 
 
[[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-operator.el b/evil-nerd-commenter-operator.el
index e4737679fe..8c8d056218 100644
--- a/evil-nerd-commenter-operator.el
+++ b/evil-nerd-commenter-operator.el
@@ -64,7 +64,7 @@
         (move-overlay overlay b e)))))
 
 (defadvice evil-apply-on-block (around evil-apply-on-block-around-hack 
activate)
-  "Yank correct region of nner comment text object."
+  "Yank correct region of inner comment text object."
   (let* ((tmp-command last-command))
     ;; force `evil-apply-on-block' use our temporary-goal-column
     (when (> evilnc-temporary-goal-column 0)
@@ -101,18 +101,13 @@
 
           ;; extend the beginning
           (goto-char newbeg)
-          (while (and (>= newbeg (line-beginning-position)) 
(evilnc--in-comment-p newbeg))
+          (while (and (>= (1- newbeg) (line-beginning-position)) 
(evilnc--in-comment-p (1- newbeg)))
             (setq newbeg (1- newbeg)))
 
-          ;; make sure newbeg is at the beginning of the comment
-          (if (< newbeg beg) (setq newbeg (1+ newbeg)))
-
           ;; extend the end
           (goto-char newend)
           (while (and (<= newend (line-end-position)) (evilnc--in-comment-p 
newend))
             (setq newend (1+ newend)))
-          ;; make sure newend is at the end of the comment
-          (if (> newend end) (setq newend (evilnc-get-comment-end newend)))
 
           (list newbeg newend)))
     (list beg end)))
@@ -136,16 +131,20 @@
     (evilnc--comment-or-uncomment-region (1- beg) end))
 
    ((eq type 'line)
-    (evilnc--comment-or-uncomment-region beg (evilnc-get-comment-end end)))
+    ;; comment whole line, for now
+    (evilnc--comment-or-uncomment-region beg
+                                         (save-excursion
+                                           (goto-char (1- end))
+                                           (line-end-position))))
 
    (t
-    (let* ((newpos (evilnc--extend-to-whole-comment beg end) ))
-      (evilnc--comment-or-uncomment-region (nth 0 newpos) (nth 1 newpos)))))
+    (when (and beg end)
+      (let* ((newpos (evilnc--extend-to-whole-comment beg end)))
+        (evilnc--comment-or-uncomment-region (nth 0 newpos) (nth 1 newpos))))))
 
   ;; place cursor on beginning of line
-  (if (and (called-interactively-p 'any)
-           (eq type 'line))
-    (evil-first-non-blank)))
+  (if (and (called-interactively-p 'any) (eq type 'line))
+      (evil-first-non-blank)))
 
 (evil-define-operator evilnc-copy-and-comment-operator (beg end)
   "Inserts an out commented copy of the text from BEG to END."
@@ -216,7 +215,7 @@
     rlt))
 
 (defun evilnc-adjusted-comment-end (b e)
-  "Ajust comment end of region between B and E."
+  "Adjust comment end of region between B and E."
   (let* ((next-end-char (evilnc-get-char (- e 2)))
          (end-char (evilnc-get-char (- e 1))))
     ;; avoid selecting CR/LF at the end of comment
diff --git a/evil-nerd-commenter-sdk.el b/evil-nerd-commenter-sdk.el
index 1e85513be9..cc744cff1d 100644
--- a/evil-nerd-commenter-sdk.el
+++ b/evil-nerd-commenter-sdk.el
@@ -62,9 +62,6 @@
   "Character at POS is line end."
   (member (evilnc-get-char pos) '(10 11)))
 
-(defun evilnc-get-comment-end (end)
-  (if (= end (point-max)) end (1- end)))
-
 (defun evilnc-is-comment (pos)
   "Check whether the code at POS is comment by comparing font face.
 Please note the white spaces out of comment is treated as comment,
diff --git a/evil-nerd-commenter.el b/evil-nerd-commenter.el
index 09f792bbe6..abd3df3681 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.3.3
+;; Version: 3.3.4
 ;; Package-Requires: ((emacs "24.4"))
 ;; Keywords: commenter vim line evil
 ;;
@@ -700,7 +700,7 @@ Then we operate the expanded region.  NUM is ignored."
 (defun evilnc-version ()
   "The version number."
   (interactive)
-  (message "3.3.3"))
+  (message "3.3.4"))
 
 (defvar evil-normal-state-map)
 (defvar evil-visual-state-map)
diff --git a/pkg.sh b/pkg.sh
index 61eda08a7f..6e1f94b51c 100755
--- a/pkg.sh
+++ b/pkg.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 name=evil-nerd-commenter
-version=3.3.3
+version=3.3.4
 pkg=$name-$version
 mkdir $pkg
 cp *.el $pkg