summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-06-25 14:39:17 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-06-25 14:39:17 (GMT)
commit2d14021a850376be3b57145dfbfda8c57f5fffea (patch)
treee47554a46d2b2ea6998c30395b9ffae22b6a21ee
parentf74b524e41ce1afc6633bd7853bc4d49d0d8202f (diff)
parentb24b58bb7b100794846786521f1977f048ecf5b6 (diff)
downloadCMake-2d14021a850376be3b57145dfbfda8c57f5fffea.zip
CMake-2d14021a850376be3b57145dfbfda8c57f5fffea.tar.gz
CMake-2d14021a850376be3b57145dfbfda8c57f5fffea.tar.bz2
Merge topic 'emacs-mode-prog-mode-hooks'
b24b58bb cmake-mode.el: Add support for prog-mode hooks (#15521)
-rw-r--r--Auxiliary/cmake-mode.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el
index 7458a66..51663a8 100644
--- a/Auxiliary/cmake-mode.el
+++ b/Auxiliary/cmake-mode.el
@@ -259,7 +259,9 @@ the indentation. Otherwise it retains the same position on the line"
(setq comment-start "#")
; Run user hooks.
- (run-hooks 'cmake-mode-hook))
+ (if (boundp 'prog-mode-hook)
+ (run-hooks 'prog-mode-hook 'cmake-mode-hook)
+ (run-hooks 'cmake-mode-hook)))
; Help mode starts here