From 6e31729ba9927256a0acec047e08e3cad3fd7aff Mon Sep 17 00:00:00 2001
From: Bozhidar Batsov <bozhidar.batsov@gmail.com>
Date: Thu, 1 Dec 2011 23:55:47 +0200
Subject: [PATCH] Make use of the new prog-mode/prog-mode-hook functionality in
 Emacs 24

---
 modules/prelude-c.el          | 3 +--
 modules/prelude-clojure.el    | 2 +-
 modules/prelude-core.el       | 6 +++++-
 modules/prelude-emacs-lisp.el | 5 +++--
 modules/prelude-js.el         | 1 -
 modules/prelude-lisp.el       | 1 -
 modules/prelude-perl.el       | 1 -
 modules/prelude-python.el     | 2 +-
 modules/prelude-ruby.el       | 1 -
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/prelude-c.el b/modules/prelude-c.el
index 735154a..ebc8e26 100644
--- a/modules/prelude-c.el
+++ b/modules/prelude-c.el
@@ -33,8 +33,7 @@
 ;;; Code:
 
 (defun prelude-c-mode-common-hook ()
-  (setq c-basic-offset 4)
-  (prelude-coding-hook))
+  (setq c-basic-offset 4))
 
 ;; this will affect all modes derived from cc-mode, like
 ;; java-mode, php-mode, etc
diff --git a/modules/prelude-clojure.el b/modules/prelude-clojure.el
index 9e03a9a..23f3bde 100644
--- a/modules/prelude-clojure.el
+++ b/modules/prelude-clojure.el
@@ -40,7 +40,7 @@
 (require 'clojure-mode)
 
 (defun prelude-clojure-mode-hook ()
-  (prelude-list-coding-hook))
+  (prelude-lisp-coding-hook))
 
 (add-hook 'clojure-mode-hook 'prelude-clojure-mode-hook)
 
diff --git a/modules/prelude-core.el b/modules/prelude-core.el
index 0e18707..d7b31f0 100644
--- a/modules/prelude-core.el
+++ b/modules/prelude-core.el
@@ -318,7 +318,7 @@ there's a region, all lines that region covers will be duplicated."
    nil '(("\\<\\(FIX\\|TODO\\|FIXME\\|HACK\\|REFACTOR\\):"
           1 font-lock-warning-face t))))
 
-(defun prelude-coding-hook ()
+(defun prelude-prog-mode-hook ()
   "Default coding hook, useful with any programming language."
   (flyspell-prog-mode)
   (prelude-local-comment-auto-fill)
@@ -328,6 +328,10 @@ there's a region, all lines that region covers will be duplicated."
   ;; keep the whitespace decent all the time
   (add-hook 'before-save-hook 'whitespace-cleanup nil t))
 
+;; in Emacs 24 programming major modes generally derive
+;; from a common mode named prog-mode
+(add-hook 'prog-mode-hook 'prelude-prog-mode-hook)
+
 (defun prelude-untabify-buffer ()
   (interactive)
   (untabify (point-min) (point-max)))
diff --git a/modules/prelude-emacs-lisp.el b/modules/prelude-emacs-lisp.el
index e5a7d23..63b1463 100644
--- a/modules/prelude-emacs-lisp.el
+++ b/modules/prelude-emacs-lisp.el
@@ -43,12 +43,13 @@
                   (delete-file (concat buffer-file-name "c"))))))
 
 (defun prelude-emacs-lisp-mode-hook ()
+  (prelude-lisp-coding-hook)
   (turn-on-eldoc-mode)
-  (prelude-remove-elc-on-save)
-  (prelude-lisp-coding-hook))
+  (prelude-remove-elc-on-save))
 
 (add-hook 'emacs-lisp-mode-hook 'prelude-emacs-lisp-mode-hook)
 
+;; ielm is an interactive Emacs Lisp shell
 (defun prelude-ielm-mode-hook ()
   (prelude-interactive-lisp-coding-hook)
   (turn-on-eldoc-mode))
diff --git a/modules/prelude-js.el b/modules/prelude-js.el
index 1cdb2e2..70834ad 100644
--- a/modules/prelude-js.el
+++ b/modules/prelude-js.el
@@ -33,7 +33,6 @@
 ;;; Code:
 
 (defun prelude-js-mode-hook ()
-  (prelude-coding-hook)
   ;; electric-layout-mode doesn't play nice with js-mode
   (electric-layout-mode -1))
 
diff --git a/modules/prelude-lisp.el b/modules/prelude-lisp.el
index 6739b89..5c37bb3 100644
--- a/modules/prelude-lisp.el
+++ b/modules/prelude-lisp.el
@@ -37,7 +37,6 @@
 
 ;; a great lisp coding hook
 (defun prelude-lisp-coding-hook ()
-  (prelude-coding-hook)
   (paredit-mode +1))
 
 ;; interactive modes don't need whitespace checks
diff --git a/modules/prelude-perl.el b/modules/prelude-perl.el
index 8094361..18a98ff 100644
--- a/modules/prelude-perl.el
+++ b/modules/prelude-perl.el
@@ -36,7 +36,6 @@
 (defalias 'perl-mode 'cperl-mode)
 
 (defun prelude-cperl-mode-hook ()
-  (prelude-coding-hook)
   (setq cperl-indent-level 4)
   (setq cperl-continued-statement-offset 8)
   ;; cperl-hairy affects all those variables, but I prefer
diff --git a/modules/prelude-python.el b/modules/prelude-python.el
index 79739f3..61bcb07 100644
--- a/modules/prelude-python.el
+++ b/modules/prelude-python.el
@@ -36,7 +36,7 @@
 (require 'python)
 
 (defun prelude-python-mode-hook ()
-  (prelude-coding-hook)
+  (prelude-prog-mode-hook)
   (electric-indent-mode -1))
 
 (add-hook 'python-mode-hook 'prelude-python-mode-hook)
diff --git a/modules/prelude-ruby.el b/modules/prelude-ruby.el
index da26dbd..3f52b12 100644
--- a/modules/prelude-ruby.el
+++ b/modules/prelude-ruby.el
@@ -60,7 +60,6 @@
 (require 'ruby-end)
 
 (defun prelude-ruby-mode-hook ()
-  (prelude-coding-hook)
   (inf-ruby-keys)
   ;; turn off the annoying input echo in irb
   (setq comint-process-echoes t)