From 9cfdb2694aa28e1e89be93387d34fe880ce0caa6 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Wed, 2 Jan 2013 14:26:54 +0200 Subject: [PATCH] cleaned up some package dependency stuff --- modules/prelude-c.el | 1 - modules/prelude-clojure.el | 1 - modules/prelude-coffee.el | 5 ----- modules/prelude-common-lisp.el | 1 - modules/prelude-css.el | 1 - modules/prelude-erlang.el | 1 - modules/prelude-haskell.el | 2 +- modules/prelude-js.el | 1 - modules/prelude-latex.el | 3 ++- modules/prelude-lisp.el | 1 - modules/prelude-mediawiki.el | 3 ++- modules/prelude-org.el | 8 ++++---- modules/prelude-python.el | 1 - modules/prelude-ruby.el | 1 - modules/prelude-scala.el | 1 - modules/prelude-scheme.el | 1 - modules/prelude-scss.el | 2 +- 17 files changed, 10 insertions(+), 24 deletions(-) diff --git a/modules/prelude-c.el b/modules/prelude-c.el index 5b61f6e..e92fca7 100644 --- a/modules/prelude-c.el +++ b/modules/prelude-c.el @@ -6,7 +6,6 @@ ;; URL: http://batsov.com/emacs-prelude ;; Version: 1.0.0 ;; Keywords: convenience -;; Package-Requires: ((prelude-programming "1.0.0")) ;; This file is not part of GNU Emacs. diff --git a/modules/prelude-clojure.el b/modules/prelude-clojure.el index 0a671e9..69eb5fc 100644 --- a/modules/prelude-clojure.el +++ b/modules/prelude-clojure.el @@ -6,7 +6,6 @@ ;; URL: http://batsov.com/prelude ;; Version: 1.0.0 ;; Keywords: convenience -;; Package-Requires: ((prelude-lisp "1.0.0") (clojure-mode "1.11.5") (nrepl "0.1.4")) ;; This file is not part of GNU Emacs. diff --git a/modules/prelude-coffee.el b/modules/prelude-coffee.el index d8dabdd..d9167e2 100644 --- a/modules/prelude-coffee.el +++ b/modules/prelude-coffee.el @@ -6,7 +6,6 @@ ;; URL: http://batsov.com/emacs-prelude ;; Version: 1.0.0 ;; Keywords: convenience -;; Package-Requires: ((coffee-mode "0.4.0")) ;; This file is not part of GNU Emacs. @@ -52,10 +51,6 @@ ;; *Messages* spam (setq coffee-debug-mode t) - ;; electric-indent doesn't play nice with coffee-mode's "smart" - ;; indent - (electric-indent-mode -1) - ;; Emacs key binding (define-key coffee-mode-map [(meta r)] 'coffee-compile-buffer) diff --git a/modules/prelude-common-lisp.el b/modules/prelude-common-lisp.el index 6ad3e26..88d6e39 100644 --- a/modules/prelude-common-lisp.el +++ b/modules/prelude-common-lisp.el @@ -6,7 +6,6 @@ ;; URL: http://batsov.com/emacs-prelude ;; Version: 1.0.0 ;; Keywords: convenience -;; Package-Requires: ((prelude-lisp "1.0.0")) ;; This file is not part of GNU Emacs. diff --git a/modules/prelude-css.el b/modules/prelude-css.el index 66157b9..bf7875f 100644 --- a/modules/prelude-css.el +++ b/modules/prelude-css.el @@ -6,7 +6,6 @@ ;; URL: http://www.batsov.com/emacs-prelude ;; Version: 1.0.0 ;; Keywords: convenience -;; Package-Requires: ((rainbow-mode "0.2")) ;; This file is not part of GNU Emacs. diff --git a/modules/prelude-erlang.el b/modules/prelude-erlang.el index 5e58876..385d2bf 100644 --- a/modules/prelude-erlang.el +++ b/modules/prelude-erlang.el @@ -5,7 +5,6 @@ ;; Author: Gleb Peregud ;; Version: 1.0.0 ;; Keywords: convenience erlang -;; Package-Requires: ((erlang "2.4.1") (projectile "0.7")) ;; This file is not part of GNU Emacs. diff --git a/modules/prelude-haskell.el b/modules/prelude-haskell.el index 57fd3bf..30fca29 100644 --- a/modules/prelude-haskell.el +++ b/modules/prelude-haskell.el @@ -6,7 +6,6 @@ ;; URL: http://batsov.com/emacs-prelude ;; Version: 1.0.0 ;; Keywords: convenience -;; Package-Requires: ((haskell-mode "2.8.0") (prelude-programming "1.0.0")) ;; This file is not part of GNU Emacs. @@ -34,6 +33,7 @@ ;;; Code: (require 'prelude-programming) +(prelude-ensure-module-deps '(haskell-mode)) (eval-after-load 'haskell-mode '(progn diff --git a/modules/prelude-js.el b/modules/prelude-js.el index 2036eb2..998f457 100644 --- a/modules/prelude-js.el +++ b/modules/prelude-js.el @@ -6,7 +6,6 @@ ;; URL: http://batsov.com/emacs-prelude ;; Version: 1.0.0 ;; Keywords: convenience -;; Package-Requires: ((prelude-programming "1.0.0")) ;; This file is not part of GNU Emacs. diff --git a/modules/prelude-latex.el b/modules/prelude-latex.el index 3cc7175..2c52b7b 100644 --- a/modules/prelude-latex.el +++ b/modules/prelude-latex.el @@ -6,7 +6,6 @@ ;; URL: http://batsov.com/emacs-prelude ;; Version: 1.0.0 ;; Keywords: convenience -;; Package-Requires: ((auctex "11.86")) ;; This file is not part of GNU Emacs. @@ -33,6 +32,8 @@ ;;; Code: +(prelude-ensure-module-deps '(auctex)) + ;; AUCTeX configuration (setq TeX-auto-save t) (setq TeX-parse-self t) diff --git a/modules/prelude-lisp.el b/modules/prelude-lisp.el index 625c8a5..2d5803a 100644 --- a/modules/prelude-lisp.el +++ b/modules/prelude-lisp.el @@ -6,7 +6,6 @@ ;; URL: http://batsov.com/emacs-prelude ;; Version: 1.0.0 ;; Keywords: convenience -;; Package-Requires: ((prelude-programming "1.0.0") (paredit "22") (rainbow-delimiters "1.3.4")) ;; This file is not part of GNU Emacs. diff --git a/modules/prelude-mediawiki.el b/modules/prelude-mediawiki.el index 14b422f..0fd9ce6 100644 --- a/modules/prelude-mediawiki.el +++ b/modules/prelude-mediawiki.el @@ -6,7 +6,6 @@ ;; URL: http://batsov.com/emacs-prelude ;; Version: 1.0.0 ;; Keywords: convenience -;; Package-Requires: ((mediawiki "2.2.3")) ;; This file is not part of GNU Emacs. @@ -33,6 +32,8 @@ ;;; Code: +(prelude-ensure-module-deps '(mediawiki)) + (eval-after-load 'mediawiki '(progn (setq mediawiki-site-alist '(("Wikipedia" "http://en.wikipedia.org/w" "" "" "Main Page") diff --git a/modules/prelude-org.el b/modules/prelude-org.el index 05c4783..dac520c 100644 --- a/modules/prelude-org.el +++ b/modules/prelude-org.el @@ -38,12 +38,12 @@ (global-set-key "\C-cb" 'org-iswitchb) (setq org-log-done t) -(defun prelude-org-mode-defaults () - (electric-indent-mode -1)) +;; (defun prelude-org-mode-defaults () +;; ) -(setq prelude-org-mode-hook 'prelude-org-mode-defaults) +;; (setq prelude-org-mode-hook 'prelude-org-mode-defaults) -(add-hook 'org-mode-hook (lambda () (run-hooks 'prelude-org-mode-hook))) +;; (add-hook 'org-mode-hook (lambda () (run-hooks 'prelude-org-mode-hook))) (provide 'prelude-org) diff --git a/modules/prelude-python.el b/modules/prelude-python.el index 94e08a4..698d63f 100644 --- a/modules/prelude-python.el +++ b/modules/prelude-python.el @@ -6,7 +6,6 @@ ;; URL: http://batsov.com/emacs-prelude ;; Version: 1.0.0 ;; Keywords: convenience -;; Package-Requires: ((prelude-programming "1.0.0") (python "23.1")) ;; This file is not part of GNU Emacs. diff --git a/modules/prelude-ruby.el b/modules/prelude-ruby.el index 50ff123..953b4ab 100644 --- a/modules/prelude-ruby.el +++ b/modules/prelude-ruby.el @@ -6,7 +6,6 @@ ;; URL: http://batsov.com/emacs-prelude ;; Version: 1.0.0 ;; Keywords: convenience -;; Package-Requires: ((prelude-programming "1.0.0") (ruby-tools "0.0.1") (inf-ruby "2.2.3") (yari "0.5") (ruby-end "0.0.1") (ruby-block "0.0.11")) ;; This file is not part of GNU Emacs. diff --git a/modules/prelude-scala.el b/modules/prelude-scala.el index 30d6088..cee3cc9 100644 --- a/modules/prelude-scala.el +++ b/modules/prelude-scala.el @@ -6,7 +6,6 @@ ;; URL: http://batsov.com/emacs-prelude ;; Version: 1.0.0 ;; Keywords: convenience -;; Package-Requires: ((prelude-programming "1.0.0") (scala-mode "2.8.0")) ;; This file is not part of GNU Emacs. diff --git a/modules/prelude-scheme.el b/modules/prelude-scheme.el index efb9358..a35a1f4 100644 --- a/modules/prelude-scheme.el +++ b/modules/prelude-scheme.el @@ -6,7 +6,6 @@ ;; URL: http://batsov.com/emacs-prelude ;; Version: 1.0.0 ;; Keywords: convenience -;; Package-Requires: ((prelude-lisp "1.0.0")) ;; This file is not part of GNU Emacs. diff --git a/modules/prelude-scss.el b/modules/prelude-scss.el index 2dd705a..3e33cae 100644 --- a/modules/prelude-scss.el +++ b/modules/prelude-scss.el @@ -6,7 +6,6 @@ ;; URL: http://www.batsov.com/emacs-prelude ;; Version: 1.0.0 ;; Keywords: convenience -;; Package-Requires: ((prelude-css "1.0.0") (scss-mode "0.5.0")) ;; This file is not part of GNU Emacs. @@ -34,6 +33,7 @@ ;;; Code: (require 'prelude-css) +(prelude-ensure-module-deps '(scss-mode)) (defun prelude-scss-mode-defaults () (prelude-css-mode-defaults)