[nongnu] elpa/evil-nerd-commenter 789a180160 100/235: FIXED: revert work on with-eval-after-load v1.5.8

[ELPA Syncer]

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

    FIXED: revert work on with-eval-after-load v1.5.8
---
 README.org                 |  2 +-
 evil-nerd-commenter-pkg.el |  2 +-
 evil-nerd-commenter.el     | 13 +++----------
 pkg.sh                     |  2 +-
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/README.org b/README.org
index 786dcdf0cc..633a9b12bd 100644
--- a/README.org
+++ b/README.org
@@ -1,4 +1,4 @@
-* evil-nerd-commenter (v1.5.7)
+* evil-nerd-commenter (v1.5.8)
 
 *This program could be used independently WITHOUT evil-mode!*
 
diff --git a/evil-nerd-commenter-pkg.el b/evil-nerd-commenter-pkg.el
index d2440179c4..d9a6412211 100644
--- a/evil-nerd-commenter-pkg.el
+++ b/evil-nerd-commenter-pkg.el
@@ -1,2 +1,2 @@
-(define-package "evil-nerd-commenter" "1.5.7"
+(define-package "evil-nerd-commenter" "1.5.8"
                 "Comment/uncomment lines efficiently. Like Nerd Commenter in 
Vim")
diff --git a/evil-nerd-commenter.el b/evil-nerd-commenter.el
index 1be7ed03fa..1b1439c8cc 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: 1.5.7
+;; Version: 1.5.8
 ;; Keywords: commenter vim line evil
 ;;
 ;; This file is not part of GNU Emacs.
@@ -499,7 +499,7 @@ or 'C-u 3 M-x 
evilnc-quick-comment-or-uncomment-to-the-line' to comment to the l
 ;;;###autoload
 (defun evilnc-version ()
   (interactive)
-  (message "1.5.7"))
+  (message "1.5.8"))
 
 ;;;###autoload
 (defun evilnc-default-hotkeys ()
@@ -519,16 +519,9 @@ or 'C-u 3 M-x 
evilnc-quick-comment-or-uncomment-to-the-line' to comment to the l
        (define-key evil-normal-state-map ",cr" 'comment-or-uncomment-region)
        (define-key evil-normal-state-map ",cv" 
'evilnc-toggle-invert-comment-line-by-line))))
 
-;; workaround issue 
https://github.com/redguardtoo/evil-nerd-commenter/issues/36
-;; shamelessly copied from 
http://www.lunaryorn.com/2013/06/25/introducing-with-eval-after-load.html
-(unless (fboundp 'with-eval-after-load)
-  (defmacro with-eval-after-load (file &rest body)
-    `(eval-after-load ,file
-       `(funcall (function ,(lambda () ,@body))))))
-
 ;; Attempt to define the operator on first load.
 ;; Will only work if evil has been loaded
-(with-eval-after-load 'evil
+(eval-after-load 'evil
   '(progn
      (evil-define-operator evilnc-comment-operator (beg end type register 
yank-handler)
        "Comments text from BEG to END with TYPE.
diff --git a/pkg.sh b/pkg.sh
index e596f313a5..978bb984a9 100755
--- a/pkg.sh
+++ b/pkg.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-pkg=evil-nerd-commenter-1.5.7
+pkg=evil-nerd-commenter-1.5.8
 mkdir $pkg
 cp README.org $pkg
 cp *.el $pkg