branch: externals/idlwave
commit d62acf6aef60d35cfb74ca642f189d313c434d12
Author: JD Smith <[email protected]>
Commit: JD Smith <[email protected]>
Complete struct-tags even if shell only loaded.
---
idlw-shell.el | 3 ++-
idlwave.el | 9 +++------
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/idlw-shell.el b/idlw-shell.el
index 9ee6b7e860..6eb2cc46a5 100644
--- a/idlw-shell.el
+++ b/idlw-shell.el
@@ -964,7 +964,8 @@ IDL has currently stepped.")
\\{idlwave-shell-mode-map}"
(interactive)
- (idlwave-setup) ; Make sure config files and paths, etc. are available.
+ ; Make sure config files and paths, etc. are available.
+ (idlwave-setup)
(unless (file-name-absolute-p idlwave-shell-command-history-file)
(setq idlwave-shell-command-history-file
(expand-file-name idlwave-shell-command-history-file
diff --git a/idlwave.el b/idlwave.el
index b00adce87d..1a4ffa9595 100644
--- a/idlwave.el
+++ b/idlwave.el
@@ -2002,11 +2002,6 @@ The main features of this mode are
;; Update the routine info with info about current buffer?
(idlwave-new-buffer-update)
- (if idlwave-complete-structure-tags
- (add-hook 'idlwave-mode-hook
- (lambda ()
- (require 'idlw-complete-structtag))))
-
;; Run the mode hook
(run-mode-hooks 'idlwave-mode-hook))
@@ -2031,7 +2026,9 @@ The main features of this mode are
(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)))
(defun idlwave-font-lock-fontify-region (beg end &optional verbose)
