emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Clean up

Browse source
This commit is contained in:
Henrik Lissner 2015-03-18 03:18:07 -04:00
parent 0f12885152
commit 71dd98e7d4
3 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
init/init-java.el
View file

@ -1,12 +1,11 @@
(use-package eclim (use-package eclim
:commands (eclim-mode global-eclim-mode) :commands (eclim-mode global-eclim-mode)
:init :config
(progn (progn
(setq eclim-eclipse-dirs '("/Applications/eclipse") (setq eclim-eclipse-dirs '("/Applications/eclipse")
eclim-executable "/Applications/eclipse/eclim") eclim-executable "/Applications/eclipse/eclim")
(add-hook 'java-mode-hook 'eclim-mode)) (add-hook 'java-mode-hook 'eclim-mode)
:config
(progn
;; (use-package eclim-ant) ;; (use-package eclim-ant)
;; (use-package eclim-maven) ;; (use-package eclim-maven)
(use-package eclim-problems) (use-package eclim-problems)

4
init/init-python.el
View file

@ -60,10 +60,6 @@
(not (use-region-p)) (not (use-region-p))
(not (sp-point-in-string-or-comment)))))) (not (sp-point-in-string-or-comment))))))
(after "auto-complete"
(use-package ac-anaconda
:init (add-hook 'python-mode-hook 'ac-anaconda-setup)))
(after "company" (after "company"
(use-package company-anaconda (use-package company-anaconda
:config (company--backend-on 'python-mode-hook 'company-anaconda))))) :config (company--backend-on 'python-mode-hook 'company-anaconda)))))

19
init/init-yasnippet.el
View file

@ -1,22 +1,23 @@
(use-package yasnippet (use-package yasnippet
:mode (("emacs\\.d/snippets/.+$" . snippet-mode)) :mode (("emacs\\.d/snippets/.+$" . snippet-mode))
:init :init
(defvar yas-minor-mode-map (progn
(defvar yas-minor-mode-map
;; Fix yasnippet keymaps so they only work in insert mode ;; Fix yasnippet keymaps so they only work in insert mode
(let ((map (make-sparse-keymap))) (let ((map (make-sparse-keymap)))
(bind 'insert map [(tab)] 'yas-expand) (bind 'insert map [(tab)] 'yas-expand)
(bind 'insert map (kbd "TAB") 'yas-expand) (bind 'insert map (kbd "TAB") 'yas-expand)
(bind 'visual map (kbd "<backtab>") 'yas-insert-snippet) (bind 'visual map (kbd "<backtab>") 'yas-insert-snippet)
map)) map))
:config
(progn
(add-hook 'snippet-mode-hook 'disable-final-newline) (add-hook 'snippet-mode-hook 'disable-final-newline)
(add-hook 'snippet-mode-hook 'yas-minor-mode) (add-hook 'snippet-mode-hook 'yas-minor-mode)
(add-hook 'text-mode-hook 'yas-minor-mode) (add-hook 'text-mode-hook 'yas-minor-mode)
(add-hook 'prog-mode-hook 'yas-minor-mode) (add-hook 'prog-mode-hook 'yas-minor-mode)
;; (add-hook 'markdown-mode-hook 'yas-minor-mode) ;; (add-hook 'markdown-mode-hook 'yas-minor-mode)
(add-hook 'org-mode-hook 'yas-minor-mode) (add-hook 'org-mode-hook 'yas-minor-mode))
:config
(progn
(setq yas-verbosity 0) (setq yas-verbosity 0)
(setq yas-indent-line 'auto) (setq yas-indent-line 'auto)
(setq yas-also-auto-indent-first-line t) (setq yas-also-auto-indent-first-line t)