aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Meulien2014-08-08 15:51:47 +0200
committerRĂ¼diger Sonderfeld2014-08-08 15:51:47 +0200
commit5c872b1da43fdd514018d4e1c0359e635c853244 (patch)
treeb3dfacad2a4e76b2dd79b2df791dbb969c26c5d0
parentddc3fca44ee44f7b858de3a42b8045df904c2198 (diff)
downloademacs-5c872b1da43fdd514018d4e1c0359e635c853244.tar.gz
emacs-5c872b1da43fdd514018d4e1c0359e635c853244.zip
progmodes/prog-mode.el (prog-mode-hook): Made customizable.
https://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00353.html
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/progmodes/prog-mode.el7
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 @@
12014-08-08 Matthias Meulien <orontee@gmail.com>
2
3 * progmodes/prog-mode.el (prog-mode-hook): Made customizable.
4
12014-08-07 Martin Rudalics <rudalics@gmx.at> 52014-08-07 Martin Rudalics <rudalics@gmx.at>
2 6
3 * window.el (window--min-size-1): Explicitly set WINDOW arg in 7 * 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 @@
35 "Generic programming mode, from which others derive." 35 "Generic programming mode, from which others derive."
36 :group 'languages) 36 :group 'languages)
37 37
38(defcustom prog-mode-hook nil
39 "Normal hook run when entering Text mode and many related modes."
40 :type 'hook
41 :options '(flyspell-prog-mode abbrev-mode flymake-mode linum-mode
42 prettify-symbols-mode)
43 :group 'prog-mode)
44
38(defvar prog-mode-map 45(defvar prog-mode-map
39 (let ((map (make-sparse-keymap))) 46 (let ((map (make-sparse-keymap)))
40 (define-key map [?\C-\M-q] 'prog-indent-sexp) 47 (define-key map [?\C-\M-q] 'prog-indent-sexp)