[Emacs-diffs] Changes to emacs/lisp/progmodes/idlw-complete-structtag.el

[Juanma Barranquero]

Index: emacs/lisp/progmodes/idlw-complete-structtag.el
diff -c emacs/lisp/progmodes/idlw-complete-structtag.el:3.4 
emacs/lisp/progmodes/idlw-complete-structtag.el:3.5
*** emacs/lisp/progmodes/idlw-complete-structtag.el:3.4 Mon Aug  1 08:37:48 2005
--- emacs/lisp/progmodes/idlw-complete-structtag.el     Tue Aug 30 11:02:13 2005
***************
*** 53,62 ****
  ;;
  ;; INSTALLATION
  ;; ============
! ;; Put this file on the emacs load path and load it with the following 
  ;; line in your .emacs file:
  ;;
! ;;   (add-hook 'idlwave-load-hook 
  ;;             (lambda () (require 'idlw-complete-structtag)))
  ;;
  ;; DESCRIPTION
--- 53,62 ----
  ;;
  ;; INSTALLATION
  ;; ============
! ;; Put this file on the emacs load path and load it with the following
  ;; line in your .emacs file:
  ;;
! ;;   (add-hook 'idlwave-load-hook
  ;;             (lambda () (require 'idlw-complete-structtag)))
  ;;
  ;; DESCRIPTION
***************
*** 87,92 ****
--- 87,93 ----
  ;;  - You can force an update of the tag list with the usual command
  ;;    to update routine info in IDLWAVE: C-c C-i
  
+ (defvar idlwave-completion-help-info)
  
  ;; Some variables to identify the previously used structure
  (defvar idlwave-current-tags-var nil)
***************
*** 144,152 ****
                    (not (equal start idlwave-current-tags-completion-pos)))
              (idlwave-prepare-structure-tag-completion var))
            (setq idlwave-current-tags-completion-pos start)
!         (setq idlwave-completion-help-info 
                (list 'idlwave-complete-structure-tag-help))
!         (idlwave-complete-in-buffer 'structtag 'structtag 
                                      idlwave-current-struct-tags nil
                                      "Select a structure tag" "structure tag")
          t) ; we did the completion: return t to skip other completions
--- 145,153 ----
                    (not (equal start idlwave-current-tags-completion-pos)))
              (idlwave-prepare-structure-tag-completion var))
            (setq idlwave-current-tags-completion-pos start)
!         (setq idlwave-completion-help-info
                (list 'idlwave-complete-structure-tag-help))
!         (idlwave-complete-in-buffer 'structtag 'structtag
                                      idlwave-current-struct-tags nil
                                      "Select a structure tag" "structure tag")
          t) ; we did the completion: return t to skip other completions
***************
*** 165,171 ****
    (if (eq major-mode 'idlwave-shell-mode)
        ;; OK, we are in the shell, do it dynamically
        (progn
!         (message "preparing shell tags") 
          ;; The following call puts the tags into `idlwave-current-struct-tags'
          (idlwave-complete-structure-tag-query-shell var)
          ;; initialize
--- 166,172 ----
    (if (eq major-mode 'idlwave-shell-mode)
        ;; OK, we are in the shell, do it dynamically
        (progn
!         (message "preparing shell tags")
          ;; The following call puts the tags into `idlwave-current-struct-tags'
          (idlwave-complete-structure-tag-query-shell var)
          ;; initialize
***************
*** 187,193 ****
              ;; Find possible definitions of the structure.
              (while (idlwave-find-structure-definition var nil 'all)
                (let ((tags (idlwave-struct-tags)))
!                 (when tags 
                    ;; initialize
                    (setq idlwave-sint-structtags nil
                          idlwave-current-tags-buffer (current-buffer)
--- 188,194 ----
              ;; Find possible definitions of the structure.
              (while (idlwave-find-structure-definition var nil 'all)
                (let ((tags (idlwave-struct-tags)))
!                 (when tags
                    ;; initialize
                    (setq idlwave-sint-structtags nil
                          idlwave-current-tags-buffer (current-buffer)