Fixes #40 and #53 Move evil-nerd-commenter to extensions

Work-around a current bug in evil-nc with 24.4 byte-compilation
This commit is contained in:
syl20bnr 2014-10-30 22:48:57 -04:00
parent 4e7762daba
commit c82fe7f1d6
4 changed files with 18 additions and 15 deletions

3
.gitmodules vendored
View file

@ -42,3 +42,6 @@
[submodule "contrib/syl20bnr/extensions/o-blog"] [submodule "contrib/syl20bnr/extensions/o-blog"]
path = contrib/syl20bnr/extensions/o-blog path = contrib/syl20bnr/extensions/o-blog
url = https://github.com/renard/o-blog.git 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

View file

@ -13,6 +13,7 @@
centered-cursor centered-cursor
dos dos
emoji-cheat-sheet emoji-cheat-sheet
evil-nerd-commenter
evil-org-mode evil-org-mode
evil-plugins evil-plugins
helm-rcirc helm-rcirc
@ -51,6 +52,19 @@
(use-package emoji-cheat-sheet (use-package emoji-cheat-sheet
:commands 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 () (defun spacemacs/init-evil-org-mode ()
(use-package evil-org (use-package evil-org
:commands evil-org-mode :commands evil-org-mode

@ -0,0 +1 @@
Subproject commit c54cee2648f6b2b2bbcf5856acebde3b4a20eddb

View file

@ -34,7 +34,6 @@
evil-surround evil-surround
evil-terminal-cursor-changer evil-terminal-cursor-changer
evil-visualstar evil-visualstar
evil-nerd-commenter
exec-path-from-shell exec-path-from-shell
expand-region expand-region
fill-column-indicator fill-column-indicator
@ -364,20 +363,6 @@ DELETE-FUNC when calling CALLBACK.
;; load surround ;; load surround
(use-package evil-surround (use-package evil-surround
:init (global-evil-surround-mode 1)) :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 ;; load evil-exchange
(use-package evil-exchange (use-package evil-exchange
:init (evil-exchange-install)) :init (evil-exchange-install))