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

[John-David T . Smith]

Index: emacs/lisp/progmodes/idlw-shell.el
diff -c emacs/lisp/progmodes/idlw-shell.el:3.30 
emacs/lisp/progmodes/idlw-shell.el:3.31
*** emacs/lisp/progmodes/idlw-shell.el:3.30     Wed Nov 17 11:53:13 2004
--- emacs/lisp/progmodes/idlw-shell.el  Thu Nov 18 05:28:03 2004
***************
*** 566,576 ****
  (defvar comint-last-input-start)
  (defvar comint-last-input-end)
  
  (defun idlwave-shell-temp-file (type)
    "Return a temp file, creating it if necessary.
  
! TYPE is either 'pro or 'rinfo, and idlwave-shell-temp-pro-file or
! idlwave-shell-temp-rinfo-save-file is set (respectively)."
    (cond 
     ((eq type 'rinfo)
      (or idlwave-shell-temp-rinfo-save-file 
--- 566,585 ----
  (defvar comint-last-input-start)
  (defvar comint-last-input-end)
  
+ ;; Other variables
+ (defvar idlwave-shell-temp-pro-file nil
+   "Absolute pathname for temporary IDL file for compiling regions")
+ 
+ (defvar idlwave-shell-temp-rinfo-save-file nil
+   "Absolute pathname for temporary IDL file save file for routine_info.
+ This is used to speed up the reloading of the routine info procedure
+ before use by the shell.")
+ 
  (defun idlwave-shell-temp-file (type)
    "Return a temp file, creating it if necessary.
  
! TYPE is either 'pro' or 'rinfo', and `idlwave-shell-temp-pro-file' or
! `idlwave-shell-temp-rinfo-save-file' is set (respectively)."
    (cond 
     ((eq type 'rinfo)
      (or idlwave-shell-temp-rinfo-save-file 
***************
*** 608,623 ****
        nil)
        file)))
  
- ;; Other variables
- (defvar idlwave-shell-temp-pro-file
-   nil
-   "Absolute pathname for temporary IDL file for compiling regions")
- 
- (defvar idlwave-shell-temp-rinfo-save-file
-   nil
-   "Absolute pathname for temporary IDL file save file for routine_info.
- This is used to speed up the reloading of the routine info procedure
- before use by the shell.")
  
  (defvar idlwave-shell-dirstack-query "cd,current=___cur & print,___cur"
    "Command used by `idlwave-shell-resync-dirs' to query IDL for 
--- 617,622 ----
***************
*** 2952,2957 ****
--- 2951,2960 ----
  (defvar idlwave-shell-examine-window-alist nil
    "Variable to hold the win/height pairs for all *Examine* windows.")
  
+ (defvar idlwave-shell-examine-map (make-sparse-keymap))
+ (define-key idlwave-shell-examine-map "q" 'idlwave-shell-examine-display-quit)
+ (define-key idlwave-shell-examine-map "c" 
'idlwave-shell-examine-display-clear)
+ 
  (defun idlwave-shell-examine-display ()
    "View the examine command output in a separate buffer."
    (let (win cur-beg cur-end)
***************
*** 3032,3041 ****
        (skip-chars-backward "\n")
        (recenter -1)))))
  
- (defvar idlwave-shell-examine-map (make-sparse-keymap))
- (define-key idlwave-shell-examine-map "q" 'idlwave-shell-examine-display-quit)
- (define-key idlwave-shell-examine-map "c" 
'idlwave-shell-examine-display-clear)
- 
  (defun idlwave-shell-examine-display-quit ()
    (interactive)
    (let ((win (selected-window)))
--- 3035,3040 ----
***************
*** 3411,3417 ****
  The breakpoint will be placed at the beginning of the statement on the
  line specified by BP or at the next IDL statement if that line is not
  a statement.  Determines IDL's internal representation for the
! breakpoint, which may have occured at a different line than
  specified.  If NO-SHOW is non-nil, don't do any updating."
    ;; Get and save the old breakpoints
    (idlwave-shell-send-command 
--- 3410,3416 ----
  The breakpoint will be placed at the beginning of the statement on the
  line specified by BP or at the next IDL statement if that line is not
  a statement.  Determines IDL's internal representation for the
! breakpoint, which may have occurred at a different line than
  specified.  If NO-SHOW is non-nil, don't do any updating."
    ;; Get and save the old breakpoints
    (idlwave-shell-send-command