From 610133b5113c13e7133a42436fe6ed3752b52537 Mon Sep 17 00:00:00 2001
From: Bozhidar Batsov <bozhidar@tradeo.com>
Date: Sat, 29 Jun 2013 15:47:57 +0300
Subject: [PATCH] Remove yasnippets from the list of default packages

Prelude provided just a basic config anyways. Anyone can still install
the package manually and enable it in his/her personal config.
---
 core/prelude-editor.el   | 10 ----------
 core/prelude-packages.el |  2 +-
 init.el                  |  4 ----
 snippets/.gitkeep        |  0
 4 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 snippets/.gitkeep

diff --git a/core/prelude-editor.el b/core/prelude-editor.el
index 345c788..9d45109 100644
--- a/core/prelude-editor.el
+++ b/core/prelude-editor.el
@@ -275,16 +275,6 @@ Will only occur if prelude-whitespace is also enabled."
 (setq bookmark-default-file (expand-file-name "bookmarks" prelude-savefile-dir)
       bookmark-save-flag 1)
 
-;; load yasnippet
-(require 'yasnippet)
-(add-to-list 'yas-snippet-dirs prelude-snippets-dir)
-(add-to-list 'yas-snippet-dirs prelude-personal-snippets-dir)
-(yas-global-mode 1)
-
-;; term-mode does not play well with yasnippet
-(add-hook 'term-mode-hook (lambda ()
-                            (yas-minor-mode -1)))
-
 ;; projectile is a project management mode
 (require 'projectile)
 (setq projectile-cache-file (expand-file-name  "projectile.cache" prelude-savefile-dir))
diff --git a/core/prelude-packages.el b/core/prelude-packages.el
index f6d7d2b..90570eb 100644
--- a/core/prelude-packages.el
+++ b/core/prelude-packages.el
@@ -47,7 +47,7 @@
     guru-mode helm helm-projectile ido-ubiquitous
     key-chord magit melpa rainbow-mode
     smartparens smex solarized-theme undo-tree
-    volatile-highlights yasnippet zenburn-theme)
+    volatile-highlights zenburn-theme)
   "A list of packages to ensure are installed at launch.")
 
 (defun prelude-packages-installed-p ()
diff --git a/init.el b/init.el
index 3b51a51..6a411f1 100644
--- a/init.el
+++ b/init.el
@@ -49,10 +49,6 @@ changes in this directory.  All Emacs Lisp files there are loaded automatically
 by Prelude.")
 (defvar prelude-vendor-dir (expand-file-name "vendor" prelude-dir)
   "This directory houses packages that are not yet available in ELPA (or MELPA).")
-(defvar prelude-snippets-dir (expand-file-name "snippets" prelude-dir)
-  "This folder houses additional yasnippet bundles distributed with Prelude.")
-(defvar prelude-personal-snippets-dir (expand-file-name "snippets" prelude-personal-dir)
-  "This folder houses additional yasnippet bundles added by the users.")
 (defvar prelude-savefile-dir (expand-file-name "savefile" prelude-dir)
   "This folder stores all the automatically generated save/history-files.")
 (defvar prelude-modules-file (expand-file-name "prelude-modules.el" prelude-dir)
diff --git a/snippets/.gitkeep b/snippets/.gitkeep
deleted file mode 100644
index e69de29..0000000