From dbe0ed889ab1195b6c1c394bf87ac7efdd741bf6 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Tue, 26 Nov 2013 12:52:29 +0200 Subject: [PATCH] Use prelude-require-packages everywhere --- core/prelude-osx.el | 2 +- core/prelude-packages.el | 2 +- modules/prelude-clojure.el | 2 +- modules/prelude-css.el | 2 +- modules/prelude-erlang.el | 2 +- modules/prelude-haskell.el | 2 +- modules/prelude-latex.el | 2 +- modules/prelude-lisp.el | 2 +- modules/prelude-mediawiki.el | 2 +- modules/prelude-programming.el | 2 +- modules/prelude-ruby.el | 2 +- modules/prelude-scala.el | 2 +- modules/prelude-scss.el | 2 +- modules/prelude-web.el | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/core/prelude-osx.el b/core/prelude-osx.el index 4c4d577..f7e3a92 100644 --- a/core/prelude-osx.el +++ b/core/prelude-osx.el @@ -34,7 +34,7 @@ ;; On OS X Emacs doesn't use the shell PATH if it's not started from ;; the shell. Let's fix that: -(prelude-ensure-module-deps '(exec-path-from-shell)) +(prelude-require-packages '(exec-path-from-shell)) (require 'exec-path-from-shell) (exec-path-from-shell-initialize) diff --git a/core/prelude-packages.el b/core/prelude-packages.el index 2bc4925..7ae83b2 100644 --- a/core/prelude-packages.el +++ b/core/prelude-packages.el @@ -67,7 +67,7 @@ Missing packages are installed automatically." (mapc #'prelude-require-package packages)) -(defalias 'prelude-ensure-module-deps 'prelude-require-packages) +(define-obsolete-function-alias 'prelude-ensure-module-deps 'prelude-require-packages) (defun prelude-install-packages () "Install all packages listed in `prelude-packages'." diff --git a/modules/prelude-clojure.el b/modules/prelude-clojure.el index a0e8b51..b42c758 100644 --- a/modules/prelude-clojure.el +++ b/modules/prelude-clojure.el @@ -33,7 +33,7 @@ ;;; Code: (require 'prelude-lisp) -(prelude-ensure-module-deps '(clojure-mode clojure-test-mode cider)) +(prelude-require-packages '(clojure-mode clojure-test-mode cider)) (eval-after-load 'clojure-mode '(progn diff --git a/modules/prelude-css.el b/modules/prelude-css.el index bf7875f..6d89027 100644 --- a/modules/prelude-css.el +++ b/modules/prelude-css.el @@ -34,7 +34,7 @@ (eval-after-load 'css-mode '(progn - (prelude-ensure-module-deps '(rainbow-mode)) + (prelude-require-packages '(rainbow-mode)) (defun prelude-css-mode-defaults () (setq css-indent-offset 2) diff --git a/modules/prelude-erlang.el b/modules/prelude-erlang.el index 48bc7e7..e9c0107 100644 --- a/modules/prelude-erlang.el +++ b/modules/prelude-erlang.el @@ -32,7 +32,7 @@ ;;; Code: (require 'prelude-programming) -(prelude-ensure-module-deps '(erlang)) +(prelude-require-packages '(erlang)) (defcustom wrangler-path nil "The location of wrangler elisp directory." diff --git a/modules/prelude-haskell.el b/modules/prelude-haskell.el index 1183789..7adff88 100644 --- a/modules/prelude-haskell.el +++ b/modules/prelude-haskell.el @@ -33,7 +33,7 @@ ;;; Code: (require 'prelude-programming) -(prelude-ensure-module-deps '(haskell-mode)) +(prelude-require-packages '(haskell-mode)) (eval-after-load 'haskell-mode '(progn diff --git a/modules/prelude-latex.el b/modules/prelude-latex.el index 3fe1e5c..9d8ec70 100644 --- a/modules/prelude-latex.el +++ b/modules/prelude-latex.el @@ -32,7 +32,7 @@ ;;; Code: -(prelude-ensure-module-deps '(auctex)) +(prelude-require-packages '(auctex)) (require 'smartparens-latex) ;; AUCTeX configuration diff --git a/modules/prelude-lisp.el b/modules/prelude-lisp.el index 9b23cfb..4877e0a 100644 --- a/modules/prelude-lisp.el +++ b/modules/prelude-lisp.el @@ -33,7 +33,7 @@ ;;; Code: (require 'prelude-programming) -(prelude-ensure-module-deps '(rainbow-delimiters)) +(prelude-require-packages '(rainbow-delimiters)) ;; Lisp configuration (define-key read-expression-map (kbd "TAB") 'lisp-complete-symbol) diff --git a/modules/prelude-mediawiki.el b/modules/prelude-mediawiki.el index 54519b3..7f21e24 100644 --- a/modules/prelude-mediawiki.el +++ b/modules/prelude-mediawiki.el @@ -32,7 +32,7 @@ ;;; Code: -(prelude-ensure-module-deps '(mediawiki)) +(prelude-require-packages '(mediawiki)) (eval-after-load 'mediawiki '(progn diff --git a/modules/prelude-programming.el b/modules/prelude-programming.el index f12e2bc..5825f69 100644 --- a/modules/prelude-programming.el +++ b/modules/prelude-programming.el @@ -32,7 +32,7 @@ ;;; Code: -(prelude-ensure-module-deps '(guru-mode)) +(prelude-require-packages '(guru-mode)) (defun prelude-ido-goto-symbol (&optional symbol-list) "Refresh imenu and jump to a place in the buffer using Ido." diff --git a/modules/prelude-ruby.el b/modules/prelude-ruby.el index 80de105..59cb841 100644 --- a/modules/prelude-ruby.el +++ b/modules/prelude-ruby.el @@ -34,7 +34,7 @@ (require 'prelude-programming) -(prelude-ensure-module-deps '(ruby-tools inf-ruby yari)) +(prelude-require-packages '(ruby-tools inf-ruby yari)) ;; Rake files are ruby, too, as are gemspecs, rackup files, and gemfiles. (add-to-list 'auto-mode-alist '("\\.rake\\'" . ruby-mode)) diff --git a/modules/prelude-scala.el b/modules/prelude-scala.el index d873f07..4de55ad 100644 --- a/modules/prelude-scala.el +++ b/modules/prelude-scala.el @@ -33,7 +33,7 @@ ;;; Code: (require 'prelude-programming) -(prelude-ensure-module-deps '(scala-mode2)) +(prelude-require-packages '(scala-mode2)) (defun prelude-scala-mode-defaults () (subword-mode +1)) diff --git a/modules/prelude-scss.el b/modules/prelude-scss.el index 3e33cae..52eaf35 100644 --- a/modules/prelude-scss.el +++ b/modules/prelude-scss.el @@ -33,7 +33,7 @@ ;;; Code: (require 'prelude-css) -(prelude-ensure-module-deps '(scss-mode)) +(prelude-require-packages '(scss-mode)) (defun prelude-scss-mode-defaults () (prelude-css-mode-defaults) diff --git a/modules/prelude-web.el b/modules/prelude-web.el index 564bd0c..234804e 100644 --- a/modules/prelude-web.el +++ b/modules/prelude-web.el @@ -32,7 +32,7 @@ ;;; Code: -(prelude-ensure-module-deps '(web-mode)) +(prelude-require-packages '(web-mode)) (add-to-list 'auto-mode-alist '("\\.phtml\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.tpl\\.php\\'" . web-mode))