branch: elpa/drupal-mode
commit 8eec9671644343075ee4b97be347621f74a9dd64
Author: Arne Jørgensen <[email protected]>
Commit: Arne Jørgensen <[email protected]>
Fixed latest commit.
I missed some edge cases.
---
drupal-mode.el | 3 +++
drupal/etags.el | 3 +--
drupal/gtags.el | 1 -
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drupal-mode.el b/drupal-mode.el
index 780763603f..6b08360807 100644
--- a/drupal-mode.el
+++ b/drupal-mode.el
@@ -689,6 +689,9 @@ mode-hook."
;;;###autoload
(eval-after-load 'webjump '(require 'drupal/webjump))
+(eval-after-load 'drupal/etags '(require 'drupal/emacs-drush))
+(eval-after-load 'drupal/gtags '(require 'drupal/emacs-drush))
+
(provide 'drupal-mode)
diff --git a/drupal/etags.el b/drupal/etags.el
index 9dfda51d0a..ee2251154a 100644
--- a/drupal/etags.el
+++ b/drupal/etags.el
@@ -25,8 +25,7 @@
;;; Code:
-(require 'etags)
-(require 'drupal/emacs-drush)
+(defvar drupal/etags-rootdir nil "Root directory where etags TAGS file is
present.")
(defun drupal/etags-enable ()
"Setup TAGS file for etags if it exists."
diff --git a/drupal/gtags.el b/drupal/gtags.el
index 2b7959eadf..ee48eb6484 100644
--- a/drupal/gtags.el
+++ b/drupal/gtags.el
@@ -26,7 +26,6 @@
;;; Code:
(require 'gtags)
-(require 'drupal/emacs-drush)
(defvar drupal/gtags-global-command (if (boundp 'gtags-global-command)
gtags-global-command
