cleaned up some package dependency stuff

13 years ago · 9cfdb2694a
17 changed files with 10 additions and 24 deletions
--- 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.

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

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

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

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

--- a/modules/prelude-erlang.el
+++ b/modules/prelude-erlang.el
@ -5,7 +5,6 @@
 ;; Author: Gleb Peregud <gleber.p@gmail.com>
 ;; Version: 1.0.0
 ;; Keywords: convenience erlang
-;; Package-Requires: ((erlang "2.4.1") (projectile "0.7"))

 ;; This file is not part of GNU Emacs.

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

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

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

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

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

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

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

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