Skip to content

Commit

Permalink
Fixes #40 and #53 Move evil-nerd-commenter to extensions
Browse files Browse the repository at this point in the history
Work-around a current bug in evil-nc with 24.4 byte-compilation
  • Loading branch information
syl20bnr committed Nov 4, 2014
1 parent 4e7762d commit c82fe7f
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 15 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,6 @@
[submodule "contrib/syl20bnr/extensions/o-blog"]
path = contrib/syl20bnr/extensions/o-blog
url = https://github.com/renard/o-blog.git
[submodule "spacemacs/extensions/evil-nerd-commenter"]
path = spacemacs/extensions/evil-nerd-commenter
url = https://github.com/redguardtoo/evil-nerd-commenter
14 changes: 14 additions & 0 deletions spacemacs/extensions.el
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
centered-cursor
dos
emoji-cheat-sheet
evil-nerd-commenter
evil-org-mode
evil-plugins
helm-rcirc
Expand Down Expand Up @@ -51,6 +52,19 @@
(use-package emoji-cheat-sheet
:commands emoji-cheat-sheet))

(defun spacemacs/init-evil-nerd-commenter ()
(use-package evil-nerd-commenter
:init
(progn
(evil-leader/set-key
"ncl" 'evilnc-comment-or-uncomment-lines
"nct" 'evilnc-quick-comment-or-uncomment-to-the-line
"ncy" 'evilnc-copy-and-comment-lines
"ncp" 'evilnc-comment-or-uncomment-paragraphs
"ncr" 'comment-or-uncomment-region
"nci" 'evilnc-toggle-invert-comment-line-by-line
"ncc" 'evilnc-comment-operator))))

(defun spacemacs/init-evil-org-mode ()
(use-package evil-org
:commands evil-org-mode
Expand Down
1 change: 1 addition & 0 deletions spacemacs/extensions/evil-nerd-commenter
Submodule evil-nerd-commenter added at c54cee
15 changes: 0 additions & 15 deletions spacemacs/packages.el
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
evil-surround
evil-terminal-cursor-changer
evil-visualstar
evil-nerd-commenter
exec-path-from-shell
expand-region
fill-column-indicator
Expand Down Expand Up @@ -364,20 +363,6 @@ DELETE-FUNC when calling CALLBACK.
;; load surround
(use-package evil-surround
:init (global-evil-surround-mode 1))
;; load nerd-commenter
(if (version< emacs-version "24.4")
(use-package evil-nerd-commenter
:init
(progn
(evil-leader/set-key
"ncl" 'evilnc-comment-or-uncomment-lines
"nct" 'evilnc-quick-comment-or-uncomment-to-the-line
"ncy" 'evilnc-copy-and-comment-lines
"ncp" 'evilnc-comment-or-uncomment-paragraphs
"ncr" 'comment-or-uncomment-region
"nci" 'evilnc-toggle-invert-comment-line-by-line
"ncc" 'evilnc-comment-operator
))))
;; load evil-exchange
(use-package evil-exchange
:init (evil-exchange-install))
Expand Down

0 comments on commit c82fe7f

Please sign in to comment.