diff options
| author |  Tom Willemse | 2014-04-16 00:11:38 +0200 |
|---|---|---|
| committer | Tom Willemse | 2014-04-16 00:20:00 +0200 |
| commit | 6e7e0bf5a9015836036c71a7315171b6c5c65645 (patch) | |
| tree | e2a8e139695992514a19834d8ed7a881d3ef6a1b | |
| parent | 0145f79d4879c1a45e831f3ce4a291db0166ff07 (diff) | |
| download | emacs-6e7e0bf5a9015836036c71a7315171b6c5c65645.tar.gz emacs-6e7e0bf5a9015836036c71a7315171b6c5c65645.zip | |
Use global yasnippet instead of local minor modes
| -rw-r--r-- | .emacs.d/init.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 778c2fb..40f7f2e 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1290,7 +1290,6 @@ from myaethon2.core.decorators import ( (add-hook 'diary-display-hook 'oni:diary-display-func) (add-hook 'git-commit-mode-hook #'oni:set-ispell-local-en-dict) (add-hook 'haskell-mode-hook 'oni:haskell-mode-func) -(add-hook 'org-mode-hook #'yas-minor-mode) (add-hook 'js-mode-hook #'moz-minor-mode) (add-hook 'outline-minor-mode-hook #'oni:set-tab-maybe-toggle-outline) (add-hook 'slime-mode-hook #'set-up-slime-ac) @@ -1298,7 +1297,7 @@ from myaethon2.core.decorators import ( (add-hook 'term-mode-hook 'oni:term-mode-func) (add-hook 'vala-mode-hook #'oni:vala-mode-func) (add-hook 'write-file-hooks 'oni:write-file-func) -(add-hook 'yas-minor-mode-hook 'oni:yas-minor-mode-func) +(add-hook 'yas-global-mode-hook 'oni:yas-minor-mode-func) (add-hook 'scheme-mode-hook (lambda () (setq ac-sources '(ac-source-geiser)))) (oni:add-function-to-hooks #'flycheck-mode @@ -1333,8 +1332,8 @@ from myaethon2.core.decorators import ( #'oni:go-mode-func #'flycheck-mode) (oni:add-hooks 'html-mode-hook - #'flycheck-mode #'yas-minor-mode #'oni:maybe-fci-mode #'tagedit-mode - #'turn-off-flyspell #'turn-off-auto-fill) + #'flycheck-mode #'oni:maybe-fci-mode #'tagedit-mode #'turn-off-flyspell + #'turn-off-auto-fill) (oni:add-hooks 'hy-mode-hook #'paredit-mode #'oni:set-keys-for-hy) @@ -1363,8 +1362,8 @@ from myaethon2.core.decorators import ( #'oni:php-mode-func #'flycheck-mode) (oni:add-hooks 'prog-mode-hook - #'oni:prog-mode-func #'yas-minor-mode #'oni:maybe-fci-mode - #'rainbow-delimiters-mode #'oni:maybe-prettify-symbols-mode) + #'oni:prog-mode-func #'oni:maybe-fci-mode #'rainbow-delimiters-mode + #'oni:maybe-prettify-symbols-mode) (oni:add-hooks 'python-mode-hook (lambda () (setq ac-sources '(ac-source-jedi-direct))) @@ -1461,7 +1460,8 @@ from myaethon2.core.decorators import ( (mode-icons-mode) (desktop-registry-auto-register) (global-transient-navigation-mode) - (global-discover-mode)) + (global-discover-mode) + (yas-global-mode)) (when (equal system-name "drd") (load "eap-autoloads")) |