Renamed drupal-root' to drupal-rootdir'.

Author: arnested

drupal-mode.el

@@ -111,9 +111,9 @@ According to http://drupal.org/coding-standards#indenting."
 (make-variable-buffer-local 'drupal-version)
 (put 'drupal-version 'safe-local-variable 'string-or-null-p)
 
-(defvar drupal-root nil "Drupal project root as auto detected.")
-(make-variable-buffer-local 'drupal-root)
-(put 'drupal-root 'safe-local-variable 'string-or-null-p)
+(defvar drupal-rootdir nil "Drupal project rootdir as auto detected.")
+(make-variable-buffer-local 'drupal-rootdir)
+(put 'drupal-rootdir 'safe-local-variable 'string-or-null-p)
 
 (defvar drupal-mode-map
   (let ((map (make-sparse-keymap)))
@@ -255,7 +255,7 @@ should save your files with unix style end of line."
                   (goto-char (point-min))
                   (when (re-search-forward "\\(define('VERSION',\\|const VERSION =\\) +'\\(.+\\)'" nil t)
                     (dir-locals-set-class-variables 'drupal-class `((nil . ((drupal-version . ,(match-string-no-properties 2))
-                                                                            (drupal-root . ,dir)))))
+                                                                            (drupal-rootdir . ,dir)))))
                     (dir-locals-set-directory-class dir 'drupal-class)))
                 (setq drupal-version (match-string-no-properties 2))
                 )))

drupal/etags.el

@@ -8,9 +8,9 @@
 
 (defun drupal/etags-enable ()
   "Setup TAGS file for etags if it exists in DRUPAL_ROOT."
-  (when (and (boundp 'drupal-root)
-	     (file-exists-p (concat drupal-root "TAGS")))
-    (setq tags-file-name (concat drupal-root "TAGS"))))
+  (when (and (boundp 'drupal-rootdir)
+	     (file-exists-p (concat drupal-rootdir "TAGS")))
+    (setq tags-file-name (concat drupal-rootdir "TAGS"))))
 
 (add-hook 'drupal-mode-hook 'drupal/etags-enable)
 

drupal/gtags.el

@@ -8,8 +8,8 @@
 
 (defun drupal/gtags-enable ()
   "Setup rootdir for gtags to be DRUPAL_ROOT."
-  (when (boundp 'drupal-root)
-    (setq gtags-rootdir drupal-root)))
+  (when (boundp 'drupal-rootdir)
+    (setq gtags-rootdir drupal-rootdir)))
 
 (add-hook 'drupal-mode-hook 'drupal/gtags-enable)