diff options
| author |  Tom Willemsen | 2012-12-17 12:11:03 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2012-12-17 12:11:03 +0100 |
| commit | c8b34bbdad15a4153f87d4b6df324fe34b1c8a37 (patch) | |
| tree | 429d33bb50c03e076b53bd7428c62b2232e1315c | |
| parent | 36541fa5126a909ebb4517c514e8d7001ed21020 (diff) | |
| download | dotfiles-c8b34bbdad15a4153f87d4b6df324fe34b1c8a37.tar.gz dotfiles-c8b34bbdad15a4153f87d4b6df324fe34b1c8a37.zip | |
Remove oni:load-hippie-exp
Placing `yas/hippie-try-expand' at the end of the
`hippie-expand-try-functions-list' doesn't seem to work very well and
putting it in the front might cause situations where I want to expand
a variable name or something and yas might take over, so don't use yas
with hippie-expand. Instead bind `yas-expand' to `C-\' and set
`yas-fallback-behavior' to nil so it doesn't start acting crazy when
there's no snippet to expand.
| -rw-r--r-- | .emacs.d/init.el | 7 | ||||
| -rw-r--r-- | .emacs.d/site-lisp/oni.el | 10 |
2 files changed, 3 insertions, 14 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 61f14d7..3e74568 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -104,9 +104,6 @@ 'flymake-allowed-file-name-masks ; flymaking 'easy'. '("\\.go$" flymake-simple-make-init)))) -(eval-after-load "hippie-exp" - '(oni:load-hippie-exp 'yasnippet)) - (eval-after-load "ido" '(setq ido-ignore-buffers `(,@ido-ignore-buffers "^\\*.*\\*$" "^irc\\." "^\\#"))) @@ -125,9 +122,6 @@ (global-set-key (kbd "M-x") 'smex) (global-set-key (kbd "C-M-x") 'smex-major-mode-commands))) -(eval-after-load "yasnippet" - '(oni:load-hippie-exp 'hippie-exp)) - (put 'upcase-region 'disabled nil) (put 'downcase-region 'disabled nil) (put 'narrow-to-region 'disabled nil) @@ -298,6 +292,7 @@ (setq user-mail-address "tom@ryuslash.org") (setq w3m-fill-column 72) (setq window-combination-resize t) +(setq yas-fallback-behavior nil) (setq yas-prompt-functions '(yas-ido-prompt)) (add-hook 'after-change-major-mode-hook 'set-current-mode-icon) diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index f636587..8930d6d 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -287,13 +287,6 @@ If COUNT has been specified indent by that much, otherwise look at (kill-region (region-beginning) (region-end)) (kill-line))) -(defun oni:load-hippie-exp (other) - "Make sure both hippie-expand and yasnippet are loaded in order - to add yasnippet's expand function to hippie-expand." - (require other) - (add-to-list 'hippie-expand-try-functions-list - 'yas/hippie-try-expand t)) - (defun oni:lua-mode-func() "Function for `lua-mode-hook'." (local-unset-key (kbd ")")) @@ -626,7 +619,8 @@ for easy selection." (defun oni:yas-minor-mode-func () "Function for `yas-minor-mode-hook'." (define-key yas-minor-mode-map (kbd "TAB") nil) - (define-key yas-minor-mode-map [(tab)] nil)) + (define-key yas-minor-mode-map [(tab)] nil) + (define-key yas-minor-mode-map (kbd "C-\\") 'yas-expand)) (define-skeleton html-tag "Testing creation of an html tag" |