summaryrefslogtreecommitdiffstats
path: root/.emacs.d/init.el
diff options
context:
space:
mode:
Diffstat (limited to '.emacs.d/init.el')
-rw-r--r--.emacs.d/init.el7
1 files changed, 1 insertions, 6 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)