Don't use dash.el during package init

This commit is contained in:
Bozhidar Batsov 2013-04-25 15:13:52 +03:00
parent cd2781fd78
commit 73b713a850
5 changed files with 22 additions and 943 deletions

View file

@ -33,6 +33,7 @@
;;; Code:
(require 'thingatpt)
(require 'dash)
(defun prelude-open-with ()
"Open visited file in external program."

View file

@ -32,6 +32,7 @@
;; Boston, MA 02110-1301, USA.
;;; Code:
(require 'cl-lib)
(require 'package)
(add-to-list 'package-archives
'("melpa" . "http://melpa.milkbox.net/packages/") t)
@ -40,7 +41,7 @@
(package-initialize)
(defvar prelude-packages
'(ace-jump-mode ack-and-a-half diminish elisp-slime-nav
'(ace-jump-mode ack-and-a-half dash diminish elisp-slime-nav
expand-region flycheck gist
git-commit-mode gitconfig-mode gitignore-mode
guru-mode helm helm-projectile
@ -50,22 +51,25 @@
"A list of packages to ensure are installed at launch.")
(defun prelude-packages-installed-p ()
(-all? #'package-installed-p prelude-packages))
"Check if all packages in `prelude-packages' are installed."
(cl-every #'package-installed-p prelude-packages))
(defun prelude-install-packages ()
"Install all packages listed in `prelude-packages'."
(unless (prelude-packages-installed-p)
;; check for new packages (package versions)
(message "%s" "Emacs Prelude is now refreshing its package database...")
(package-refresh-contents)
(message "%s" " done.")
;; install the missing packages
(-each
(-reject #'package-installed-p prelude-packages)
#'package-install)))
(mapc #'package-install
(cl-remove-if #'package-installed-p prelude-packages))))
(prelude-install-packages)
(defmacro prelude-auto-install (extension package mode)
"When file with EXTENSION is opened triggers auto-install of PACKAGE.
PACKAGE is installed only if not already present. The file is opened in MODE."
`(add-to-list 'auto-mode-alist
`(,extension . (lambda ()
(unless (package-installed-p ',package)
@ -99,16 +103,20 @@
(add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode))
(add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode)))
(-each prelude-auto-install-alist
(lambda (entry)
(let ((extension (car entry))
(package (cadr entry))
(mode (cadr (cdr entry))))
(unless (package-installed-p package)
(prelude-auto-install extension package mode)))))
;; build auto-install mappings
(mapc
(lambda (entry)
(let ((extension (car entry))
(package (cadr entry))
(mode (cadr (cdr entry))))
(unless (package-installed-p package)
(prelude-auto-install extension package mode))))
prelude-auto-install-alist)
(defun prelude-ensure-module-deps (packages)
(-each (-remove #'package-installed-p packages) #'package-install))
"Ensure PACKAGES are installed.
Missing packages are installed automatically."
(mapc #'package-install (cl-remove-if #'package-installed-p packages)))
(provide 'prelude-packages)
;;; prelude-packages.el ends here