branch: elpa/drupal-mode
commit 767d49075157004fade583d91050e1b8d4abfdff
Author: Arne Jørgensen <[email protected]>
Commit: Arne Jørgensen <[email protected]>
Removed `web-mode' from `auto-mode-alist'.
Doesn't look like `web-mode' is gaining traction enough to be our
default for .tpl.php files.
---
drupal-mode.el | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drupal-mode.el b/drupal-mode.el
index 8d8d0008cf..e0bd1ebe15 100644
--- a/drupal-mode.el
+++ b/drupal-mode.el
@@ -604,11 +604,8 @@ mode-hook."
;;;###autoload
(progn
- (add-to-list 'auto-mode-alist
'("\\.\\(module\\|test\\|install\\|theme\\)\\'" . php-mode))
- (add-to-list 'auto-mode-alist '("\\.info\\'" . conf-windows-mode))
- (when (fboundp 'web-mode)
- (require 'php-mode)
- (add-to-list 'auto-mode-alist '("\\.tpl\\.php\\'" . web-mode))))
+ (add-to-list 'auto-mode-alist
'("\\.\\(module\\|test\\|install\\|tpl\\.php\\|theme\\)\\'" . php-mode))
+ (add-to-list 'auto-mode-alist '("\\.info\\'" . conf-windows-mode)))
;; Load support for various Emacs features if necessary.
