jt/emacs-prelude
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed #60 - removed el-get due to Windows related problems it was causing

Browse source
This commit is contained in:
Bozhidar Batsov 2012-02-14 13:08:53 +02:00
parent 0909522341
commit 401a913402
6 changed files with 3 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
init.el
View file

@ -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)

4
modules/prelude-editor.el
View file

@ -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)

59
modules/prelude-el-get.el
View file

@ -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)

2
modules/prelude-global-keybindings.el
View file

@ -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

2
modules/prelude-packages.el
View file

@ -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.")

3
modules/prelude-ruby.el
View file

@ -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