From 1eb19ac1ada394a758d3ccc2ec3366caf59c8181 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Sat, 19 Dec 2015 00:22:45 +0100
Subject: Add yasnippet library

---
 emacs/.emacs.d/init.el | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'emacs/.emacs.d/init.el')

diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index edb4c22..7668a38 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -141,16 +141,6 @@ MODE1 is enabled and vice-versa."
   "Set the `disabled' property for each item in FUNCTIONS to nil."
   (mapc #'(lambda (f) (put f 'disabled nil)) functions))
 
-(defun oni:write-file-func ()
-  "Function for `write-file-hooks'."
-  (time-stamp))
-
-(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 (kbd "C-\\") 'yas-expand))
-
 (defun oni:outline-toggle-entry ()
   (interactive)
   (if (outline-on-heading-p)
@@ -559,8 +549,11 @@ MODE1 is enabled and vice-versa."
 ;; Don't use tabs in vala-mode
 (add-hook 'vala-mode-hook 'oni:disable-tabs-mode)
 
-(add-hook 'write-file-hooks 'oni:write-file-func)
-(add-hook 'yas-global-mode-hook 'oni:yas-minor-mode-func)
+;; Update timestamps before writing a file.
+(add-hook 'write-file-hooks 'time-stamp)
+
+;; Set yasnippet-specific keybindings.
+(add-hook 'yas-global-mode-hook 'oni:set-keys-for-yasnippet)
 
 ;; Disable line truncation in ERT results.
 (add-hook 'ert-results-mode-hook 'oni:disable-line-truncation)
-- 
cgit v1.2.3-54-g00ecf