[nongnu] elpa/drupal-mode cda13dfb21 063/308: Added better bootstrapping of Drupal mode.

[ELPA Syncer]

branch: elpa/drupal-mode
commit cda13dfb21d577c8f4bcbe445e256dd3ed434c79
Author: Arne Jørgensen <arne@arnested.dk>
Commit: Arne Jørgensen <arne@arnested.dk>

    Added better bootstrapping of Drupal mode.
    
    Drupal mode will now try to bootstrap itself in all major modes listed
    in `drupal-php-modes', `drupal-css-modes', `drupal-js-modes' and the
    new `drupal-info-modes'.
---
 drupal-mode.el | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/drupal-mode.el b/drupal-mode.el
index 8aa33e93af..997e5e76e7 100644
--- a/drupal-mode.el
+++ b/drupal-mode.el
@@ -130,21 +130,30 @@ Include path to the executable if it is not in your 
$PATH."
   :link '(variable-link drupal-drush-program)
   :group 'drupal-drush)
 
+;;;###autoload
 (defcustom drupal-php-modes (list 'php-mode)
   "Major modes to consider PHP in Drupal mode."
   :type '(repeat symbol)
   :group 'drupal)
 
+;;;###autoload
 (defcustom drupal-css-modes (list 'css-mode)
   "Major modes to consider CSS in Drupal mode."
   :type '(repeat symbol)
   :group 'drupal)
 
+;;;###autoload
 (defcustom drupal-js-modes (list 'javascript-mode 'js-mode 'js2-mode)
   "Major modes to consider JavaScript in Drupal mode."
   :type '(repeat symbol)
   :group 'drupal)
 
+;;;###autoload
+(defcustom drupal-info-modes (list 'conf-windows-mode)
+  "Major modes to consider info files in Drupal mode."
+  :type '(repeat symbol)
+  :group 'drupal)
+
 
 
 (defvar drupal-version nil "Drupal version as auto detected.")
@@ -472,11 +481,8 @@ is a mode supported by `drupal-mode' (currently only
 `php-mode').
 
 The function is suitable for adding to the supported major modes
-mode-hook, i.e.
-
-(eval-after-load 'php-mode
-  '(add-hook 'php-mode-hook 'drupal-mode-bootstrap))"
-  (when (apply 'derived-mode-p drupal-php-modes)
+mode-hook."
+  (when (apply 'derived-mode-p (append drupal-php-modes drupal-css-modes 
drupal-js-modes drupal-info-modes))
     (drupal-detect-drupal-version)
     (when drupal-version
       (drupal-mode 1))
@@ -484,8 +490,10 @@ mode-hook, i.e.
       (drupal-drush-mode 1))))
 
 ;;;###autoload
-(eval-after-load 'php-mode
-  '(add-hook 'php-mode-hook #'drupal-mode-bootstrap))
+(dolist (mode (append drupal-php-modes drupal-css-modes drupal-js-modes 
drupal-info-modes))
+  (when (intern (concat (symbol-name mode) "-hook"))
+    (message "Adding Drupal bootstrap to %s." (concat (symbol-name mode) 
"-hook") )
+    (add-hook (intern (concat (symbol-name mode) "-hook")) 
#'drupal-mode-bootstrap)))
 
 ;;;###autoload
 (progn