branch: externals/idlwave
commit da4475c8c063b6e66c7bf32c7a354ec538f2eac9
Author: JD Smith <[email protected]>
Commit: JD Smith <[email protected]>
Avoid require recursion.
---
idlw-complete-structtag.el | 2 +-
idlwave.el | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/idlw-complete-structtag.el b/idlw-complete-structtag.el
index c65d441739..d719060c42 100644
--- a/idlw-complete-structtag.el
+++ b/idlw-complete-structtag.el
@@ -89,7 +89,7 @@
;; - You can force an update of the tag list with the usual command
;; to update routine info in IDLWAVE: C-c C-i
-(require 'idlwave)
+;;(require 'idlwave)
(declare-function idlwave-shell-buffer "idlw-shell")
diff --git a/idlwave.el b/idlwave.el
index ec237d82b6..55e28c637b 100644
--- a/idlwave.el
+++ b/idlwave.el
@@ -389,6 +389,10 @@ The main features of this mode are
;; Run the mode hook
(run-mode-hooks 'idlwave-mode-hook))
+;; Special module
+(if idlwave-complete-structure-tags
+ (require 'idlw-complete-structtag))
+
;;;###autoload
(add-to-list 'auto-mode-alist (cons (purecopy "\\.pro\\'") 'idlwave-mode))
(eval-after-load "speedbar" '(speedbar-add-supported-extension ".pro"))
@@ -429,9 +433,6 @@ sets the variable to zero afterwards."
(idlwave-read-paths) ; we may need these early
(idlwave-help-check-locations)
-
- (if idlwave-complete-structure-tags
- (require 'idlw-complete-structtag))
(setq idlwave-setup-done t)))
;;----------------------------------------------------
