From c8b34bbdad15a4153f87d4b6df324fe34b1c8a37 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Mon, 17 Dec 2012 12:11:03 +0100
Subject: 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.
---
 .emacs.d/site-lisp/oni.el | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to '.emacs.d/site-lisp/oni.el')

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"
-- 
cgit v1.2.3-54-g00ecf