[nongnu] elpa/evil-nerd-commenter 487e1cdf2b 098/235: fixed: upgrade from melpa may fail v1.5.6

[ELPA Syncer]

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

    fixed: upgrade from melpa may fail v1.5.6
---
 README.org                 |  2 +-
 evil-nerd-commenter-pkg.el |  2 +-
 evil-nerd-commenter.el     | 13 ++++++++++---
 pkg.sh                     |  2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/README.org b/README.org
index c47d493124..f96c2458e0 100644
--- a/README.org
+++ b/README.org
@@ -1,4 +1,4 @@
-* evil-nerd-commenter (v1.5.5)
+* evil-nerd-commenter (v1.5.6)
 
 *This program could be used independently WITHOUT evil-mode!*
 
diff --git a/evil-nerd-commenter-pkg.el b/evil-nerd-commenter-pkg.el
index ba6171c151..881a2240b1 100644
--- a/evil-nerd-commenter-pkg.el
+++ b/evil-nerd-commenter-pkg.el
@@ -1,2 +1,2 @@
-(define-package "evil-nerd-commenter" "1.5.5"
+(define-package "evil-nerd-commenter" "1.5.6"
                 "Comment/uncomment lines efficiently. Like Nerd Commenter in 
Vim")
diff --git a/evil-nerd-commenter.el b/evil-nerd-commenter.el
index 9f3d784470..540b6816f4 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.5
+;; Version: 1.5.6
 ;; Keywords: commenter vim line evil
 ;;
 ;; This file is not part of GNU Emacs.
@@ -494,7 +494,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.5"))
+  (message "1.5.6"))
 
 ;;;###autoload
 (defun evilnc-default-hotkeys ()
@@ -514,9 +514,16 @@ 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
-(eval-after-load 'evil
+(with-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 b19fc02abe..d71143340d 100755
--- a/pkg.sh
+++ b/pkg.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-pkg=evil-nerd-commenter-1.5.5
+pkg=evil-nerd-commenter-1.5.6
 mkdir $pkg
 cp README.org $pkg
 cp *.el $pkg