summaryrefslogtreecommitdiffstats
path: root/.emacs.d/site-lisp/oni.el
diff options
context:
space:
mode:
Diffstat (limited to '.emacs.d/site-lisp/oni.el')
-rw-r--r--.emacs.d/site-lisp/oni.el10
1 files changed, 2 insertions, 8 deletions
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"