From 401a913402631b94b25e7a92c314d7bd3a464d18 Mon Sep 17 00:00:00 2001
From: Bozhidar Batsov <bozhidar@empowerunited.com>
Date: Tue, 14 Feb 2012 13:08:53 +0200
Subject: [PATCH] fixed #60 - removed el-get due to Windows related problems it
was causing
---
init.el | 1 -
modules/prelude-editor.el | 4 --
modules/prelude-el-get.el | 59 ---------------------------
modules/prelude-global-keybindings.el | 2 +
modules/prelude-packages.el | 2 +-
modules/prelude-ruby.el | 3 --
6 files changed, 3 insertions(+), 68 deletions(-)
delete mode 100644 modules/prelude-el-get.el
diff --git a/init.el b/init.el
index 9446b0d..c6fba20 100644
--- a/init.el
+++ b/init.el
@@ -63,7 +63,6 @@ by Prelude.")
;; the core stuff
(require 'prelude-packages)
-(require 'prelude-el-get)
(require 'prelude-ui)
(require 'prelude-core)
(require 'prelude-editor)
diff --git a/modules/prelude-editor.el b/modules/prelude-editor.el
index 8033e51..ff5a165 100644
--- a/modules/prelude-editor.el
+++ b/modules/prelude-editor.el
@@ -165,10 +165,6 @@
;; enabled auto-fill mode in text-mode and all related modes
(add-hook 'text-mode-hook 'turn-on-auto-fill)
-;; load yasnippet
-(require 'yasnippet)
-(yas/initialize)
-
;; projectile is a project management mode
(require 'projectile)
(projectile-global-mode t)
diff --git a/modules/prelude-el-get.el b/modules/prelude-el-get.el
deleted file mode 100644
index c45ce49..0000000
--- a/modules/prelude-el-get.el
+++ /dev/null
@@ -1,59 +0,0 @@
-(add-to-list 'load-path (concat prelude-dir "el-get/el-get"))
-(setq el-get-dir (concat prelude-dir "el-get/"))
-
-(unless (require 'el-get nil t)
- (with-current-buffer
- (url-retrieve-synchronously
- "https://raw.github.com/dimitri/el-get/master/el-get-install.el")
- (end-of-buffer)
- (eval-print-last-sexp)))
-
-(setq el-get-sources
- '((:name magit
- :after (lambda ()
- (global-set-key (kbd "C-x g") 'magit-status)))
- (:name yasnippet
- :website "http://code.google.com/p/yasnippet/"
- :description "YASnippet is a template system for Emacs."
- :type git
- :url "https://github.com/capitaomorte/yasnippet.git"
- :features "yasnippet"
- :prepare (lambda ()
- ;; Set up the default snippets directory
- ;;
- ;; Principle: don't override any user settings
- ;; for yas/snippet-dirs, whether those were made
- ;; with setq or customize. If the user doesn't
- ;; want the default snippets, she shouldn't get
- ;; them!
- (unless (or (boundp 'yas/snippet-dirs) (get 'yas/snippet-dirs 'customized-value))
- (setq yas/snippet-dirs
- (list (concat el-get-dir (file-name-as-directory "yasnippet") "snippets")))))
-
- :post-init (lambda ()
- ;; Trick customize into believing the standard
- ;; value includes the default snippets.
- ;; yasnippet would probably do this itself,
- ;; except that it doesn't include an
- ;; installation procedure that sets up the
- ;; snippets directory, and thus doesn't know
- ;; where those snippets will be installed. See
- ;; http://code.google.com/p/yasnippet/issues/detail?id=179
- (put 'yas/snippet-dirs 'standard-value
- ;; as cus-edit.el specifies, "a cons-cell
- ;; whose car evaluates to the standard
- ;; value"
- (list (list 'quote
- (list (concat el-get-dir (file-name-as-directory "yasnippet") "snippets"))))))
- ;; byte-compile load vc-svn and that fails
- ;; see https://github.com/dimitri/el-get/issues/200
- :compile nil)))
-
-(setq prelude-packages
- (append
- '()
- (mapcar 'el-get-source-name el-get-sources)))
-
-(el-get 'sync prelude-packages)
-
-(provide 'prelude-el-get)
diff --git a/modules/prelude-global-keybindings.el b/modules/prelude-global-keybindings.el
index d1f84af..3e8df4e 100644
--- a/modules/prelude-global-keybindings.el
+++ b/modules/prelude-global-keybindings.el
@@ -141,6 +141,8 @@
(interactive)
(message "Arrow key navigation is disabled. Use C-f instead.")))
+(global-set-key (kbd "C-x g") 'magit-status)
+
(provide 'prelude-global-keybindings)
;;; prelude-global-keybindings.el ends here
diff --git a/modules/prelude-packages.el b/modules/prelude-packages.el
index 58991e8..2367c19 100644
--- a/modules/prelude-packages.el
+++ b/modules/prelude-packages.el
@@ -40,7 +40,7 @@
(defvar prelude-packages
'(auctex clojure-mode coffee-mode deft full-ack gist groovy-mode haml-mode
- haskell-mode inf-ruby markdown-mode paredit projectile
+ haskell-mode inf-ruby magit markdown-mode paredit projectile
python sass-mode rainbow-mode scss-mode solarized-theme
yaml-mode yari zenburn-theme)
"A list of packages to ensure are installed at launch.")
diff --git a/modules/prelude-ruby.el b/modules/prelude-ruby.el
index 9abac61..ac2d763 100644
--- a/modules/prelude-ruby.el
+++ b/modules/prelude-ruby.el
@@ -88,9 +88,6 @@
(require 'feature-mode)
(add-to-list 'auto-mode-alist '("\.feature$" . feature-mode))
-;; load bundle snippets
-(yas/load-directory (concat prelude-vendor-dir "feature-mode/snippets"))
-
(provide 'prelude-ruby)
;;; prelude-ruby.el ends here