2 files changed, 11 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index da80437e12a..5b027eb7207 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-08  Matthias Meulien  <orontee@gmail.com>
+
+        * progmodes/prog-mode.el (prog-mode-hook): Made customizable.
+
 2014-08-07  Martin Rudalics  <rudalics@gmx.at>
 
         * window.el (window--min-size-1): Explicitly set WINDOW arg in
diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el
index d0745d59955..747e63f9237 100644
--- a/lisp/progmodes/prog-mode.el
+++ b/lisp/progmodes/prog-mode.el
@@ -35,6 +35,13 @@
   "Generic programming mode, from which others derive."
   :group 'languages)
 
+(defcustom prog-mode-hook nil
+  "Normal hook run when entering Text mode and many related modes."
+  :type 'hook
+  :options '(flyspell-prog-mode abbrev-mode flymake-mode linum-mode
+                                prettify-symbols-mode)
+  :group 'prog-mode)
+
 (defvar prog-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map [?\C-\M-q] 'prog-indent-sexp)