Changeset 4166 for trunk/lisp/progmodes/idlwave.el

Timestamp:

09/18/06 20:48:14 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/progmodes/idlwave.el (modified) (291 diffs)

trunk/lisp/progmodes/idlwave.el

@@ -76 +76 @@
-;; SOURCE).
-;;
- 
+
-;; ACKNOWLEDGMENTS
-;; ===============
@@ -126 +126 @@
-;;   point backward, e.g., "\cl" expanded with a space becomes
-;;   "LONG( )" with point before the close paren.  This is solved by
- 
+
-;;   but it works.
-;;
@@ -179 +179 @@
-    ;; We have the old or no custom-library, hack around it!
-    (defmacro defgroup (&rest args) nil)
- 
+
-      `(defvar ,var ,value ,doc))))
-
@@ -185 +185 @@
-  "Major mode for editing IDL .pro files."
-  :tag "IDLWAVE"
- 
+
-                   "http://idlwave.org")
-  :link '(emacs-commentary-link :tag "Commentary in idlw-shell.el"
@@ -299 +299 @@
-(defcustom idlwave-auto-fill-split-string t
-  "*If non-nil then auto fill will split strings with the IDL `+' operator.
- 
-  
+
+
-If nil and a string is split then a terminal beep and warning are issued.
-
@@ -419 +419 @@
-               (const :tag "After a buffer was killed" kill-buffer)
-               (const :tag "After a buffer was compiled successfully, update shell info" compile-buffer))))
-
+
-(defcustom idlwave-rinfo-max-source-lines 5
-  "*Maximum number of source files displayed in the Routine Info window.
@@ -454 +454 @@
-
-;; Configuration files
- 
+
-  (convert-standard-filename "~/.idlwave")
-  "*Directory for configuration files and user-library catalog."
@@ -470 +470 @@
-  "Alist of regular expressions matching special library directories.
-When listing routine source locations, IDLWAVE gives a short hint where
- 
+
-for routines in the system library `!DIR/lib' and `Library' for anything
-else.  This variable can define additional types.  The car of each entry
@@ -481 +481 @@
-
-(defcustom idlwave-auto-write-paths t
-  
+
-Path info is needed to locate library catalog files.  If non-nil,
-whenever the path-list changes as a result of shell-query, etc., it is
@@ -512 +512 @@
-words inserted into the buffer by completion.  The preferred case can
-be specified separately for routine names, keywords, classes and
- 
+
-This alist should therefore have entries for `routine' (normal
-functions and procedures, i.e. non-methods), `keyword', `class', and
@@ -599 +599 @@
-  :group 'idlwave-routine-info
-  :type '(repeat (regexp :tag "Match method:")))
-
+
-
-(defcustom idlwave-completion-show-classes 1
@@ -664 +664 @@
-completion, respectively.
-
- 
+
-keyword completion rule for specific methods, like INIT or
-GETPROPERTY.  In order to turn on class specification for the INIT
@@ -688 +688 @@
-
-When you specify a class, this information can be stored as a text
- 
+
-editing session, IDLWAVE will not have to ask again.  When this
-variable is non-nil, IDLWAVE will store and reuse the class information.
@@ -1066 +1066 @@
-  :type 'boolean)
-
- 
+
-  '(pros-and-functions batch-files idlwave-idl-keywords label goto
-                       common-blocks class-arrows)
@@ -1128 +1128 @@
-
-;; The following are the reserved words in IDL.  Maybe we should
-       
+
-;; Procedure declarations.  Fontify keyword plus procedure name.
-(defvar idlwave-idl-keywords
- 
+
-  ;; evaluate the form.
- 
+
-  ;;     (prin1-to-string
- 
+
-  ;;       "\\<\\("
- 
+
-  ;;        '("||" "&&" "and" "or" "xor" "not"
- 
+
-  ;;          "for" "do" "endfor"
- 
+
-  ;;          "case" "of" "endcase"
-  ;;          "switch" "break" "continue" "endswitch"
-  ;;          "begin" "end"
-  ;;          "repeat" "until" "endrep"
- 
+
-  ;;          "goto" "return"
-  ;;          "inherits" "mod"
@@ -1169 +1169 @@
-          ("[ \t]*\\(\\sw+\\)[ ,]*"
-           ;; Start with point after block name and comma
- 
+
-           nil
-           (1 font-lock-variable-name-face)       ; variable names
@@ -1224 +1224 @@
-       (all-operators
-        '("[-*^#+<>/]" (0 font-lock-keyword-face)))
-
+
-       ;; Arrows with text property `idlwave-class'
-       (class-arrows
@@ -1261 +1261 @@
-(defvar idlwave-font-lock-defaults
-  '((idlwave-font-lock-keywords
- 
+
-     idlwave-font-lock-keywords-2
-     idlwave-font-lock-keywords-3)
- 
- 
+
+
-    beginning-of-line))
-
- 
+
-     idlwave-font-lock-defaults) ; XEmacs
-
@@ -1276 +1276 @@
-only by whitespace.")
-
- 
+
-  "\\<\\(pro\\|function\\|begin\\|case\\|switch\\)\\>"
-  "Regular expression to find the beginning of a block. The case does
@@ -1353 +1353 @@
-   '(case . ("case\\>" nil))
-   '(switch . ("switch\\>" nil))
- 
+
-                             "\\(" idlwave-method-call "\\s *\\)?"
-                             idlwave-identifier
-                             "\\s *(") nil))
- 
+
-                      "\\(" idlwave-method-call "\\s *\\)?"
- 
+
-                      "\\( *\\($\\|\\$\\)\\|\\s *,\\)") nil))
- 
+
-                        "\\(" idlwave-variable "\\) *=") nil)))
-
+
-  "Associated list of statement matching regular expressions.
-Each regular expression matches the start of an IDL statement.  The
@@ -1386 +1386 @@
-;; of length one rather than a single character.
-;; The code in this file accepts either format for compatibility.
- 
+
-  "Character to be inserted for IDL comment indentation.
-Normally a space.")
@@ -1558 +1558 @@
-  ;; Bind the debug commands also with the special modifiers.
-  (let ((shift (memq 'shift idlwave-shell-debug-modifiers))
- 
+
-                            (copy-sequence idlwave-shell-debug-modifiers))))
- 
+
-      (vector (append mods-noshift (list (if shift ?C ?c))))
-      'idlwave-shell-save-and-run)
- 
+
-      (vector (append mods-noshift (list (if shift ?B ?b))))
-      'idlwave-shell-break-here)
- 
+
-      (vector (append mods-noshift (list (if shift ?E ?e))))
-      'idlwave-shell-run-region)))
@@ -1603 +1603 @@
-(define-key idlwave-mode-map "\C-c\C-i" 'idlwave-update-routine-info)
-(define-key idlwave-mode-map "\C-c="    'idlwave-resolve)
- 
+
-  (if (featurep 'xemacs) [(shift button3)] [(shift mouse-3)])
-  'idlwave-mouse-context-help)
@@ -1618 +1618 @@
-(idlwave-action-and-binding "="  '(idlwave-expand-equal -1 -1))
-
- 
+
-(idlwave-action-and-binding "<"  '(idlwave-custom-ltgtr-surround nil))
-(idlwave-action-and-binding ">"  '(idlwave-custom-ltgtr-surround 'gtr))
@@ -1651 +1651 @@
-
-(condition-case nil
- 
+
-                         "w" idlwave-mode-syntax-table)
-  (error nil))
@@ -1775 +1775 @@
-(defvar imenu-prev-index-position-function)
-;; defined later - so just make the compiler hush
-  
+
-(defvar idlwave-mode-debug-menu)
-
@@ -1859 +1859 @@
-   \\elif      IF-ELSE statement template
-   \\b         BEGIN
-
+
-   For a full list, use \\[idlwave-list-abbrevs].  Some templates also
-   have direct keybindings - see the list of keybindings below.
@@ -1901 +1901 @@
-  (interactive)
-  (kill-all-local-variables)
-
+
-  (if idlwave-startup-message
-      (message "Emacs IDLWAVE mode version %s." idlwave-mode-version))
-  (setq idlwave-startup-message nil)
-
+
-  (setq local-abbrev-table idlwave-mode-abbrev-table)
-  (set-syntax-table idlwave-mode-syntax-table)
-
+
-  (set (make-local-variable 'indent-line-function) 'idlwave-indent-and-action)
-
+
-  (make-local-variable idlwave-comment-indent-function)
-  (set idlwave-comment-indent-function 'idlwave-comment-hook)
-
+
-  (set (make-local-variable 'comment-start-skip) ";+[ \t]*")
-  (set (make-local-variable 'comment-start) ";")
@@ -1921 +1921 @@
-  (set (make-local-variable 'indent-tabs-mode) nil)
-  (set (make-local-variable 'completion-ignore-case) t)
-
+
-  (use-local-map idlwave-mode-map)
-
@@ -1931 +1931 @@
-  (setq major-mode 'idlwave-mode)
-  (setq abbrev-mode t)
-
+
-  (set (make-local-variable idlwave-fill-function) 'idlwave-auto-fill)
-  (setq comment-end "")
-  (set (make-local-variable 'comment-multi-line) nil)
- 
+
-       "[ \t\f]*$\\|[ \t]*;+[ \t]*$\\|;+[+=-_*]+$")
-  (set (make-local-variable 'paragraph-start) "[ \t\f]\\|[ \t]*;+[ \t]")
@@ -1944 +1944 @@
-  (if (boundp 'tag-table-alist)
-      (add-to-list 'tag-table-alist '("\\.pro$" . "IDLTAGS")))
-
+
-  ;; Font-lock additions - originally Phil Williams, then Ulrik Dickow
-  ;; Following line is for Emacs - XEmacs uses the corresponding property
@@ -1969 +1969 @@
-                     ";"
-                     'idlwave-forward-block nil))
-
+
-
-  ;; Make a local post-command-hook and add our hook to it
@@ -2001 +2001 @@
-    (if (not (file-directory-p idlwave-config-directory))
-        (make-directory idlwave-config-directory))
- 
- 
- 
+
+
+
-                                idlwave-config-directory)
- 
- 
+
+
-      idlwave-xml-system-rinfo-converted-file
-      idlwave-config-directory)
- 
- 
+
+
-                        idlwave-config-directory))
-    (idlwave-read-paths)  ; we may need these early
@@ -2029 +2029 @@
-;;
-;; Code Formatting ----------------------------------------------------
- 
+
-
-(defun idlwave-hard-tab ()
@@ -2172 +2172 @@
-            (setq end-pos pos))
-        (goto-char end-pos)
- 
+
-                   (progn
-                     (skip-chars-backward "a-zA-Z")
@@ -2194 +2194 @@
-           (t
-            (beep)
- 
+
-                     end1 end)
-            (sit-for 1))))))))
@@ -2206 +2206 @@
-        (assoc (downcase (match-string 0)) idlwave-block-matches))
-       ((looking-at "begin\\>")
- 
- 
+
+
-                       (point))))
-          (cond
@@ -2491 +2491 @@
-                     (idlwave-block-jump-out -1 'nomark)
-                     (point))))
- 
+
-                            idlwave-end-block-reg -1 'nomark eos))
-              (idlwave-beginning-of-statement)
@@ -2499 +2499 @@
-                   (idlwave-block-jump-out 1 'nomark)
-                   (point))))
- 
+
-                          idlwave-begin-block-reg 1 'nomark eos))
-            (idlwave-end-of-statement)
@@ -2513 +2513 @@
-    (goto-char (point-max))
-    (if (re-search-backward idlwave-doclib-start nil t)
- 
+
-          (setq beg (progn (beginning-of-line) (point)))
-          (if (re-search-forward idlwave-doclib-end nil t)
@@ -2546 +2546 @@
-    (if (re-search-backward idlwave-shell-prompt-pattern nil t)
-        (goto-char (match-end 0))))
-  
+
-    (if (save-excursion (forward-line -1) (idlwave-is-continuation-line))
-        (idlwave-previous-statement)
@@ -2623 +2623 @@
-    (when (re-search-forward ".*&" lim t)
-      (goto-char (match-end 0))
- 
+
-          (goto-char save-point)
-        (if (eq (char-after (- (point) 2)) ?&) (goto-char save-point))))
@@ -2640 +2640 @@
-  ;; - not followed by another ":" in explicit class, ala a->b::c
-  ;; As many in this mode, this function is heuristic and not an exact
- 
+
-  (let* ((start (point))
-         (eos (save-excursion (idlwave-end-of-statement) (point)))
@@ -2717 +2717 @@
-like assignment statements.  When nil, spaces are removed for keyword
-assignment.  Any other value keeps the current space around the `='.
-  
+
-
-Starting with IDL 6.0, a number of op= assignments are available.
@@ -2734 +2734 @@
-See `idlwave-surround'."
-  (if idlwave-surround-by-blank
- 
+
-          ((non-an-ops "\\(##\\|\\*\\|\\+\\|-\\|/\\|<\\|>\\|\\^\\)\\=")
- 
+
-            "\\s-\\(AND\\|EQ\\|GE\\|GT\\|LE\\|LT\\|MOD\\|NE\\|OR\\|XOR\\)\\=")
-           (len 1))
-
- 
+
+
-          (let ((case-fold-search t))
-            (backward-char)
- 
+
-                 (re-search-backward non-an-ops nil t)
-                 ;; Why doesn't ##? work for both?
- 
+
-                (setq len (1+ (length (match-string 1))))
-              (when (re-search-backward an-ops nil t)
-                ;(setq begin nil) ; won't modify begin
-                (setq len (1+ (length (match-string 1))))))))
-
-  
+
+
-            ;; Everything gets padded equally
-            (idlwave-surround before after len)
@@ -2763 +2763 @@
-                        (nth 2 (idlwave-where)))))
-            (cond ((or (memq what '(function-keyword procedure-keyword))
- 
- 
+
+
-                    ((null idlwave-pad-keyword)
-                     (idlwave-surround 0 0)
@@ -2770 +2770 @@
-                    (t))) ; leave any spaces alone
-                  (t (idlwave-surround before after len))))))))
-
+
-
-(defun idlwave-indent-and-action (&optional arg)
@@ -2777 +2777 @@
-  (interactive "p")
-  (save-excursion
- 
- 
+
+
-                                 (max 0 (- (point) 10)) t)
-             (looking-at "\\(end\\)\\([ \n\t]\\|\\'\\)"))
@@ -2788 +2788 @@
-    (setq arg current-prefix-arg)
-    (setq current-prefix-arg nil))
- 
+
-      (idlwave-indent-statement)
-    (idlwave-indent-line t)))
@@ -2923 +2923 @@
-                  (cond
-                   ;; Beginning of file
- 
+
-                        (idlwave-previous-statement)
-                      (setq beg-prev-pos (point)))
@@ -2933 +2933 @@
-                   ;; Begin block
-                   ((idlwave-look-at idlwave-begin-block-reg t)
- 
+
-                       idlwave-block-indent))
-                   ;; End Block
@@ -2944 +2944 @@
-                      ;;                      idlwave-end-offset
-                      ;;                      idlwave-block-indent))
-
+
-                   ;; Default to current indent
-                   ((idlwave-current-statement-indent))))))
@@ -2960 +2960 @@
-(defun idlwave-calculate-paren-indent (beg-reg end-reg close-exp)
-  "Calculate the continuation indent inside a paren group.
- 
+
-location of the open paren"
-  (let ((open (nth 1 (parse-partial-sexp beg-reg end-reg))))
@@ -3001 +3001 @@
-           (beg-last-statement (save-excursion (idlwave-previous-statement)
-                                               (point)))
- 
+
-                           (if (eq (line-beginning-position) end-reg)
-                               (goto-char beg-last-statement)
@@ -3008 +3008 @@
-                            idlwave-continuation-indent))
-           fancy-nonparen-indent fancy-paren-indent)
- 
+
-       ;; Align then with its matching if, etc.
-       ((let ((matchers '(("\\<if\\>" . "[ \t]*then")
-                          ("\\<\\(if\\|end\\(if\\)?\\)\\>" . "[ \t]*else")
-                          ("\\<\\(for\\|while\\)\\>" . "[ \t]*do")
- 
+
-                           "[ \t]*until")
-                          ("\\<case\\>" . "[ \t]*of")))
-              match cont-re)
-          (goto-char end-reg)
- 
+
-           (setq cont-re
-                 (catch 'exit
@@ -3027 +3027 @@
-           (idlwave-find-key cont-re -1 'nomark beg-last-statement)))
-        (if (looking-at "end") ;; that one's special
- 
+
-               (+ idlwave-block-indent idlwave-end-offset))
-          (idlwave-current-indent)))
@@ -3053 +3053 @@
-                    (close-exp (progn
-                                 (goto-char end-reg)
- 
+
-                                 (looking-at "\\s)")))
-                    indent-cons)
@@ -3087 +3087 @@
-                       nil
-                     (current-column)))
-
+
-                  ;; Continued assignment (with =):
-                  ((catch 'assign ;
-                     (while (looking-at "[^=\n\r]*\\(=\\)[ \t]*")
-                       (goto-char (match-end 0))
- 
+
-                           (throw 'assign t))))
-                   (unless (or
@@ -3154 +3154 @@
-         (case-fold-search t)
-         (limit (if (>= dir 0) (point-max) (point-min)))
- 
+
-                          idlwave-begin-block-reg
-                        idlwave-end-block-reg))
@@ -3165 +3165 @@
-                                idlwave-begin-unit-reg dir t limit)
-                             (end-of-line)
- 
+
-                              idlwave-end-unit-reg dir t limit)))
-                         limit)))
@@ -3190 +3190 @@
-        (unless comm-or-empty (setq min (min min (idlwave-current-indent)))))
-      (if (or comm-or-empty (and end-reg (>= (point) end-reg)))
- 
+
-        (min min (idlwave-current-indent))))))
-
@@ -3217 +3217 @@
-  (let (p)
-    (save-excursion
- 
+
-       (idlwave-look-at "\\<\\$")
-       (catch 'loop
- 
+
-                     (eq (forward-line -1) 0))
-           (if (setq p (idlwave-look-at "\\<\\$")) (throw 'loop p))))))))
@@ -3318 +3318 @@
-                                        (point))))
-               "[^;]"))
-
+
-        ;; Mark the beginning and end of the paragraph
-        (goto-char bcl)
@@ -3382 +3382 @@
-                (forward-line -1))
-              )
-
+
-          ;; No hang. Instead find minimum indentation of paragraph
-          ;; after first line.
@@ -3414 +3414 @@
-                 (current-column))
-               indent))
-
+
-        ;; try to keep point at its original place
-        (goto-char here)
@@ -3463 +3463 @@
-
-(defun idlwave-auto-fill ()
-  
+
-Only fills non-comment lines if `idlwave-fill-comment-line-only' is
-non-nil.  Places a continuation character at the end of the line if
@@ -3614 +3614 @@
-  (insert ", " (user-full-name))
-  (if (boundp 'user-mail-address)
- 
+
-    (insert " <" (user-login-name) "@" (system-name) ">"))
-  ;; Remove extra spaces from line
@@ -3640 +3640 @@
-        (progn
-          (goto-char beg)
- 
+
-               (concat idlwave-doc-modifications-keyword ":")
-               end t)
@@ -3738 +3738 @@
-     (save-excursion
-       (forward-char)
- 
+
-                                   "\\|[[(*+-/=,^><]\\)\\s-*\\*") limit t)))))
-
@@ -3784 +3784 @@
-      (if (stringp prompt)
-          (message prompt)))))
-
+
-(defun idlwave-rw-case (string)
-  "Make STRING have the case required by `idlwave-reserved-word-upcase'."
@@ -3802 +3802 @@
-  "Build skeleton IDL case statement."
-  (interactive)
- 
+
-   (idlwave-rw-case "case")
-   (idlwave-rw-case " of\n\nendcase")
@@ -3810 +3810 @@
-  "Build skeleton IDL switch statement."
-  (interactive)
- 
+
-   (idlwave-rw-case "switch")
-   (idlwave-rw-case " of\n\nendswitch")
@@ -3818 +3818 @@
-  "Build skeleton for loop statment."
-  (interactive)
- 
+
-   (idlwave-rw-case "for")
-   (idlwave-rw-case " do begin\n\nendfor")
@@ -3833 +3833 @@
-(defun idlwave-procedure ()
-  (interactive)
- 
+
-   (idlwave-rw-case "pro")
-   (idlwave-rw-case "\n\nreturn\nend")
@@ -3840 +3840 @@
-(defun idlwave-function ()
-  (interactive)
- 
+
-   (idlwave-rw-case "function")
-   (idlwave-rw-case "\n\nreturn\nend")
@@ -3854 +3854 @@
-(defun idlwave-while ()
-  (interactive)
- 
+
-   (idlwave-rw-case "while")
-   (idlwave-rw-case " do begin\n\nendwhile")
@@ -3933 +3933 @@
-  "How many outlawed buffers have tag TAG?"
-  (length (delq nil
- 
- 
+
+
-                 idlwave-outlawed-buffers))))
-
@@ -3948 +3948 @@
-               (kill-buffer (car entry))
-               (incf cnt)
- 
+
-                     (delq entry idlwave-outlawed-buffers)))
- 
+
-              (delq entry idlwave-outlawed-buffers))))
-    (message "%d buffer%s killed" cnt (if (= cnt 1) "" "s"))))
@@ -3962 +3962 @@
-    ;; Revoke license
-    (if entry
- 
+
-              (delq entry idlwave-outlawed-buffers)))
-    ;; Remove this function from the hook.
@@ -3981 +3981 @@
-  ;; Find FILE on the scanned lib path and return a buffer visiting it
-  ;; This is for, e.g., finding source with no user catalog
- 
+
-   ((null file) nil)
-   ((file-name-absolute-p file) file)
@@ -3996 +3996 @@
-  (let (directory directories cmd append status numdirs dir getsubdirs
-                  buffer save_buffer files numfiles item errbuf)
-
+
-    ;;
-    ;; Read list of directories
@@ -4048 +4048 @@
-                    (setq errbuf (get-buffer-create "*idltags-error*"))
-                    (setq status (+ status
- 
+
-                                               "sh" nil errbuf nil "-c"
-                                               (concat cmd append item)))
@@ -4062 +4062 @@
-                  (setq item (nth numfiles files))
-                  )))
-
+
-            (setq numdirs (1+ numdirs))
-            (setq dir (nth numdirs directories)))
@@ -4068 +4068 @@
-          (setq numdirs (1+ numdirs))
-          (setq dir (nth numdirs directories)))))
-
+
-    (setq errbuf (get-buffer-create "*idltags-error*"))
-    (if (= status 0)
@@ -4144 +4144 @@
-  (if (or (not (fboundp 'gethash))
-          (not (fboundp 'puthash)))
- 
+
-        (require 'cl)
-        (or (fboundp 'puthash)
@@ -4163 +4163 @@
-      (loop for entry in entries
-        for var = (car entry) for size = (nth 1 entry)
- 
+
-                   (make-hash-table ':size size ':test 'equal)))
-      (setq idlwave-sint-dirs nil
@@ -4173 +4173 @@
-      (loop for entry in entries
-        for var = (car entry) for size = (nth 1 entry)
- 
+
-                   (make-hash-table ':size size ':test 'equal))))))
-
@@ -4260 +4260 @@
-            (setq name (idlwave-sintern-method name set)))
-        (setq name (idlwave-sintern-routine name set)))
-
+
-      ;; The source
-      (let ((source-type (car source))
-            (source-file  (nth 1 source))
-  
+
-                             (file-name-as-directory default-dir)
-                           (nth 2 source)))
@@ -4273 +4273 @@
-            (setq source-lib (idlwave-sintern-libname source-lib set)))
-        (setq source (list source-type source-file source-dir source-lib)))
-
+
-      ;; The keywords
-      (setq kwds (mapcar (lambda (x)
@@ -4408 +4408 @@
-          (not (file-regular-p idlwave-user-catalog-file)))
-      (error "No catalog has been produced yet"))
-expand-file-name (invocation-name) (invocation-directory)
+concat invocation-directory invocation-name
-         (args (list "-batch"
-                     "-l" (expand-file-name "~/.emacs")
-                     "-l" "idlwave"
-                     "-f" "idlwave-rescan-catalog-directories"))
- 
+
-                         nil emacs args)))
-    (setq idlwave-catalog-process process)
- 
+
-     process
-     (lambda (pro why)
@@ -4433 +4433 @@
-;;  (system) | (lib pro_file dir "LIBNAME") | (user pro_file dir "USERLIB") |
-;;  (buffer pro_file dir) | (compiled pro_file dir)
- 
+
-;;                    ("HELPFILE2" (("KWD2" . link) ...)) ...)
-;;
@@ -4492 +4492 @@
-           ;; preparing work, load and renormalize everything anyway.
-           (override-idle (or arg idlwave-buffer-case-takes-precedence)))
-
+
-      (setq idlwave-buffer-routines nil
-            idlwave-compiled-routines nil
@@ -4503 +4503 @@
-                                     ((null idlwave-system-routines) t)
-                                     (t 'bufsh))))
-
+
-      (if idlwave-buffer-case-takes-precedence
-          ;; We can safely scan the buffer stuff first
@@ -4518 +4518 @@
-             (ask-shell (and shell-is-running
-                             idlwave-query-shell-for-routine-info)))
-
+
-        ;; Load the library catalogs again, first re-scanning the path
- 
+
-          (if shell-is-running
-              (idlwave-shell-send-command idlwave-shell-path-query
@@ -4540 +4540 @@
-            ;;    the shell might do it again.
-            (idlwave-concatenate-rinfo-lists nil 'run-hooks))
-
+
-        (when ask-shell
-          ;; Ask the shell about the routines it knows of.
@@ -4577 +4577 @@
-  ;; disk.  As a last fallback, load the (likely outdated) idlw-rinfo
-  ;; file distributed with older IDLWAVE versions (<6.0)
- 
+
-                     'noerror 'nomessage)
-               (idlwave-xml-system-routine-info-up-to-date))
@@ -4583 +4583 @@
-    (condition-case nil
-        (idlwave-convert-xml-system-routine-info)
- 
- 
+
+
-                     'noerror 'nomessage)
-         (if idlwave-system-routines
- 
+
-              "Failed to load converted routine info, using old conversion.")
- 
+
-            "Failed to convert XML routine info, falling back on idlw-rinfo.")
-           (if (not (load "idlw-rinfo" 'noerror 'nomessage))