From 313aecb0e97b9e8e1f5bde813a5a573de108212e Mon Sep 17 00:00:00 2001
From: Correl Roush <croush@coredial.com>
Date: Fri, 24 Apr 2015 10:23:04 -0400
Subject: [PATCH] [emacs] Add yasnippet

---
 .emacs.d/emacs.org | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/.emacs.d/emacs.org b/.emacs.d/emacs.org
index 64cdd36..a59ccda 100644
--- a/.emacs.d/emacs.org
+++ b/.emacs.d/emacs.org
@@ -23,12 +23,14 @@
 ** Autocomplete
 #+name: autocomplete
 #+BEGIN_SRC emacs-lisp
-  (use-package auto-complete
-    :ensure t
-    :config
-    (progn (global-auto-complete-mode t)
-           (require 'auto-complete-config)
-           (ac-config-default)))
+    (use-package auto-complete
+      :ensure t
+      :config
+      (progn (global-auto-complete-mode t)
+             (require 'auto-complete-config)
+             (ac-config-default)
+             (ac-set-trigger-key "TAB")
+             (ac-set-trigger-key "<tab>")))
 #+END_SRC
 ** Helm
 #+name: packages
@@ -383,6 +385,14 @@ breaks.
                unfill-region)
     :bind ("M-Q" . unfill-paragraph))
 #+END_SRC
+** Yasnippet
+#+name: packages
+#+BEGIN_SRC emacs-lisp
+  (use-package yasnippet
+    :ensure t
+    :diminish yas-minor-mode
+    :config (yas-global-mode 1))
+#+END_SRC
 * LaTeX
 ** AUCTeX
 #+name: packages
@@ -746,9 +756,9 @@ this org file.
 
   <<startup>>
   <<look-and-feel>>
-  <<autocomplete>>
   <<packages>>
   <<programming>>
+  <<autocomplete>>
   <<other>>
   <<auto-load>>
   <<custom-settings>>