;; idlw-shell.el --- run IDL as an inferior process of Emacs.
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010 Free Software Foundation, Inc.
;; Authors: J.D. Smith <jdsmith@as.arizona.edu>
;; Carsten Dominik <dominik@astro.uva.nl>
;; Chris Chase <chase@att.com>
;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
-;; Version: 6.1_em22
+;; Version: 6.1.22
;; Keywords: processes
+;; Package: idlwave
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;
;;
;; INSTALLATION:
;; =============
-;;
+;;
;; Follow the instructions in the INSTALL file of the distribution.
;; In short, put this file on your load path and add the following
;; lines to your .emacs file:
;;
;; The newest version of this file can be found on the maintainers
;; web site.
-;;
+;;
;; http://idlwave.org
-;;
+;;
;; DOCUMENTATION
;; =============
;;
;; it is a bug in XEmacs.
;; The Debug menu in source buffers *does* display the bindings correctly.
;;
-;;
+;;
;; CUSTOMIZATION VARIABLES
;; =======================
;;
(eval-when-compile (require 'cl))
(defvar idlwave-shell-have-new-custom nil)
-(eval-and-compile
- ;; Kludge to allow `defcustom' for Emacs 19.
- (condition-case () (require 'custom) (error nil))
- (if (and (featurep 'custom)
- (fboundp 'custom-declare-variable)
- (fboundp 'defface))
- ;; We've got what we needed
- (setq idlwave-shell-have-new-custom t)
- ;; We have the old or no custom-library, hack around it!
- (defmacro defgroup (&rest args) nil)
- (defmacro defcustom (var value doc &rest args)
- `(defvar ,var ,value ,doc))))
;;; Customizations: idlwave-shell group
:group 'idlwave)
(defcustom idlwave-shell-prompt-pattern "^\r? ?IDL> "
- "*Regexp to match IDL prompt at beginning of a line.
-For example, \"^\r?IDL> \" or \"^\r?WAVE> \".
+ "*Regexp to match IDL prompt at beginning of a line.
+For example, \"^\r?IDL> \" or \"^\r?WAVE> \".
The \"^\r?\" is needed, to indicate the beginning of the line, with
optional return character (which IDL seems to output randomly).
-This variable is used to initialize `comint-prompt-regexp' in the
+This variable is used to initialize `comint-prompt-regexp' in the
process buffer.
This is a fine thing to set in your `.emacs' file."
(defcustom idlwave-shell-use-dedicated-window nil
"*Non-nil means, never replace the shell frame with another buffer."
:group 'idlwave-shell-general-setup
- :type 'boolean)
+ :type 'boolean)
(defcustom idlwave-shell-use-dedicated-frame nil
"*Non-nil means, IDLWAVE should use a special frame to display shell buffer."
:type 'boolean)
(defcustom idlwave-shell-automatic-electric-debug 'breakpoint
- "Enter the electric-debug minor mode automatically.
+ "Enter the electric-debug minor mode automatically.
This occurs at a breakpoint or any other halt. The mode is exited
upon return to the main level. Can be set to 'breakpoint to enter
electric debug mode only when breakpoints are tripped."
(defcustom idlwave-shell-file-name-chars "~/A-Za-z0-9+:_.$#%={}\\- "
"The characters allowed in file names, as a string.
-Used for file name completion. Must not contain `'', `,' and `\"'
+Used for file name completion. Must not contain `'', `,' and `\"'
because these are used as separators by IDL."
:group 'idlwave-shell-general-setup
:type 'string)
(defcustom idlwave-shell-mode-hook '()
- "*Hook for customising `idlwave-shell-mode'."
+ "*Hook for customizing `idlwave-shell-mode'."
:group 'idlwave-shell-general-setup
:type 'hook)
is non-nil."
:group 'idlwave-shell-command-setup
:type 'file)
-
+
(defcustom idlwave-shell-show-commands
'(run misc breakpoint)
"*A list of command types to show output from in the shell.
:type '(choice
(const everything)
(set :tag "Checklist" :greedy t
- (const :tag "All .run and .compile commands" run)
+ (const :tag "All .run and .compile commands" run)
(const :tag "All breakpoint commands" breakpoint)
(const :tag "All debug and stepping commands" debug)
(const :tag "Close, window, retall, etc. commands" misc))))
:group 'idlwave-shell-command-setup
:type 'integer)
-(defcustom idlwave-shell-examine-alist
- `(("Print" . ,(concat "idlwave_print_safe,___,"
- (number-to-string
+(defcustom idlwave-shell-examine-alist
+ `(("Print" . ,(concat "idlwave_print_safe,___,"
+ (number-to-string
idlwave-shell-max-print-length)))
("Help" . "help,___")
("Structure Help" . "help,___,/STRUCTURE")
("Arg Present" . "print,arg_present(___)")
("Widget Valid" . "print,widget_info(___,/VALID)")
("Widget Geometry" . "help,widget_info(___,/GEOMETRY)"))
- "Alist of special examine commands for popup selection.
+ "Alist of special examine commands for popup selection.
The keys are used in the selection popup created by
`idlwave-shell-examine-select', and the corresponding value is sent as
a command to the shell, with special sequence `___' replaced by the
expression being examined."
:group 'idlwave-shell-command-setup
:type '(repeat
- (cons
+ (cons
(string :tag "Label ")
(string :tag "Command"))))
"*OBSOLETE VARIABLE, is no longer used.")
(defcustom idlwave-shell-separate-examine-output t
- "*Non-nil mean, put output of examine commands in their own buffer."
+ "*Non-nil means, put output of examine commands in their own buffer."
:group 'idlwave-shell-command-setup
:type 'boolean)
-
+
(defcustom idlwave-shell-comint-settings
'((comint-scroll-to-bottom-on-input . t)
(comint-scroll-to-bottom-on-output . t)
answer = GET_KBRD(1)
Since the IDLWAVE shell defines the system variable `!IDLWAVE_VERSION',
-you could actually check if you are running under Emacs before printing
+you could actually check if you are running under Emacs before printing
the magic strings. Here is a procedure which uses this.
Usage:
if keyword_set(on) then print,'<chars>' $
else if keyword_set(off) then print,'</chars>' $
else print,'<onechar>'
- endif
+ endif
end"
:group 'idlwave-shell-command-setup
:type '(list
;; Breakpoint Overlays etc
(defgroup idlwave-shell-highlighting-and-faces nil
- "Highlighting and Faces used by the IDLWAVE Shell mode."
+ "Highlighting and faces used by the IDLWAVE Shell mode."
:prefix "idlwave-shell"
:group 'idlwave)
:group 'idlwave-shell-highlighting-and-faces
:type 'string)
-(defcustom idlwave-shell-electric-stop-line-face
+(defcustom idlwave-shell-electric-stop-line-face
(prog1
(copy-face 'modeline 'idlwave-shell-electric-stop-line)
- (set-face-background 'idlwave-shell-electric-stop-line
+ (set-face-background 'idlwave-shell-electric-stop-line
idlwave-shell-electric-stop-color)
(condition-case nil
(set-face-foreground 'idlwave-shell-electric-stop-line nil)
(const :tag "Glyph or face." t)))
(defvar idlwave-shell-use-breakpoint-glyph t
- "Obsolete variable. See `idlwave-shell-mark-breakpoints.")
+ "Obsolete variable. See `idlwave-shell-mark-breakpoints'.")
(defcustom idlwave-shell-breakpoint-face 'idlwave-shell-bp
"*The face for breakpoint lines in the source code.
"Face for highlighting lines with breakpoints."
:group 'idlwave-shell-highlighting-and-faces))
-(defcustom idlwave-shell-disabled-breakpoint-face
+(defcustom idlwave-shell-disabled-breakpoint-face
'idlwave-shell-disabled-bp
"*The face for disabled breakpoint lines in the source code.
Allows you to choose the font, color and other properties for
TYPE is either 'pro' or 'rinfo', and `idlwave-shell-temp-pro-file' or
`idlwave-shell-temp-rinfo-save-file' is set (respectively)."
- (cond
+ (cond
((eq type 'rinfo)
- (or idlwave-shell-temp-rinfo-save-file
- (setq idlwave-shell-temp-rinfo-save-file
+ (or idlwave-shell-temp-rinfo-save-file
+ (setq idlwave-shell-temp-rinfo-save-file
(idlwave-shell-make-temp-file idlwave-shell-temp-pro-prefix))))
((eq type 'pro)
(or idlwave-shell-temp-pro-file
- (setq idlwave-shell-temp-pro-file
+ (setq idlwave-shell-temp-pro-file
(idlwave-shell-make-temp-file idlwave-shell-temp-pro-prefix))))
- (t (error "Wrong argument (idlwave-shell-temp-file): %s"
+ (t (error "Wrong argument (idlwave-shell-temp-file): %s"
(symbol-name type)))))
-
+
(defun idlwave-shell-make-temp-file (prefix)
"Create a temporary file."
(defvar idlwave-shell-dirstack-query "cd,current=___cur & print,___cur"
- "Command used by `idlwave-shell-resync-dirs' to query IDL for
+ "Command used by `idlwave-shell-resync-dirs' to query IDL for
the directory stack.")
(defvar idlwave-shell-path-query "print,'PATH:<'+transpose(expand_path(!PATH,/ARRAY))+'>' & print,'SYSDIR:<'+!dir+'>'"
"The command which gets !PATH and !DIR info from the shell.")
(defvar idlwave-shell-mode-line-info nil
- "Additional info displayed in the mode line")
+ "Additional info displayed in the mode line.")
(defvar idlwave-shell-default-directory nil
"The default directory in the idlwave-shell buffer, of outside use.")
window-system) ; Window systems always
(progn
(setq idlwave-shell-stop-line-overlay (make-overlay 1 1))
- (overlay-put idlwave-shell-stop-line-overlay
+ (overlay-put idlwave-shell-stop-line-overlay
'face idlwave-shell-stop-line-face))))
(t
(if window-system
(progn
(setq idlwave-shell-stop-line-overlay (make-overlay 1 1))
- (overlay-put idlwave-shell-stop-line-overlay
+ (overlay-put idlwave-shell-stop-line-overlay
'face idlwave-shell-stop-line-face)))))
;; Now the expression and output overlays
(overlay-put idlwave-shell-output-overlay
'face idlwave-shell-output-face)
-(copy-face idlwave-shell-stop-line-face
+(copy-face idlwave-shell-stop-line-face
'idlwave-shell-pending-stop)
-(copy-face idlwave-shell-electric-stop-line-face
+(copy-face idlwave-shell-electric-stop-line-face
'idlwave-shell-pending-electric-stop)
(set-face-background 'idlwave-shell-pending-stop "gray70")
(set-face-background 'idlwave-shell-pending-electric-stop "gray70")
(defvar idlwave-shell-bp-query "help,/breakpoints"
- "Command to obtain list of breakpoints")
+ "Command to obtain list of breakpoints.")
(defvar idlwave-shell-command-output nil
"String for accumulating current command output.")
This is evaluated if it is a list or called with funcall.")
(defvar idlwave-shell-sentinel-hook nil
- "Hook run when the idl process exits.")
+ "Hook run when the IDL process exits.")
(defvar idlwave-shell-hide-output nil
- "If non-nil the process output is not inserted into the output
-buffer.")
+ "If non-nil the process output is not inserted into the output buffer.")
(defvar idlwave-shell-show-if-error nil
"If non-nil the process output is inserted into the output buffer if
"List of commands to be sent to IDL.
Each element of the list is list of \(CMD PCMD HIDE\), where CMD is a
string to be sent to IDL and PCMD is a post-command to be placed on
-`idlwave-shell-post-command-hook'. If HIDE is non-nil, hide the output
-from command CMD. PCMD and HIDE are optional.")
+`idlwave-shell-post-command-hook'. If HIDE is non-nil, hide the output
+from command CMD. PCMD and HIDE are optional.")
(defun idlwave-shell-buffer ()
"Name of buffer associated with IDL process.
-The name of the buffer is made by surrounding `idlwave-shell-process-name
+The name of the buffer is made by surrounding `idlwave-shell-process-name'
with `*'s."
(concat "*" idlwave-shell-process-name "*"))
;;; The following are the types of messages we attempt to catch to
;;; resync our idea of where IDL execution currently is.
-;;;
+;;;
(defvar idlwave-shell-halt-frame nil
"The frame associated with halt/breakpoint messages.")
(defconst idlwave-shell-halt-messages-re
(mapconcat 'identity idlwave-shell-halt-messages "\\|")
- "The regular expression computed from idlwave-shell-halt-messages")
+ "The regular expression computed from `idlwave-shell-halt-messages'.")
(defconst idlwave-shell-trace-message-re
"^% At " ;; First line of a trace message
(defconst idlwave-shell-electric-debug-help
" ==> IDLWAVE Electric Debug Mode Help <==
-
+
Break Point Setting and Clearing:
b Set breakpoint ([C-u b] for conditional, [C-n b] nth hit, etc.).
d Clear nearby breakpoint.
Examining Expressions (with prefix for examining the region):
p Print expression near point or in region ([C-u p]).
? Help on expression near point or in region ([C-u ?]).
- x Examine expression near point or in region ([C-u x]) with
+ x Examine expression near point or in region ([C-u x]) with
letter completion of the examine type.
e Prompt for an expression to print.
-----------------
RET after the end of the process' output sends the text from the
end of process to the end of the current line. RET before end of
- process output copies the current line (except for the prompt) to the
- end of the buffer.
+ process output copies the current line (except for the prompt) to
+ the end of the buffer.
Command history, searching of previous commands, command line
editing are available via the comint-mode key bindings, by default
`\\[idlwave-routine-info]' displays information about an IDL routine near point,
just like in `idlwave-mode'. The module used is the one at point or
the one whose argument list is being edited.
- To update IDLWAVE's knowledge about compiled or edited modules, use
+ To update IDLWAVE's knowledge about compiled or edited modules, use
\\[idlwave-update-routine-info].
\\[idlwave-find-module] find the source of a module.
\\[idlwave-resolve] tells IDL to compile an unresolved module.
\\[idlwave-context-help] shows the online help on the item at
point, if online help has been installed.
-
+
4. Debugging
---------
A complete set of commands for compiling and debugging IDL programs
- is available from the menu. Also keybindings starting with a
+ is available from the menu. Also keybindings starting with a
`C-c C-d' prefix are available for most commands in the *idl* buffer
and also in source buffers. The best place to learn about the
keybindings is again the menu.
Info documentation for this package is available. Use \\[idlwave-info]
to display (complain to your sysadmin if that does not work).
For Postscript and HTML versions of the documentation, check IDLWAVE's
- homepage at `http://idlwave.org'.
+ homepage at URL `http://idlwave.org'.
IDLWAVE has customize support - see the group `idlwave'.
8. Keybindings
(idlwave-shell-display-line nil)
(setq idlwave-shell-calling-stack-index 0)
(setq idlwave-shell-only-prompt-pattern
- (concat "\\`[ \t\n]*"
- (substring idlwave-shell-prompt-pattern 1)
+ (concat "\\`[ \t\n]*"
+ (substring idlwave-shell-prompt-pattern 1)
"[ \t\n]*\\'"))
(when idlwave-shell-query-for-class
(while (setq entry (pop list))
(set (make-local-variable (car entry)) (cdr entry)))))
-
- (unless (memq 'comint-carriage-motion
+
+ (unless (memq 'comint-carriage-motion
(default-value 'comint-output-filter-functions))
;; Strip those pesky ctrl-m's.
(add-hook 'comint-output-filter-functions
(lambda (string)
(when (string-match "\r" string)
- (let ((pmark (process-mark (get-buffer-process
+ (let ((pmark (process-mark (get-buffer-process
(current-buffer)))))
(save-excursion
;; bare CR -> delete preceding line
(idlwave-shell-send-command idlwave-shell-initial-commands nil 'hide)
;; Turn off IDL's ^d interpreting, and define a system
;; variable which knows the version of IDLWAVE
- (idlwave-shell-send-command
+ (idlwave-shell-send-command
(format "defsysv,'!idlwave_version','%s',1" idlwave-mode-version)
nil 'hide)
;; Read the paths, and save if they changed
path-changed sysdir-changed)
(when sysdir
(setq idlwave-system-directory sysdir)
- (if (setq sysdir-changed
+ (if (setq sysdir-changed
(not (string= idlwave-system-directory old-sys-dir)))
(put 'idlwave-system-directory 'from-shell t)))
;; Preserve any existing flags
- (setq idlwave-path-alist
+ (setq idlwave-path-alist
(mapcar (lambda (x)
(let ((old-entry (assoc x old-path-alist)))
(if old-entry
dirs))
(if (setq path-changed (not (equal idlwave-path-alist old-path-alist)))
(put 'idlwave-path-alist 'from-shell t))
- (if idlwave-path-alist
+ (if idlwave-path-alist
(if (and (not no-write)
idlwave-auto-write-paths
(or sysdir-changed path-changed)
(fset 'idl-shell 'idlwave-shell))
(defvar idlwave-shell-idl-wframe nil
- "Frame for displaying the idl shell window.")
+ "Frame for displaying the IDL shell window.")
(defvar idlwave-shell-display-wframe nil
- "Frame for displaying the idl source files.")
+ "Frame for displaying the IDL source files.")
(defvar idlwave-shell-calling-stack-index 0)
(defvar idlwave-shell-calling-stack-routine nil)
(frame (selected-frame)))
(catch 'exit
(while flist
- (if (not (eq (car flist)
- idlwave-shell-idl-wframe))
+ (if (not (eq (car flist)
+ idlwave-shell-idl-wframe))
(throw 'exit (car flist))
(setq flist (cdr flist))))))
(make-frame))
;; We do not have a source frame, so we use this one.
(setq idlwave-shell-display-wframe (selected-frame)))
;; Return a new frame
- (setq idlwave-shell-idl-wframe
+ (setq idlwave-shell-idl-wframe
(make-frame idlwave-shell-frame-parameters)))))
-
+
;;;###autoload
(defun idlwave-shell (&optional arg quick)
"Run an inferior IDL, with I/O through buffer `(idlwave-shell-buffer)'.
(delete-other-windows))
(and idlwave-shell-use-dedicated-frame
(setq idlwave-shell-idl-wframe (selected-frame)))
- (add-hook 'idlwave-shell-sentinel-hook
+ (add-hook 'idlwave-shell-sentinel-hook
'save-buffers-kill-emacs t))
;; A non-nil arg means, we want a dedicated frame. This will last
;; for the current editing session.
(if arg (setq idlwave-shell-use-dedicated-frame t))
(if (equal arg '(16)) (setq idlwave-shell-use-dedicated-frame nil))
-
+
;; Check if the process still exists. If not, create it.
(unless (comint-check-proc (idlwave-shell-buffer))
(let* ((prg (or idlwave-shell-explicit-file-name "idl"))
(if (eq (selected-frame) (window-frame window))
(select-window window))))
;; Save the paths at the end, if they are from the Shell and new.
- (add-hook 'idlwave-shell-sentinel-hook
+ (add-hook 'idlwave-shell-sentinel-hook
(lambda ()
- (if (and
+ (if (and
idlwave-auto-write-paths
idlwave-path-alist
(not idlwave-library-path)
(setq idlwave-shell-show-commands (list type))))
-(defun idlwave-shell-send-command (&optional cmd pcmd hide preempt
+(defun idlwave-shell-send-command (&optional cmd pcmd hide preempt
show-if-error)
"Send a command to IDL process.
-\(CMD PCMD HIDE\) are placed at the end of `
-idlwave-shell-pending-commands'. If IDL is ready the first command,
-CMD, in `idlwave-shell-pending-commands' is sent to the IDL process.
+\(CMD PCMD HIDE\) are placed at the end of `idlwave-shell-pending-commands'.
+If IDL is ready the first command in `idlwave-shell-pending-commands',
+CMD, is sent to the IDL process.
If optional second argument PCMD is non-nil it will be placed on
`idlwave-shell-post-command-hook' when CMD is executed.
If optional fourth argument PREEMPT is non-nil CMD is put at front of
`idlwave-shell-pending-commands'. If PREEMPT is 'wait, wait for all
output to complete and the next prompt to arrive before returning
-\(useful if you need an answer now\). IDL is considered ready if the
-prompt is present and if `idlwave-shell-ready' is non-nil.
+\(useful if you need an answer now\). IDL is considered ready if the
+prompt is present and if `idlwave-shell-ready' is non-nil.
If SHOW-IF-ERROR is non-nil, show the output if it contains an error
message, independent of what HIDE is set to."
; (setq hide nil) ; FIXME: turn this on for debugging only
-; (if (null cmd)
+; (if (null cmd)
; (progn
-; (message "SENDING Pending commands: %s"
+; (message "SENDING Pending commands: %s"
; (prin1-to-string idlwave-shell-pending-commands)))
; (message "SENDING %s|||%s" cmd pcmd))
- (if (and (symbolp idlwave-shell-show-commands)
+ (if (and (symbolp idlwave-shell-show-commands)
(eq idlwave-shell-show-commands 'everything))
(setq hide nil))
(let ((save-buffer (current-buffer))
(if (or (not (setq buf (get-buffer (idlwave-shell-buffer))))
(not (setq proc (get-buffer-process buf))))
(if (not idlwave-shell-automatic-start)
- (error
+ (error "%s"
(substitute-command-keys
"You need to first start an IDL shell with \\[idlwave-shell]"))
(idlwave-shell-recenter-shell-window)
(append (list (list cmd pcmd hide show-if-error))
idlwave-shell-pending-commands)
;; Put at end.
- (append idlwave-shell-pending-commands
+ (append idlwave-shell-pending-commands
(list (list cmd pcmd hide show-if-error))))))
;; Check if IDL ready
(let ((save-point (point-marker)))
(if (or (not (setq buf (get-buffer (idlwave-shell-buffer))))
(not (setq proc (get-buffer-process buf))))
(funcall errf "Shell is not running"))
- (if (equal c ?\C-g)
+ (if (equal c ?\C-g)
(funcall errf "Abort")
(comint-send-string proc (char-to-string c)))))
(if idlwave-shell-ready
(funcall errf "No IDL program seems to be waiting for input"))
- ;; OK, start the loop
+ ;; OK, start the loop
(message "Character mode on: Sending single chars (`C-g' to exit)")
(message
(catch 'exit
(arg (if up arg (- arg))))
(if (eq t idlwave-shell-arrows-do-history) (goto-char proc-pos))
(if (and idlwave-shell-arrows-do-history
- (>= (1+ (save-excursion (end-of-line) (point))) proc-pos))
+ (>= (1+ (point-at-eol)) proc-pos))
(comint-previous-input arg)
(forward-line (- arg)))))
(setq output (substring output (string-match "\n" output)))
(while (string-match "\\(\n\\|\\`\\)%.*\\(\n .*\\)*" output)
(setq output (replace-match "" nil t output)))
- (unless
+ (unless
(string-match idlwave-shell-only-prompt-pattern output)
output))
(defvar idlwave-shell-hidden-output-buffer " *idlwave-shell-hidden-output*"
"Buffer containing hidden output from IDL commands.")
(defvar idlwave-shell-current-state nil)
-
+
(defun idlwave-shell-filter (proc string)
"Watch for IDL prompt and filter incoming text.
When the IDL prompt is received executes `idlwave-shell-post-command-hook'
(idlwave-shell-input-mode-magic
(concat idlwave-shell-accumulation string)))
(setq idlwave-shell-accumulation
- (substring string
- (progn (string-match "\\(.*[\n\r]+\\)*"
+ (substring string
+ (progn (string-match "\\(.*[\n\r]+\\)*"
string)
(match-end 0)))))
(setq idlwave-shell-accumulation
(concat idlwave-shell-accumulation string)))
-
-
-;;; Test/Debug code
- ;(with-current-buffer
- ; (get-buffer-create "*idlwave-shell-output*")
- ; (goto-char (point-max))
- ; (insert "\nReceived STRING\n===>\n" string "\n<====\n"))
-
+
+
+ ;; ;; Test/Debug code
+ ;;(with-current-buffer
+ ;; (get-buffer-create "*idlwave-shell-output*")
+ ;; (goto-char (point-max))
+ ;; (insert "\nReceived STRING\n===>\n" string "\n<====\n"))
+
;; Check for prompt in current accumulating output
(when (setq idlwave-shell-ready
(string-match idlwave-shell-prompt-pattern
idlwave-shell-accumulation))
;; Gather the command output
(if idlwave-shell-hide-output
- (save-excursion
- (set-buffer idlwave-shell-hidden-output-buffer)
+ (with-current-buffer idlwave-shell-hidden-output-buffer
(setq full-output (buffer-string))
(goto-char (point-max))
(re-search-backward idlwave-shell-prompt-pattern nil t)
(goto-char (match-end 0))
(setq idlwave-shell-command-output
- (buffer-substring-no-properties
+ (buffer-substring-no-properties
(point-min) (point)))
(delete-region (point-min) (point)))
(setq idlwave-shell-command-output
(if (and idlwave-shell-show-if-error
(eq idlwave-shell-current-state 'error))
(idlwave-shell-comint-filter proc full-output)
- ;; If it's only *mostly* hidden, filter % lines,
+ ;; If it's only *mostly* hidden, filter % lines,
;; and show anything that remains
(if (eq idlwave-shell-hide-output 'mostly)
(let ((filtered
- (idlwave-shell-filter-hidden-output
+ (idlwave-shell-filter-hidden-output
full-output)))
- (if filtered
- (idlwave-shell-comint-filter
+ (if filtered
+ (idlwave-shell-comint-filter
proc filtered))))))
-
+
;; Call the post-command hook
(if (listp idlwave-shell-post-command-hook)
(progn
idlwave-shell-post-command-hook nil
idlwave-shell-hide-output nil
idlwave-shell-show-if-error nil))
- ;; Done with post command. Do pending command if
+ ;; Done with post command. Do pending command if
;; any.
(idlwave-shell-send-command)))
(store-match-data data)))))
(let* ((buf (idlwave-shell-buffer))
(win (get-buffer-window buf)))
(when (get-buffer buf)
- (save-excursion
- (set-buffer (idlwave-shell-buffer))
+ (with-current-buffer (idlwave-shell-buffer)
(goto-char (point-max))
(insert (format "\n\n Process %s %s" process event))
(if (and idlwave-shell-save-command-history
(condition-case nil
(comint-write-input-ring)
(error nil)))))
-
+
(when (and (> (length (frame-list)) 1)
(frame-live-p idlwave-shell-idl-wframe))
(delete-frame idlwave-shell-idl-wframe)
(idlwave-shell-cleanup)
;; Run the hook, if possible in the shell buffer.
(if (get-buffer buf)
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(run-hooks 'idlwave-shell-sentinel-hook))
(run-hooks 'idlwave-shell-sentinel-hook))))
;; in module and file names. I am not sure if it will be necessary to
;; change this. Currently it seems to work the way it is.
(defvar idlwave-shell-syntax-error
- "^% Syntax error.\\s-*\n\\s-*At:\\s-*\\(.*\\),\\s-*Line\\s-*\\(.*\\)"
- "A regular expression to match an IDL syntax error.
-The 1st pair matches the file name, the second pair matches the line
+ "^% Syntax error.\\s-*\n\\s-*At:\\s-*\\(.*\\),\\s-*Line\\s-*\\(.*\\)"
+ "A regular expression to match an IDL syntax error.
+The first pair matches the file name, the second pair matches the line
number.")
(defvar idlwave-shell-other-error
"^% .*\n\\s-*At:\\s-*\\(.*\\),\\s-*Line\\s-*\\(.*\\)"
"A regular expression to match any IDL error.")
-(defvar idlwave-shell-halting-error
+(defvar idlwave-shell-halting-error
"^% .*\n\\([^%].*\n\\)*% Execution halted at:\\(\\s-*\\S-+\\s-*[0-9]+\\s-*.*\\)\n"
"A regular expression to match errors which halt execution.")
-(defvar idlwave-shell-cant-continue-error
+(defvar idlwave-shell-cant-continue-error
"^% Can't continue from this point.\n"
"A regular expression to match errors stepping errors.")
(defvar idlwave-shell-file-line-message
- (concat
+ (concat
"\\(" ; program name group (1)
"\\$MAIN\\$\\|" ; main level routine
"\\<[a-zA-Z][a-zA-Z0-9_$:]*" ; start with a letter followed by [..]
"\\)" ; end line number group (5)
)
"*A regular expression to parse out the file name and line number.
-The 1st group should match the subroutine name.
+The 1st group should match the subroutine name.
The 3rd group is the line number.
The 5th group is the file name.
All parts may contain linebreaks surrounded by spaces. This is important
(defvar idlwave-shell-electric-debug-mode) ; defined by easy-mmode
(defun idlwave-shell-scan-for-state ()
- "Scan for state info. Looks for messages in output from last IDL
-command indicating where IDL has stopped. The types of messages we are
-interested in are execution halted, stepped, breakpoint, interrupted
-at and trace messages. For breakpoint messages process any attached
-count or command parameters. Update the stop line if a message is
-found. The variable `idlwave-shell-current-state' is set to 'error,
-'halt, or 'breakpoint, which describes the status, or nil for none of
+ "Scan for state info.
+Looks for messages in output from last IDL command indicating where
+IDL has stopped. The types of messages we are interested in are
+execution halted, stepped, breakpoint, interrupted at and trace
+messages. For breakpoint messages process any attached count or
+command parameters. Update the stop line if a message is found.
+The variable `idlwave-shell-current-state' is set to 'error, 'halt,
+or 'breakpoint, which describes the status, or nil for none of
the above."
(let (trace)
(cond
;; Make sure we have output
((not idlwave-shell-command-output))
-
+
;; First Priority: Syntax and other errors
- ((or
+ ((or
(string-match idlwave-shell-syntax-error
idlwave-shell-command-output)
(string-match idlwave-shell-other-error
(setq idlwave-shell-error-last (point)))
(setq idlwave-shell-current-state 'error)
(idlwave-shell-goto-next-error))
-
+
;; Second Priority: Halting errors
((string-match idlwave-shell-halting-error
idlwave-shell-command-output)
;; Grab the file and line state info.
(setq idlwave-shell-calling-stack-index 0)
(setq idlwave-shell-halt-frame
- (idlwave-shell-parse-line
- (substring idlwave-shell-command-output
+ (idlwave-shell-parse-line
+ (substring idlwave-shell-command-output
(match-beginning 2)))
idlwave-shell-current-state 'error)
(idlwave-shell-display-line (idlwave-shell-pc-frame)))
-
+
;; Third Priority: Various types of innocuous HALT and
;; TRACEBACK messages.
((or (setq trace (string-match idlwave-shell-trace-message-re
;; Grab the file and line state info.
(setq idlwave-shell-calling-stack-index 0)
(setq idlwave-shell-halt-frame
- (idlwave-shell-parse-line
+ (idlwave-shell-parse-line
(substring idlwave-shell-command-output (match-end 0))))
(setq idlwave-shell-current-state 'halt)
;; Don't debug trace messages
- (idlwave-shell-display-line
+ (idlwave-shell-display-line
(idlwave-shell-pc-frame) nil
(if trace 'disable
(if idlwave-shell-electric-debug-mode 'force))))
-
- ;; Fourth Priority: Breakpoints
+
+ ;; Fourth Priority: Breakpoints
((string-match idlwave-shell-break-message
idlwave-shell-command-output)
(setq idlwave-shell-calling-stack-index 0)
- (setq idlwave-shell-halt-frame
- (idlwave-shell-parse-line
+ (setq idlwave-shell-halt-frame
+ (idlwave-shell-parse-line
(substring idlwave-shell-command-output (match-end 0))))
;; We used to count hits on breakpoints
;; this is no longer supported since IDL breakpoints
;; have learned counting.
;; Do breakpoint command processing
- (let ((bp (assoc
+ (let ((bp (assoc
(list
(nth 0 idlwave-shell-halt-frame)
(nth 1 idlwave-shell-halt-frame))
;; A breakpoint that we did not know about - perhaps it was
;; set by the user... Let's update our list.
(idlwave-shell-bp-query)))
- (setq idlwave-shell-current-state 'breakpoint)
+ (setq idlwave-shell-current-state 'breakpoint)
(idlwave-shell-display-line (idlwave-shell-pc-frame)))
-
+
;; Last Priority: Can't Step errors
((string-match idlwave-shell-cant-continue-error
idlwave-shell-command-output)
;IDL5. These line breaks can be right in the middle of procedure
;or file names.
;It is very difficult to come up with a robust solution. This one seems
-;to be pretty good though.
+;to be pretty good though.
;
;Here is in what ways it improves over the previous solution:
;
(setq procedure (match-string 1 string)
number (match-string 3 string)
file (match-string 5 string))
-
+
;; Repair the strings
(setq procedure (idlwave-shell-repair-string procedure))
(setq number (idlwave-shell-repair-string number))
file name."
(let ((file1 "") (file2 "") (start 0))
;; We scan no further than to the next "^%" line
- (if (string-match "^%" file)
+ (if (string-match "^%" file)
(setq file (substring file 0 (match-beginning 0))))
;; Take out the line breaks
(while (string-match "[ \t]*\n[ \t]*" file start)
The size is given by `idlwave-shell-graphics-window-size'."
(interactive "P")
(let ((n (if n (prefix-numeric-value n) 0)))
- (idlwave-shell-send-command
+ (idlwave-shell-send-command
(apply 'format "window,%d,xs=%d,ys=%d"
n idlwave-shell-graphics-window-size)
nil (idlwave-shell-hide-p 'misc) nil t)))
Also get rid of widget events in the queue."
(interactive "P")
(save-selected-window
- ;;if (widget_info(/MANAGED))[0] gt 0 then for i=0,n_elements(widget_info(/MANAGED))-1 do widget_control,(widget_info(/MANAGED))[i],/clear_events &
- (idlwave-shell-send-command "retall" nil
- (if (idlwave-shell-hide-p 'misc) 'mostly)
+ ;;if (widget_info(/MANAGED))[0] gt 0 then for i=0,n_elements(widget_info(/MANAGED))-1 do widget_control,(widget_info(/MANAGED))[i],/clear_events &
+ (idlwave-shell-send-command "retall" nil
+ (if (idlwave-shell-hide-p 'misc) 'mostly)
nil t)
(idlwave-shell-display-line nil)))
(defun idlwave-shell-closeall (&optional arg)
"Close all open files."
(interactive "P")
- (idlwave-shell-send-command "close,/all" nil
+ (idlwave-shell-send-command "close,/all" nil
(idlwave-shell-hide-p 'misc) nil t))
(defun idlwave-shell-quit (&optional arg)
- "Exit the idl process after confirmation.
+ "Exit the IDL process after confirmation.
With prefix ARG, exit without confirmation."
(interactive "P")
(if (not (idlwave-shell-is-running))
(defun idlwave-shell-reset (&optional hidden)
"Reset IDL. Return to main level and destroy the leftover variables.
-This issues the following commands:
+This issues the following commands:
RETALL
WIDGET_CONTROL,/RESET
CLOSE, /ALL
HEAP_GC, /VERBOSE"
;; OBJ_DESTROY, OBJ_VALID() FIXME: should this be added?
(interactive "P")
- (when (or idlwave-shell-reset-no-prompt
+ (when (or idlwave-shell-reset-no-prompt
(yes-or-no-p "Really Reset IDL and discard current session? "))
(message "Resetting IDL")
(setq idlwave-shell-calling-stack-index 0)
;; Set dummy values and kill the text
(setq sep "@" sep-re "@ *" text "")
(if idlwave-idlwave_routine_info-compiled
- (message
- "Routine Info warning: No match for BEGIN line in \n>>>\n%s\n<<<\n"
+ (message
+ "Routine Info warning: No match for BEGIN line in \n>>>\n%s\n<<<\n"
idlwave-shell-command-output)))
(if (string-match "^>>>END OF IDLWAVE ROUTINE INFO.*" text)
(setq text (substring text 0 (match-beginning 0)))
(if idlwave-idlwave_routine_info-compiled
- (message
- "Routine Info warning: No match for END line in \n>>>\n%s\n<<<\n"
+ (message
+ "Routine Info warning: No match for END line in \n>>>\n%s\n<<<\n"
idlwave-shell-command-output)))
;; Match the output lines
(while (string-match "^IDLWAVE-\\(PRO\\|FUN\\): \\(.*\\)" text start)
key (nth 4 specs)
keys (if (and (stringp key)
(not (string-match "\\` *\\'" key)))
- (mapcar 'list
+ (mapcar 'list
(delete "" (idlwave-split-string key " +")))))
(setq name (idlwave-sintern-routine-or-method name class t)
class (idlwave-sintern-class class t)
file (if (equal file "") nil file)
- keys (mapcar (lambda (x)
+ keys (mapcar (lambda (x)
(list (idlwave-sintern-keyword (car x) t))) keys))
-
+
;; In the following ignore routines already defined in buffers,
;; assuming that if the buffer stuff differs, it is a "new"
;; version, not yet compiled, and should take precedence.
;; We could do the same for the library to avoid duplicates -
;; but I think frequently a user might have several versions of
- ;; the same function in different programs, and in this case the
+ ;; the same function in different programs, and in this case the
;; compiled one will be the best guess of all versions.
;; Therefore, we leave duplicates of library routines in.
(cond ((string= name "$MAIN$")) ; ignore this one
((and (string= type "PRO")
;; FIXME: is it OK to make the buffer routines dominate?
(or t (null file)
- (not (idlwave-rinfo-assq name 'pro class
+ (not (idlwave-rinfo-assq name 'pro class
idlwave-buffer-routines)))
;; FIXME: is it OK to make the library routines dominate?
- ;;(not (idlwave-rinfo-assq name 'pro class
+ ;;(not (idlwave-rinfo-assq name 'pro class
;; idlwave-library-routines))
)
- (setq entry (list name 'pro class
- (cons 'compiled
+ (setq entry (list name 'pro class
+ (cons 'compiled
(if file
(list
(file-name-nondirectory file)
- (idlwave-sintern-dir
+ (idlwave-sintern-dir
(file-name-directory file)))))
cs (cons nil keys)))
- (if file
+ (if file
(push entry idlwave-compiled-routines)
(push entry idlwave-unresolved-routines)))
-
+
((and (string= type "FUN")
;; FIXME: is it OK to make the buffer routines dominate?
(or t (not file)
- (not (idlwave-rinfo-assq name 'fun class
+ (not (idlwave-rinfo-assq name 'fun class
idlwave-buffer-routines)))
;; FIXME: is it OK to make the library routines dominate?
- ;; (not (idlwave-rinfo-assq name 'fun class
+ ;; (not (idlwave-rinfo-assq name 'fun class
;; idlwave-library-routines))
)
- (setq entry (list name 'fun class
+ (setq entry (list name 'fun class
(cons 'compiled
(if file
(list
(file-name-nondirectory file)
- (idlwave-sintern-dir
+ (idlwave-sintern-dir
(file-name-directory file)))))
cs (cons nil keys)))
(if file
(defun idlwave-shell-filter-directory ()
"Get the current directory from `idlwave-shell-command-output'.
Change the default directory for the process buffer to concur."
- (save-excursion
- (set-buffer (idlwave-shell-buffer))
+ (with-current-buffer (idlwave-shell-buffer)
(if (string-match ",___cur[\n\r ]+\\([^\n\r]+\\)[\n\r]"
idlwave-shell-command-output)
- (let ((dir (substring idlwave-shell-command-output
+ (let ((dir (substring idlwave-shell-command-output
(match-beginning 1) (match-end 1))))
-; (message "Setting Emacs working dir to %s" dir)
+ ;; (message "Setting Emacs working dir to %s" dir)
(setq idlwave-shell-default-directory dir)
(setq default-directory (file-name-as-directory dir))))))
expression)
(save-excursion
(goto-char apos)
- (setq expression (buffer-substring
+ (setq expression (buffer-substring
(catch 'exit
(while t
- (if (not (re-search-backward
+ (if (not (re-search-backward
"[^][.A-Za-z0-9_() ]" bos t))
(throw 'exit bos)) ;ran into bos
(if (not (idlwave-is-pointer-dereference bol))
(when (not (string= expression ""))
(setq idlwave-shell-get-object-class nil)
(idlwave-shell-send-command
- (concat "if obj_valid(" expression ") then print,obj_class("
+ (concat "if obj_valid(" expression ") then print,obj_class("
expression ")")
'idlwave-shell-parse-object-class
'hide 'wait)
(defun idlwave-shell-parse-object-class ()
"Parse the output of the obj_class command."
(let ((match "obj_class([^\n\r]+[\n\r ]"))
- (if (string-match (concat match "\\([A-Za-z_0-9]+\\) *[\n\r]\\("
+ (if (string-match (concat match "\\([A-Za-z_0-9]+\\) *[\n\r]\\("
idlwave-shell-prompt-pattern "\\)")
idlwave-shell-command-output)
- (setq idlwave-shell-get-object-class
+ (setq idlwave-shell-get-object-class
(match-string 1 idlwave-shell-command-output)))))
(defvar idlwave-sint-sysvars nil)
(interactive "P")
(let (exec-cmd)
(cond
- ((and
+ ((and
(setq exec-cmd (idlwave-shell-executive-command))
(cdr exec-cmd)
(member (upcase (cdr exec-cmd))
(idlwave-shell-complete-filename))
((car-safe exec-cmd)
- (setq idlwave-completion-help-info
+ (setq idlwave-completion-help-info
'(idlwave-shell-complete-execcomm-help))
(idlwave-complete-in-buffer 'execcomm 'execcomm
idlwave-executive-commands-alist nil
(let ((case-fold-search t))
(not (looking-at ".*obj_new")))))
(idlwave-shell-complete-filename))
-
+
(t
;; Default completion of modules and keywords
(idlwave-complete arg)))))
-;; Get rid of opaque dynamic variable passing of link?
-(defvar link) ;dynamic variable
+;; Get rid of opaque dynamic variable passing of idlw-help-link?
+(defvar idlw-help-link) ; dynamic variable from idlwave-do-mouse-completion-help
(defun idlwave-shell-complete-execcomm-help (mode word)
(let ((word (or (nth 1 idlwave-completion-help-info) word))
(entry (assoc-string word idlwave-executive-commands-alist t)))
((eq mode 'test)
(and (stringp word) entry (cdr entry)))
((eq mode 'set)
- (if entry (setq link (cdr entry)))) ;; setting dynamic variable!!!
+ (if entry (setq idlw-help-link (cdr entry)))) ; setting dynamic variable!
(t (error "This should not happen")))))
(defun idlwave-shell-complete-filename (&optional arg)
We assume that we are after a file name when completing one of the
args of an executive .run, .rnew or .compile."
;; CWD might have changed, resync, to set default directory
- (idlwave-shell-resync-dirs)
+ (idlwave-shell-resync-dirs)
(let ((comint-file-name-chars idlwave-shell-file-name-chars))
(comint-dynamic-complete-as-filename)))
(defun idlwave-shell-filename-string ()
"Return t if in a string and after what could be a file name."
- (let ((limit (save-excursion (beginning-of-line) (point))))
+ (let ((limit (point-at-bol)))
(save-excursion
;; Skip backwards over file name chars
(skip-chars-backward idlwave-shell-file-name-chars limit)
(memq (preceding-char) '(?\' ?\")))))
(defun idlwave-shell-batch-command ()
- "Returns t if we're in a batch command statement like @foo"
- (let ((limit (save-excursion (beginning-of-line) (point))))
+ "Return t if we're in a batch command statement like @foo"
+ (let ((limit (point-at-bol)))
(save-excursion
;; Skip backwards over filename
(skip-chars-backward idlwave-shell-file-name-chars limit)
(and (eq (preceding-char) ?@) (not (idlwave-in-quote))))))
(defun idlwave-shell-shell-command ()
- "Returns t if we're in a shell command statement like $ls"
+ "Return t if we're in a shell command statement like $ls"
(save-excursion
(idlwave-beginning-of-statement)
(looking-at "\\$")))
;; Debugging Commands ------------------------------------------------------
(defun idlwave-shell-redisplay (&optional hide)
- "Tries to resync the display with where execution has stopped.
-Issues a \"help,/trace\" command followed by a call to
+ "Try to resync the display with where execution has stopped.
+Issues a \"help,/trace\" command followed by a call to
`idlwave-shell-display-line'. Also updates the breakpoint
overlays."
(interactive)
(idlwave-shell-bp-query))
(defun idlwave-shell-display-level-in-calling-stack (&optional hide)
- (idlwave-shell-send-command
+ (idlwave-shell-send-command
"help,/trace"
`(progn
;; scanning for the state will reset the stack level - restore it
(setq idlwave-shell-calling-stack-index nmin
message (format "%d is the current calling stack level - can't go further down"
(- nmin)))))
- (setq idlwave-shell-calling-stack-routine
+ (setq idlwave-shell-calling-stack-routine
(nth 2 (nth idlwave-shell-calling-stack-index stack)))
;; force edebug for this frame if we're in that mode already
- (idlwave-shell-display-line
+ (idlwave-shell-display-line
(nth idlwave-shell-calling-stack-index stack) nil
(if idlwave-shell-electric-debug-mode 'force))
- (message "%s" (or message
+ (message "%s" (or message
(format "In routine %s (stack level %d)"
idlwave-shell-calling-stack-routine
(- idlwave-shell-calling-stack-index))))))
(defun idlwave-shell-goto-frame (&optional frame)
"Set buffer to FRAME with point at the frame line.
-If the optional argument FRAME is nil then idlwave-shell-pc-frame is
-used. Does nothing if the resulting frame is nil."
+If the optional argument FRAME is nil then `idlwave-shell-pc-frame'
+is used. Does nothing if the resulting frame is nil."
(if frame ()
(setq frame (idlwave-shell-pc-frame)))
(cond
(frame
(set-buffer (idlwave-find-file-noselect (car frame) 'shell))
(widen)
- (goto-line (nth 1 frame)))))
+ (goto-char (point-min))
+ (forward-line (1- (nth 1 frame))))))
(defun idlwave-shell-pc-frame ()
- "Returns the frame for IDL execution."
+ "Return the frame for IDL execution."
(and idlwave-shell-halt-frame
- (list (nth 0 idlwave-shell-halt-frame)
+ (list (nth 0 idlwave-shell-halt-frame)
(nth 1 idlwave-shell-halt-frame)
(nth 2 idlwave-shell-halt-frame))))
(defvar idlwave-shell-suppress-electric-debug nil)
(defun idlwave-shell-display-line (frame &optional col debug)
- "display frame file in other window with overlay arrow.
+ "Display frame file in other window with overlay arrow.
-frame is a list of file name, line number, and subroutine name. if
-frame is nil then remove overlay. if col is set, move point to that
-column in the line. if debug is non-nil, enable the electric debug
-mode. if it is 'disable, do not enable no matter what the setting of
-'idlwave-shell-automatic-electric-debug'. if it is 'force, enable no
+FRAME is a list of file name, line number, and subroutine name. If
+FRAME is nil then remove overlay. If COL is set, move point to that
+column in the line. If DEBUG is non-nil, enable the electric debug
+mode. If it is 'disable, do not enable no matter what the setting of
+`idlwave-shell-automatic-electric-debug'. If it is 'force, enable no
matter what the settings of that variable."
(if (not frame)
;; remove stop-line overlay from old position
- (progn
+ (progn
(setq overlay-arrow-string nil)
(setq idlwave-shell-mode-line-info nil)
(setq idlwave-shell-is-stopped nil)
(if (not (idlwave-shell-valid-frame frame))
;; fixme: errors are dangerous in shell filters. but i think i
;; have never encountered this one.
- (error (concat "invalid frame - unable to access file: " (car frame)))
-;;;
-;;; buffer : the buffer to display a line in.
-;;; select-shell: current buffer is the shell.
-;;;
+ (error "invalid frame - unable to access file: %s" (car frame))
+ ;;
+ ;; buffer : the buffer to display a line in.
+ ;; select-shell: current buffer is the shell.
+ ;;
(setq idlwave-shell-mode-line-info
(if (nth 2 frame)
- (format "[%d:%s]"
+ (format "[%d:%s]"
(- idlwave-shell-calling-stack-index)
(nth 2 frame))))
(let* ((buffer (idlwave-find-file-noselect (car frame) 'shell))
nil (idlwave-shell-source-frame)))
;; enter the buffer and mark the line
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
(save-restriction
(widen)
- (goto-line (nth 1 frame))
- (forward-line 0)
+ (goto-char (point-min))
+ (forward-line (1- (nth 1 frame)))
(setq pos (point))
(setq idlwave-shell-is-stopped t)
-
+
(if idlwave-shell-stop-line-overlay
(progn
- ;; restore face and move overlay
+ ;; restore face and move overlay
(overlay-put idlwave-shell-stop-line-overlay 'face
(if idlwave-shell-electric-debug-mode
- idlwave-shell-electric-stop-line-face
+ idlwave-shell-electric-stop-line-face
idlwave-shell-stop-line-face))
(move-overlay idlwave-shell-stop-line-overlay
- (point) (save-excursion (end-of-line) (point))
+ (point) (point-at-eol)
(current-buffer)))
;; use the arrow instead, but only if marking is wanted.
(if idlwave-shell-mark-stop-line
;; if we have the column of the error, move the cursor there.
(if col (move-to-column col))
(setq pos (point))
-
+
;; enter electric debug mode, if not prohibited and not in
;; it already
(when (and (not idlwave-shell-electric-debug-mode)
(or (eq debug 'force)
- (and
+ (and
(not (eq debug 'disable)) ;; explicitly disabled
- (or
+ (or
(eq idlwave-shell-automatic-electric-debug t)
- (and
- (eq idlwave-shell-automatic-electric-debug
+ (and
+ (eq idlwave-shell-automatic-electric-debug
'breakpoint)
(not (eq idlwave-shell-current-state 'error))))
(not idlwave-shell-suppress-electric-debug))))
(idlwave-shell-electric-debug-mode t))
(setq electric idlwave-shell-electric-debug-mode))
-
+
;; Make sure pos is really displayed in the window.
(set-window-point window pos)
-
- ;; If we came from the shell, go back there. Otherwise select
+
+ ;; If we came from the shell, go back there. Otherwise select
;; the window where the error/halt is displayed.
(if (or (and idlwave-shell-electric-zap-to-file electric)
- (and (equal (buffer-name) (idlwave-shell-buffer))
+ (and (equal (buffer-name) (idlwave-shell-buffer))
(not select-shell)))
(select-window window))))))
(defun idlwave-shell-step (arg)
- "Step one source line. If given prefix argument ARG, step ARG source lines."
+ "Step one source line.
+If given prefix argument ARG, step ARG source lines."
(interactive "p")
(or (not arg) (< arg 1)
(setq arg 1))
(idlwave-shell-stop-line-pending)
- (idlwave-shell-send-command
+ (idlwave-shell-send-command
(concat ".s " (if (integerp arg) (int-to-string arg) arg))
nil (if (idlwave-shell-hide-p 'debug) 'mostly) nil t))
(defun idlwave-shell-stepover (arg)
"Stepover one source line.
-If given prefix argument ARG, step ARG source lines.
+If given prefix argument ARG, step ARG source lines.
Uses IDL's stepover executive command which does not enter called functions."
(interactive "p")
(or (not arg) (< arg 1)
(setq arg 1))
(idlwave-shell-stop-line-pending)
- (idlwave-shell-send-command
+ (idlwave-shell-send-command
(concat ".so " (if (integerp arg) (int-to-string arg) arg))
nil (if (idlwave-shell-hide-p 'debug) 'mostly) nil t))
-(defun idlwave-shell-break-here (&optional count cmd condition disabled
+(defun idlwave-shell-break-here (&optional count cmd condition disabled
no-show)
- "Set breakpoint at current line.
+ "Set breakpoint at current line.
-If Count is nil then an ordinary breakpoint is set. We treat a count
+If COUNT is nil then an ordinary breakpoint is set. We treat a COUNT
of 1 as a temporary breakpoint using the ONCE keyword. Counts greater
than 1 use the IDL AFTER=count keyword to break only after reaching
-the statement count times.
+the statement COUNT times.
Optional argument CMD is a list or function to evaluate upon reaching
the breakpoint. CONDITION is a break condition, and DISABLED, if
-non-nil disables the breakpoint"
+non-nil disables the breakpoint."
(interactive "P")
(when (listp count)
- (if (equal (car count) 4)
+ (if (equal (car count) 4)
(setq condition (read-string "Break Condition: ")))
(setq count nil))
(idlwave-shell-set-bp
;; Offer to recompile
(if (progn
(beep)
- (y-or-n-p
+ (y-or-n-p
(concat "Okay to recompile file "
(idlwave-shell-bp-get bp 'file) "?")))
;; Recompile
;; Clean up before retrying
(idlwave-shell-command-failure)
(idlwave-shell-send-command
- (concat ".run \"" (idlwave-shell-bp-get bp 'file) "\"") nil
+ (concat ".run \"" (idlwave-shell-bp-get bp 'file) "\"") nil
(if (idlwave-shell-hide-p 'run) 'mostly) nil t)
;; Try setting breakpoint again
(idlwave-shell-set-bp bp))
(message "Syntax error in condition.")
(idlwave-shell-command-failure)
nil)
-
+
(t 'okay))))
(defun idlwave-shell-command-failure ()
"Continue executing."
(interactive)
(idlwave-shell-stop-line-pending)
- (idlwave-shell-send-command ".c" (unless no-show
+ (idlwave-shell-send-command ".c" (unless no-show
'(idlwave-shell-redisplay 'hide))
- (if (idlwave-shell-hide-p 'debug) 'mostly)
+ (if (idlwave-shell-hide-p 'debug) 'mostly)
nil t))
(defun idlwave-shell-go ()
(defun idlwave-shell-skip ()
"Run .SKIP (skip one line, then step)."
(interactive)
- (idlwave-shell-stop-line-pending)
+ (idlwave-shell-stop-line-pending)
(idlwave-shell-send-command ".skip" '(idlwave-shell-redisplay 'hide)
(if (idlwave-shell-hide-p 'debug) 'mostly)
nil t))
(list (idlwave-shell-file-name (buffer-file-name))
(save-restriction
(widen)
- (save-excursion
- (beginning-of-line)
- (1+ (count-lines 1 (point))))))))
+ (1+ (count-lines 1 (point-at-bol)))))))
(defun idlwave-shell-current-module ()
"Return the name of the module for the current file.
(defun idlwave-shell-clear-current-bp ()
"Remove breakpoint at current line.
-This command can be called from the shell buffer if IDL is currently stopped
-at a breakpoint."
+This command can be called from the shell buffer if IDL is currently
+stopped at a breakpoint."
(interactive)
(let ((bp (idlwave-shell-find-current-bp)))
(if bp (idlwave-shell-clear-bp bp))))
((eq force 'enable) (setq disabled t)))
(when bp
(setf (nth 3 (cdr (cdr bp))) (not disabled))
- (idlwave-shell-send-command
+ (idlwave-shell-send-command
(concat "breakpoint,"
(if disabled "/enable," "/disable,")
(int-to-string (idlwave-shell-bp-get bp)))
(while bpl
(setq disabled (idlwave-shell-bp-get (car bpl) 'disabled))
(when (idlwave-xor (not disabled) (eq enable 'enable))
- (idlwave-shell-toggle-enable-current-bp
+ (idlwave-shell-toggle-enable-current-bp
(car bpl) (if (eq enable 'enable) 'enable 'disable) no-update)
(push (car bpl) modified))
(setq bpl (cdr bpl)))
(unless no-update (idlwave-shell-bp-query))
modified))
-
+
(defun idlwave-shell-to-here ()
"Set a breakpoint with count 1 then continue."
(interactive)
(name (car module))
(class (nth 2 module)))
(if module
- (progn
+ (progn
(setq module (idlwave-make-full-name class name))
(idlwave-shell-module-source-query module type)
(idlwave-shell-set-bp-in-module name type class))
(defun idlwave-shell-set-bp-in-module (name type class)
- "Set breakpoint in module. Assumes that `idlwave-shell-sources-alist'
-contains an entry for that module."
+ "Set breakpoint in module.
+Assumes that `idlwave-shell-sources-alist' contains an entry for that module."
(let* ((module (idlwave-make-full-name class name))
- (source-file
+ (source-file
(car-safe (cdr-safe
(or
(assoc (upcase module)
idlwave-shell-sources-alist)
- (nth 3 (idlwave-best-rinfo-assoc name type class
+ (nth 3 (idlwave-best-rinfo-assoc name type class
(idlwave-routines)))))))
buf)
(if (or (not source-file)
(message "The source file for module %s is probably not compiled"
module)
(beep))
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(save-excursion
(goto-char (point-min))
(let ((case-fold-search t))
- (if (re-search-forward
+ (if (re-search-forward
(concat "^[ \t]*\\(pro\\|function\\)[ \t]+"
(downcase module)
"[ \t\n,]") nil t)
"Attempt to run until this procedure exits.
Runs to the last statement and then steps 1 statement. Use the .out command."
(interactive)
- (idlwave-shell-send-command ".o" nil
+ (idlwave-shell-send-command ".o" nil
(if (idlwave-shell-hide-p 'debug) 'mostly)
nil t))
(or (not bp-line) (funcall closer-func cur-line bp-line)))
(setq bp-line cur-line))))
(unless bp-line (error "No further breakpoints"))
- (goto-line bp-line)))
+ (goto-char (point-min))
+ (forward-line (1- bp-line))))
;; Examine Commands ------------------------------------------------------
(let* ((drag-track (fboundp 'mouse-drag-track))
(transient-mark-mode t)
(zmacs-regions t)
- (tracker (if (featurep 'xemacs)
- (if (fboundp
+ (tracker (if (featurep 'xemacs)
+ (if (fboundp
'default-mouse-track-event-is-with-button)
'idlwave-xemacs-hack-mouse-track
'mouse-track)
(idlwave-shell-print (if (idlwave-region-active-p) '(4) nil)
,help ,ev))))
-;;; Begin terrible hack section -- XEmacs tests for button2 explicitly
-;;; on drag events, calling drag-n-drop code if detected. Ughhh...
+;; Begin terrible hack section -- XEmacs tests for button2 explicitly
+;; on drag events, calling drag-n-drop code if detected. Ughhh...
(defun idlwave-default-mouse-track-event-is-with-button (event n)
t)
(defun idlwave-xemacs-hack-mouse-track (event)
(if (featurep 'xemacs)
- (let ((oldfunc (symbol-function
+ (let ((oldfunc (symbol-function
'default-mouse-track-event-is-with-button)))
(unwind-protect
(progn
- (fset 'default-mouse-track-event-is-with-button
+ (fset 'default-mouse-track-event-is-with-button
'idlwave-default-mouse-track-event-is-with-button)
(mouse-track event))
(fset 'default-mouse-track-event-is-with-button oldfunc)))))
;;; End terrible hack section
(defun idlwave-shell-mouse-print (event)
- "Print value of variable at the mouse position, with `help'"
+ "Print value of variable at the mouse position, with `print'."
(interactive "e")
(funcall (idlwave-shell-mouse-examine nil) event))
(defun idlwave-shell-mouse-help (event)
- "Print value of variable at the mouse position, with `print'."
+ "Print value of variable at the mouse position, with `help'."
(interactive "e")
(funcall (idlwave-shell-mouse-examine 'help) event))
(defun idlwave-shell-examine-select (event)
- "Pop-up a list to select from for examining the expression"
+ "Pop-up a list to select from for examining the expression."
(interactive "e")
(funcall (idlwave-shell-mouse-examine nil event) event))
(defvar idlwave-shell-examine-completion-list nil)
(defun idlwave-shell-print (arg &optional help ev complete-help-type)
- "Print current expression.
+ "Print current expression.
With HELP non-nil, show help on expression. If HELP is a string,
the expression will be put in place of ___, e.g.:
directly following the identifier - an array or function call.
Alternatively, an expression is the contents of any matched
parentheses when the open parenthesis is not directly preceded by an
-identifier. If point is at the beginning or within an expression
+identifier. If point is at the beginning or within an expression
return the inner-most containing expression, otherwise, return the
preceding expression.
With double prefix arg ARG prompt for an expression.
If EV is a valid event passed, pop-up a list from
-idlw-shell-examine-alist from which to select the help command text.
-If instead COMPLETE-HELP-TYPE is non-nil, choose from
-idlw-shell-examine-alist via mini-buffer shortcut key."
+`idlwave-shell-examine-alist' from which to select the help
+command text. If instead COMPLETE-HELP-TYPE is non-nil, choose
+from `idlwave-shell-examine-alist' via mini-buffer shortcut key."
(interactive "P")
;; For speed: assume the helper routine hasn't been lost, e.g. with
(save-excursion
(let* ((process (get-buffer-process (current-buffer)))
(process-mark (if process (process-mark process)))
- (stack-label
+ (stack-label
(if (and (integerp idlwave-shell-calling-stack-index)
(> idlwave-shell-calling-stack-index 0))
- (format " [-%d:%s]"
- idlwave-shell-calling-stack-index
+ (format " [-%d:%s]"
+ idlwave-shell-calling-stack-index
idlwave-shell-calling-stack-routine)))
expr beg end cmd)
(cond
;; an array
(forward-sexp))
(setq end (point)))))
-
+
;; Get expression, but first move the begin mark if a
;; process-mark is inside the region, to keep the overlay from
;; wandering in the Shell.
;; Show the overlay(s) and attach any necessary hooks and filters
(when (and beg end idlwave-shell-expression-overlay)
- (move-overlay idlwave-shell-expression-overlay beg end
+ (move-overlay idlwave-shell-expression-overlay beg end
(current-buffer))
- (add-hook 'pre-command-hook
+ (add-hook 'pre-command-hook
'idlwave-shell-delete-expression-overlay))
(add-hook 'pre-command-hook
'idlwave-shell-delete-output-overlay)
-
+
;; Remove empty or comment-only lines
(while (string-match "\n[ \t]*\\(;.*\\)?\r*\n" expr)
(setq expr (replace-match "\n" t t expr)))
;; Remove final newline
(if (string-match "\n[ \t\r]*\\'" expr)
(setq expr (replace-match "" t t expr)))
-
+
(catch 'exit
;; Pop-up or complete on the examine selection list, if appropriate
(if (or
complete-help-type
(and ev idlwave-shell-examine-alist)
(consp help))
- (let ((help-cons
+ (let ((help-cons
(if (consp help) help
- (assoc
+ (assoc
;; A cons from either a pop-up or mini-buffer completion
(if complete-help-type
(idlwave-one-key-select 'idlwave-shell-examine-alist
"Examine with: " 1.5)
;; (idlwave-completing-read
-;; "Examine with: "
+;; "Examine with: "
;; idlwave-shell-examine-alist nil nil nil
;; 'idlwave-shell-examine-completion-list
;; "Print")
- (idlwave-popup-select
- ev
- (mapcar 'car idlwave-shell-examine-alist)
+ (idlwave-popup-select
+ ev
+ (mapcar 'car idlwave-shell-examine-alist)
"Examine with"))
idlwave-shell-examine-alist))))
(setq help (cdr help-cons))
(if (null help) (throw 'exit nil))
(if idlwave-shell-separate-examine-output
- (setq idlwave-shell-examine-label
- (concat
+ (setq idlwave-shell-examine-label
+ (concat
(format "==>%s<==\n%s:" expr (car help-cons))
stack-label "\n"))))
;; The regular help label (no popups, cons cells, etc.)
(setq idlwave-shell-examine-label
(concat
- (format "==>%s<==\n%s:" expr
+ (format "==>%s<==\n%s:" expr
(cond ((null help) "print")
((stringp help) help)
(t (symbol-name help))))
idlwave-shell-calling-stack-index)))
(setq cmd (idlwave-shell-help-statement help expr))
;;(idlwave-shell-recenter-shell-window)
- (idlwave-shell-send-command
- cmd
+ (idlwave-shell-send-command
+ cmd
'idlwave-shell-check-compiled-and-display
(if idlwave-shell-separate-examine-output 'hide))))))
(defun idlwave-shell-examine-display ()
"View the examine command output in a separate buffer."
(let (win cur-beg cur-end)
- (save-excursion
- (set-buffer (get-buffer-create "*Examine*"))
+ (with-current-buffer (get-buffer-create "*Examine*")
(use-local-map idlwave-shell-examine-map)
(setq buffer-read-only nil)
(goto-char (point-max))
(let* ((end (or
(re-search-backward idlwave-shell-prompt-pattern nil t)
(point-max)))
- (beg (progn
+ (beg (progn
(goto-char
- (or (progn (if (re-search-backward
+ (or (progn (if (re-search-backward
idlwave-shell-prompt-pattern nil t)
(match-end 0)))
(point-min)))
(setq buffer-read-only t)
(move-overlay idlwave-shell-output-overlay cur-beg cur-end
(current-buffer))
-
+
;; Look for the examine buffer in all windows. If one is
;; found in a frame all by itself, use that, otherwise, switch
;; to or create an examine window in this frame, and resize if
;; it's a newly created window
(let* ((winlist (get-buffer-window-list "*Examine*" nil 'visible)))
- (setq win (idlwave-display-buffer
- "*Examine*"
+ (setq win (idlwave-display-buffer
+ "*Examine*"
nil
(let ((list winlist) thiswin)
(catch 'exit
(save-selected-window
(while (setq thiswin (pop list))
(select-window thiswin)
- (if (one-window-p)
+ (if (one-window-p)
(throw 'exit (window-frame thiswin)))))))))
(set-window-start win (point-min)) ; Ensure the point is visible.
(save-selected-window
;; And add the new value.
(if (setq elt (assoc win idlwave-shell-examine-window-alist))
(setcdr elt (window-height))
- (add-to-list 'idlwave-shell-examine-window-alist
+ (add-to-list 'idlwave-shell-examine-window-alist
(cons win (window-height)))))))))
;; Recenter for maximum output, after widened
(save-selected-window
(defun idlwave-shell-examine-display-clear ()
(interactive)
- (save-excursion
- (let ((buf (get-buffer "*Examine*")))
- (when (bufferp buf)
- (set-buffer buf)
- (setq buffer-read-only nil)
- (erase-buffer)
- (setq buffer-read-only t)))))
+ (let ((buf (get-buffer "*Examine*")))
+ (when (bufferp buf)
+ (with-current-buffer buf
+ (let ((inhibit-read-only t))
+ (erase-buffer))))))
(defun idlwave-retrieve-expression-from-level (expr level)
"Return IDL command to print the expression EXPR from stack level LEVEL.
;; break. We will look for identifiers and exclude cases where we
;; know it is not a variable. To distinguish array references from
;; function calls, we require that arrays use [] instead of ()
-
+
(while (string-match
"\\(\\`\\|[^a-zA-Z0-9$_][ \t]*\\)\\([a-zA-Z][a-zA-Z0-9$_]*\\)\\([ \t]*[^a-zA-Z0-9$_]\\|\\'\\)" expr start)
(setq var (match-string 2 expr)
start (match-end 2)
pre (substring expr 0 (match-beginning 2))
post (substring expr (match-end 2)))
- (cond
+ (cond
((or
;; Exclude identifiers which are not variables
(string-match ",[ \t$\n]*/\\'" pre) ;; a `/' KEYWORD
;; Skip over strings
((and (string-match "\\([\"\']\\)[^\1]*$" pre)
- (string-match (concat "^[^" (match-string 1 pre) "]*"
+ (string-match (concat "^[^" (match-string 1 pre) "]*"
(match-string 1 pre)) post))
(setq start (+ start (match-end 0))))
-
+
;; seems to be a variable - delimit its name
- (t
+ (t
(put-text-property start (- start (length var)) 'fetch t expr))))
(setq start 0)
(unless fetch-end (setq fetch-end (length expr)))
(remove-text-properties fetch-start fetch-end '(fetch) expr)
(setq expr (concat (substring expr 0 fetch-start)
- (format "(routine_names('%s',fetch=%d))"
+ (format "(routine_names('%s',fetch=%d))"
(substring expr fetch-start fetch-end)
fetch)
(substring expr fetch-end)))
size(___,/DIMENSIONS)"
(cond
((null help)
- (concat "idlwave_print_safe, " expr ","
+ (concat "idlwave_print_safe, " expr ","
(number-to-string idlwave-shell-max-print-length)))
- ((stringp help)
+ ((stringp help)
(if (string-match "\\(^\\|[^_]\\)\\(___\\)\\([^_]\\|$\\)" help)
(concat (substring help 0 (match-beginning 2))
expr
(substring help (match-end 2)))))
- (t
+ (t
(concat "help, " expr))))
-
+
(defun idlwave-shell-examine-highlight ()
"Highlight the most recent IDL output."
(process (get-buffer-process buffer))
(process-mark (if process (process-mark process)))
output-begin output-end)
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
(goto-char process-mark)
(beginning-of-line)
(setq output-end (point))
(re-search-backward idlwave-shell-prompt-pattern nil t)
(beginning-of-line 2)
(setq output-begin (point)))
-
+
;; First make sure the shell window is visible
(idlwave-display-buffer (idlwave-shell-buffer)
nil (idlwave-shell-shell-frame))
(if (and idlwave-shell-output-overlay process-mark)
- (move-overlay idlwave-shell-output-overlay
+ (move-overlay idlwave-shell-output-overlay
output-begin output-end buffer))))
(defun idlwave-shell-delete-output-overlay ()
(delete-overlay idlwave-shell-output-overlay))
(error nil))
(remove-hook 'pre-command-hook 'idlwave-shell-delete-output-overlay)))
-
+
(defun idlwave-shell-delete-expression-overlay ()
(unless (or (eq this-command 'idlwave-shell-mouse-nop)
(eq this-command 'handle-switch-frame))
data - Data associated with the breakpoint by idlwave-shell currently
contains four items:
-count - number of times to execute breakpoint. When count reaches 0
+count - number of times to execute breakpoint. When count reaches 0
the breakpoint is cleared and removed from the alist.
-command - command to execute when breakpoint is reached, either a
+command - command to execute when breakpoint is reached, either a
lisp function to be called with `funcall' with no arguments or a
list to be evaluated with `eval'.
condition - any condition to apply to the breakpoint.
-disabled - whether the bp is disabled")
+disabled - whether the bp is disabled.")
(defun idlwave-shell-run-region (beg end &optional n)
"Compile and run the region using the IDL process.
Copies the region to a temporary file `idlwave-shell-temp-pro-file'
-and issues the IDL .run command for the file. Because the
-region is compiled and run as a main program there is no
-problem with begin-end blocks extending over multiple
-lines - which would be a problem if `idlwave-shell-evaluate-region'
-was used. An END statement is appended to the region if necessary.
+and issues the IDL .run command for the file. Because the region
+is compiled and run as a main program there is no problem with
+begin-end blocks extending over multiple lines - which would be
+a problem if `idlwave-shell-evaluate-region' was used.
+An END statement is appended to the region if necessary.
If there is a prefix argument, display IDL process."
(interactive "r\nP")
(let ((oldbuf (current-buffer)))
- (save-excursion
- (set-buffer (idlwave-find-file-noselect
- (idlwave-shell-temp-file 'pro) 'tmp))
+ (with-current-buffer (idlwave-find-file-noselect
+ (idlwave-shell-temp-file 'pro) 'tmp)
(set (make-local-variable 'comment-start-skip) ";+[ \t]*")
(set (make-local-variable 'comment-start) ";")
(erase-buffer)
(idlwave-look-at "\\<end\\>")))
(insert "\nend\n"))
(save-buffer 0)))
- (idlwave-shell-send-command (concat ".run \""
+ (idlwave-shell-send-command (concat ".run \""
idlwave-shell-temp-pro-file "\"")
- nil
+ nil
(if (idlwave-shell-hide-p 'run) 'mostly)
nil t)
(if n
- (idlwave-display-buffer (idlwave-shell-buffer)
+ (idlwave-display-buffer (idlwave-shell-buffer)
nil (idlwave-shell-shell-frame))))
(defun idlwave-shell-evaluate-region (beg end &optional n)
(interactive "r\nP")
(idlwave-shell-send-command (buffer-substring beg end))
(if n
- (idlwave-display-buffer (idlwave-shell-buffer)
+ (idlwave-display-buffer (idlwave-shell-buffer)
nil (idlwave-shell-shell-frame))))
(defun idlwave-shell-delete-temp-files ()
'hide))
(defun idlwave-shell-bp-get (bp &optional item)
- "Get a value for a breakpoint. BP has the form of elements in
-idlwave-shell-bp-alist. Optional second arg ITEM is the
-particular value to retrieve. ITEM can be 'file, 'line, 'index,
-'module, 'count, 'cmd, 'condition, 'disabled, 'type, or
-'data. 'data returns a list of 'count, 'cmd and 'condition.
-Defaults to 'index."
+ "Get a value for a breakpoint.
+BP has the form of elements in `idlwave-shell-bp-alist'.
+Optional second arg ITEM is the particular value to retrieve.
+ITEM can be 'file, 'line, 'index, 'module, 'count, 'cmd,
+'condition, 'disabled, 'type, or 'data. 'data returns a list
+of 'count, 'cmd and 'condition. Defaults to 'index."
(cond
;; Frame
((eq item 'line) (nth 1 (car bp)))
((eq item 'condition) (nth 2 (cdr (cdr bp))))
((eq item 'disabled) (nth 3 (cdr (cdr bp))))
;; IDL breakpoint info
- ((eq item 'module)
+ ((eq item 'module)
(let ((module (nth 1 (car (cdr bp)))))
(if (listp module) (car module) module)))
((eq item 'type)
(t (nth 0 (car (cdr bp))))))
(defun idlwave-shell-filter-bp (&optional no-show)
- "Get the breakpoints from `idlwave-shell-command-output'. Create
-`idlwave-shell-bp-alist' updating breakpoint count and command data
-from previous breakpoint list. If NO-SHOW is set, don't update the
-breakpoint overlays."
- (save-excursion
- (set-buffer (get-buffer-create idlwave-shell-bp-buffer))
+ "Get the breakpoints from `idlwave-shell-command-output'.
+Create `idlwave-shell-bp-alist' updating breakpoint count and command
+data from previous breakpoint list. If NO-SHOW is set, don't update
+the breakpoint overlays."
+ (with-current-buffer (get-buffer-create idlwave-shell-bp-buffer)
(erase-buffer)
(insert idlwave-shell-command-output)
(goto-char (point-min))
;; Searching the breakpoints
;; In IDL 5.5, the breakpoint reporting format changed.
(bp-re54 "^[ \t]*\\([0-9]+\\)[ \t]+\\(\\S-+\\)?[ \t]+\\([0-9]+\\)[ \t]+\\(\\S-+\\)")
- (bp-re55
- (concat
+ (bp-re55
+ (concat
"^\\s-*\\([0-9]+\\)" ; 1 index
"\\s-+\\([0-9]+\\)" ; 2 line number
"\\s-+\\(Uncompiled\\|" ; 3-6 either uncompiled or routine name
bp-re indmap)
(setq idlwave-shell-bp-alist (list nil))
;; Search for either header type, and set the correct regexp
- (when (or
+ (when (or
(if (re-search-forward "^\\s-*Index.*\n\\s-*-" nil t)
- (setq bp-re bp-re54 ; versions <= 5.4
+ (setq bp-re bp-re54 ; versions <= 5.4
indmap '(1 2 3 4))) ;index module line file
- (if (re-search-forward
+ (if (re-search-forward
"^\\s-*Index\\s-*Line\\s-*Attributes\\s-*File" nil t)
(setq bp-re bp-re55 ; versions >= 5.5
indmap '(1 6 2 16)))) ; index module line file
"Update BP data in breakpoint list.
If BP frame is in `idlwave-shell-bp-alist' updates the breakpoint data."
(let ((match (assoc (car bp) idlwave-shell-bp-alist)))
- (if match
- (if command-only
+ (if match
+ (if command-only
(setf (nth 1 (cdr (cdr match))) (nth 1 (cdr (cdr match))))
(setcdr (cdr match) (cdr (cdr bp)))))))
(setcdr (cdr bp) data))
(defun idlwave-shell-bp (frame &optional data module)
- "Create a breakpoint structure containing FRAME and DATA. Second
-and third args, DATA and MODULE, are optional. Returns a breakpoint
-of the format used in `idlwave-shell-bp-alist'. Can be used in commands
-attempting match a breakpoint in `idlwave-shell-bp-alist'."
+ "Create a breakpoint structure containing FRAME and DATA.
+Second and third args, DATA and MODULE, are optional. Returns
+a breakpoint of the format used in `idlwave-shell-bp-alist'.
+Can be used in commands attempting match a breakpoint in
+`idlwave-shell-bp-alist'."
(cons frame ;; (file line)
(cons (list nil module) ;; (index_id (module type) | module)
data))) ;; (count command condition disabled)
(defun idlwave-shell-sources-bp (bp)
"Check `idlwave-shell-sources-alist' for source of breakpoint using BP.
If an equivalency is found, return the IDL internal source name.
-Otherwise return the filename in bp."
+Otherwise return the filename in BP."
(let*
((bp-file (idlwave-shell-bp-get bp 'file))
(bp-module (idlwave-shell-bp-get bp 'module))
- (internal-file-list
+ (internal-file-list
(if bp-module
(cdr (assoc bp-module idlwave-shell-sources-alist)))))
(if (and internal-file-list
bp-file)))
(defun idlwave-shell-set-bp (bp &optional no-show)
- "Try to set a breakpoint BP.
+ "Try to set a breakpoint BP.
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
+ (idlwave-shell-send-command
idlwave-shell-bp-query
`(progn
(idlwave-shell-filter-bp (quote ,no-show))
",/DISABLE")))
(line (idlwave-shell-bp-get bp 'line)))
(idlwave-shell-send-command
- (concat "breakpoint,'"
+ (concat "breakpoint,'"
(idlwave-shell-sources-bp bp) "',"
(if (integerp line) (setq line (int-to-string line)))
key)
(defun idlwave-shell-set-bp-adjust (bp &optional no-show)
"Find the breakpoint in IDL's internal list of breakpoints."
- (idlwave-shell-send-command
+ (idlwave-shell-send-command
idlwave-shell-bp-query
`(progn
(idlwave-shell-filter-bp 'no-show)
(message "Failed to identify breakpoint in IDL"))))
(defvar idlwave-shell-bp-overlays nil
- "Alist of overlays marking breakpoints")
+ "Alist of overlays marking breakpoints.")
(defvar idlwave-shell-bp-glyph)
(defvar idlwave-shell-debug-line-map (make-sparse-keymap))
-(define-key idlwave-shell-debug-line-map
+(define-key idlwave-shell-debug-line-map
(if (featurep 'xemacs) [button3] [mouse-3])
'idlwave-shell-mouse-active-bp)
ov ov-list bp buf old-buffers win)
;; Delete the old overlays from their buffers
- (if ov-alist
+ (if ov-alist
(while (setq ov-list (pop ov-alist))
(while (setq ov (pop (cdr ov-list)))
(add-to-list 'old-buffers (overlay-buffer ov))
(delete-overlay ov))))
-
+
(setq ov-alist idlwave-shell-bp-overlays
- idlwave-shell-bp-overlays
+ idlwave-shell-bp-overlays
(if idlwave-shell-bp-glyph
(mapcar 'list (mapcar 'car idlwave-shell-bp-glyph))
(list (list 'bp))))
(while (setq bp (pop bp-list))
(save-excursion
(idlwave-shell-goto-frame (car bp))
- (let* ((end (progn (end-of-line 1) (point)))
+ (let* ((end (point-at-eol))
(beg (progn (beginning-of-line 1) (point)))
(condition (idlwave-shell-bp-get bp 'condition))
(count (idlwave-shell-bp-get bp 'count))
(t 'bp-n)))
(t 'bp))
'bp))
- (help-list
+ (help-list
(delq nil
(list
(if count
(if condition
(concat "condition:" condition))
(if disabled "disabled"))))
- (help-text (concat
- "BP "
+ (help-text (concat
+ "BP "
(int-to-string (idlwave-shell-bp-get bp))
- (if help-list
- (concat
- " - "
+ (if help-list
+ (concat
+ " - "
(mapconcat 'identity help-list ", ")))
(if (and (not count) (not condition))
" (use mouse-3 for breakpoint actions)")))
(list (list full-type ov)))))
;; Take care of margins if using a glyph
(when use-glyph
- (if old-buffers
+ (if old-buffers
(setq old-buffers (delq (current-buffer) old-buffers)))
(if (fboundp 'set-specifier) ;; XEmacs
(set-specifier left-margin-width (cons (current-buffer) 2))
(setq left-margin-width 2)))
(let ((window (get-buffer-window (current-buffer) 0)))
(if window
- (set-window-margins
+ (set-window-margins
window left-margin-width right-margin-width))))))
(if use-glyph
(while (setq buf (pop old-buffers))
(setq left-margin-width 0))
(let ((window (get-buffer-window buf 0)))
(if window
- (set-window-margins
+ (set-window-margins
window left-margin-width right-margin-width)))))))))
(defun idlwave-shell-make-new-bp-overlay (&optional type disabled)
- "Make a new overlay for highlighting breakpoints.
+ "Make a new overlay for highlighting breakpoints.
This stuff is strongly dependant upon the version of Emacs. If TYPE
is passed, make an overlay of that type ('bp or 'bp-cond, currently
(use-glyph (and (memq idlwave-shell-mark-breakpoints '(t glyph))
idlwave-shell-bp-glyph))
(type (or type 'bp))
- (face (if disabled
+ (face (if disabled
idlwave-shell-disabled-breakpoint-face
idlwave-shell-breakpoint-face)))
(if (featurep 'xemacs)
(set-extent-property ov 'mouse-face 'highlight)
(set-extent-property ov 'keymap idlwave-shell-debug-line-map))
- (cond
+ (cond
;; tty's cannot display glyphs
((eq (console-type) 'tty)
(set-extent-property ov 'face face))
-
+
;; use the glyph
(use-glyph
(let ((glyph (cdr (assq type idlwave-shell-bp-glyph))))
(if use-glyph
(let ((image-props (cdr (assq type idlwave-shell-bp-glyph)))
string)
-
+
(if disabled (setq image-props
- (append image-props
+ (append image-props
(list :conversion 'disabled))))
- (setq string
- (propertize "@"
- 'display
+ (setq string
+ (propertize "@"
+ 'display
(list (list 'margin 'left-margin)
image-props)))
(overlay-put ov 'before-string string))
cmd (idlwave-shell-bp-get bp 'cmd)
count (idlwave-shell-bp-get bp 'count)
disabled (idlwave-shell-bp-get bp 'disabled))
- (setq select (idlwave-popup-select
- ev
- (delq nil
+ (setq select (idlwave-popup-select
+ ev
+ (delq nil
(list (if disabled "Enable" "Disable")
"Clear"
"Clear All"
(if condition "Remove Condition" "Add Condition")
(if condition "Change Condition")
- (if count "Remove Repeat Count"
+ (if count "Remove Repeat Count"
"Add Repeat Count")
(if count "Change Repeat Count")))
(concat "BreakPoint " index)))
- (if select
- (cond
+ (if select
+ (cond
((string-equal select "Clear All")
(idlwave-shell-clear-all-bp))
((string-equal select "Clear")
(idlwave-shell-clear-current-bp))
((string-match "Condition" select)
- (idlwave-shell-break-here count cmd
+ (idlwave-shell-break-here count cmd
(if (or (not condition)
(string-match "Change" select))
(read-string "Break Condition: "))
cmd condition disabled))
((string-match "able$" select)
(idlwave-shell-toggle-enable-current-bp))
- (t
+ (t
(message "Unimplemented: %s" select))))))
-
+
(defun idlwave-shell-edit-default-command-line (arg)
"Edit the current execute command."
(interactive "P")
Also with prefix arg, ask for the command. You can also use the command
`idlwave-shell-edit-default-command-line' to edit the line."
(interactive "P")
- (cond
+ (cond
((equal arg '(16))
(setq idlwave-shell-command-line-to-execute nil))
((equal arg '(4))
- (setq idlwave-shell-command-line-to-execute
+ (setq idlwave-shell-command-line-to-execute
(read-string "IDL> " idlwave-shell-command-line-to-execute))))
(idlwave-shell-reset 'hidden)
- (idlwave-shell-send-command
+ (idlwave-shell-send-command
(or idlwave-shell-command-line-to-execute
(with-current-buffer (idlwave-shell-buffer)
(ring-ref comint-input-ring 0)))
"Save file and run it in IDL.
Runs `save-buffer' and sends a '.RUN' command for the associated file to IDL.
When called from the shell buffer, re-run the file which was last handled by
-one of the save-and-.. commands."
+one of the save-and-.. commands."
(interactive)
(idlwave-shell-save-and-action 'run))
"Save file and batch it in IDL.
Runs `save-buffer' and sends a '@file' command for the associated file to IDL.
When called from the shell buffer, re-batch the file which was last handled by
-one of the save-and-.. commands."
+one of the save-and-.. commands."
(interactive)
(idlwave-shell-save-and-action 'batch))
(idlwave-shell-last-save-and-action-file
(if (setq buf (idlwave-get-buffer-visiting
idlwave-shell-last-save-and-action-file))
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(save-buffer))))
(t (setq idlwave-shell-last-save-and-action-file
(read-file-name "File: ")))))
,idlwave-shell-last-save-and-action-file)
(if (idlwave-shell-hide-p 'run) 'mostly) nil t)
(idlwave-shell-bp-query))
- (let ((msg (format "No such file %s"
+ (let ((msg (format "No such file %s"
idlwave-shell-last-save-and-action-file)))
(setq idlwave-shell-last-save-and-action-file nil)
(error msg))))
"Alist of IDL procedure names and compiled source files.
Elements of the alist have the form:
- (module name . (source-file-truename idlwave-internal-filename)).")
+ (module name . (source-file-truename idlwave-internal-filename))")
(defun idlwave-shell-module-source-query (module &optional type)
"Determine the source file for a given module.
Query as a function if TYPE set to something beside 'pro."
(if module
- (idlwave-shell-send-command
+ (idlwave-shell-send-command
(format "print,(routine_info('%s',/SOURCE%s)).PATH" module
(if (eq type 'pro) "" ",/FUNCTIONS"))
`(idlwave-shell-module-source-filter ,module)
'hide 'wait)))
(defun idlwave-shell-module-source-filter (module)
- "Get module source, and update idlwave-shell-sources-alist."
+ "Get module source, and update `idlwave-shell-sources-alist'."
(let ((old (assoc (upcase module) idlwave-shell-sources-alist))
filename)
(when (string-match "\.PATH *[\n\r]\\([^%][^\r\n]+\\)[\n\r]"
idlwave-shell-command-output)
- (setq filename (substring idlwave-shell-command-output
+ (setq filename (substring idlwave-shell-command-output
(match-beginning 1) (match-end 1)))
(if old
(setcdr old (list (idlwave-shell-file-name filename) filename))
(setq idlwave-shell-sources-alist
- (append idlwave-shell-sources-alist
+ (append idlwave-shell-sources-alist
(list (cons (upcase module)
- (list (idlwave-shell-file-name filename)
+ (list (idlwave-shell-file-name filename)
filename)))))))))
-
+
(defun idlwave-shell-sources-query ()
"Determine source files for all IDL compiled procedures.
Queries IDL using the string in `idlwave-shell-sources-query'."
(defun idlwave-shell-sources-filter ()
"Get source files from `idlwave-shell-sources-query' output.
-Create `idlwave-shell-sources-alist' consisting of
-list elements of the form:
- (module name . (source-file-truename idlwave-internal-filename))."
- (save-excursion
- (set-buffer (get-buffer-create idlwave-shell-bp-buffer))
+Create `idlwave-shell-sources-alist' consisting of list elements
+of the form:
+ (module name . (source-file-truename idlwave-internal-filename))"
+ (with-current-buffer (get-buffer-create idlwave-shell-bp-buffer)
(erase-buffer)
(insert idlwave-shell-command-output)
(goto-char (point-min))
(append
;; compiled procedures
(progn
- (beginning-of-line)
- (narrow-to-region cpro (point))
+ (narrow-to-region cpro (point-at-bol))
(goto-char (point-min))
(idlwave-shell-sources-grep))
;; compiled functions
"Move point to next IDL syntax error."
(interactive)
(let (frame col)
- (save-excursion
- (set-buffer idlwave-shell-error-buffer)
+ (with-current-buffer idlwave-shell-error-buffer
(goto-char idlwave-shell-error-last)
(if (or
(re-search-forward idlwave-shell-syntax-error nil t)
(list
(save-match-data
(idlwave-shell-file-name
- (buffer-substring (match-beginning 1 )
+ (buffer-substring (match-beginning 1 )
(match-end 1))))
(string-to-number
(buffer-substring (match-beginning 2)
;; Keybindings ------------------------------------------------------------
(defvar idlwave-shell-mode-map (copy-keymap comint-mode-map)
- "Keymap for idlwave-mode.")
+ "Keymap for `idlwave-mode'.")
(defvar idlwave-shell-electric-debug-mode-map (make-sparse-keymap))
(defvar idlwave-shell-mode-prefix-map (make-sparse-keymap))
(fset 'idlwave-shell-mode-prefix-map idlwave-shell-mode-prefix-map)
(define-key idlwave-shell-mode-map "\C-c?" 'idlwave-routine-info)
(define-key idlwave-shell-mode-map "\C-g" 'idlwave-keyboard-quit)
(define-key idlwave-shell-mode-map "\M-?" 'idlwave-context-help)
-(define-key idlwave-shell-mode-map [(control meta ?\?)]
+(define-key idlwave-shell-mode-map [(control meta ?\?)]
'idlwave-help-assistant-help-with-topic)
(define-key idlwave-shell-mode-map "\C-c\C-i" 'idlwave-update-routine-info)
(define-key idlwave-shell-mode-map "\C-c\C-y" 'idlwave-shell-char-mode-loop)
;; The mouse bindings for PRINT and HELP
(idlwave-shell-define-key-both
- (if (featurep 'xemacs)
- [(shift button2)]
+ (if (featurep 'xemacs)
+ [(shift button2)]
[(shift down-mouse-2)])
'idlwave-shell-mouse-print)
(idlwave-shell-define-key-both
- (if (featurep 'xemacs)
- [(control meta button2)]
+ (if (featurep 'xemacs)
+ [(control meta button2)]
[(control meta down-mouse-2)])
'idlwave-shell-mouse-help)
(idlwave-shell-define-key-both
[(control shift down-mouse-2)])
'idlwave-shell-examine-select)
;; Add this one from the idlwave-mode-map
-(define-key idlwave-shell-mode-map
+(define-key idlwave-shell-mode-map
(if (featurep 'xemacs)
[(shift button3)]
[(shift mouse-3)])
'idlwave-mouse-context-help)
;; For Emacs, we need to turn off the button release events.
-(defun idlwave-shell-mouse-nop (event)
+(defun idlwave-shell-mouse-nop (event)
(interactive "e"))
(unless (featurep 'xemacs)
(idlwave-shell-define-key-both
(idlwave-shell-define-key-both
[(control meta mouse-2)] 'idlwave-shell-mouse-nop))
-
+
;; The following set of bindings is used to bind the debugging keys.
;; If `idlwave-shell-activate-prefix-keybindings' is non-nil, the
;; first key in the list gets bound the C-c C-d prefix map. If
;; `idlwave-mode-map' and `idlwave-shell-mode-map'. The next list
;; item, if non-nil, means to bind this as a single key in the
;; electric-debug-mode-map.
-;;
+;;
;; [C-c C-d]-binding debug-modifier-key command bind-electric-debug buf-only
-;; Used keys: abcdef hijklmnopqrstuvwxyz
-;; Unused keys: g
+;; Used keys: abcdef hijklmnopqrstuvwxyz
+;; Unused keys: g
(let* ((specs
'(([(control ?b)] ?b idlwave-shell-break-here t t)
([(control ?i)] ?i idlwave-shell-break-in t t)
cmd (nth 2 s)
electric (nth 3 s)
only-buffer (nth 4 s)
- cannotshift (and shift (char-valid-p c2) (eq c2 (upcase c2))))
-
+ cannotshift (and shift (characterp c2) (eq c2 (upcase c2))))
+
;; The regular prefix keymap.
(when (and idlwave-shell-activate-prefix-keybindings k1)
- (unless only-buffer
+ (unless only-buffer
(define-key idlwave-shell-mode-prefix-map k1 cmd))
(define-key idlwave-mode-prefix-map k1 cmd))
;; The debug modifier map
(unless only-buffer (define-key idlwave-shell-mode-map k2 cmd))))
;; The electric debug single-keystroke map
(if (and electric (char-or-string-p c2))
- (define-key idlwave-shell-electric-debug-mode-map (char-to-string c2)
+ (define-key idlwave-shell-electric-debug-mode-map (char-to-string c2)
cmd))))
;; A few extras in the electric debug map
(define-key idlwave-shell-electric-debug-mode-map " " 'idlwave-shell-step)
(define-key idlwave-shell-electric-debug-mode-map "+" 'idlwave-shell-stack-up)
(define-key idlwave-shell-electric-debug-mode-map "=" 'idlwave-shell-stack-up)
-(define-key idlwave-shell-electric-debug-mode-map "-"
+(define-key idlwave-shell-electric-debug-mode-map "-"
'idlwave-shell-stack-down)
-(define-key idlwave-shell-electric-debug-mode-map "_"
+(define-key idlwave-shell-electric-debug-mode-map "_"
'idlwave-shell-stack-down)
-(define-key idlwave-shell-electric-debug-mode-map "e"
+(define-key idlwave-shell-electric-debug-mode-map "e"
'(lambda () (interactive) (idlwave-shell-print '(16))))
(define-key idlwave-shell-electric-debug-mode-map "q" 'idlwave-shell-retall)
-(define-key idlwave-shell-electric-debug-mode-map "t"
+(define-key idlwave-shell-electric-debug-mode-map "t"
'(lambda () (interactive) (idlwave-shell-send-command "help,/TRACE")))
(define-key idlwave-shell-electric-debug-mode-map [(control ??)]
'idlwave-shell-electric-debug-help)
-(define-key idlwave-shell-electric-debug-mode-map "x"
- '(lambda (arg) (interactive "P")
+(define-key idlwave-shell-electric-debug-mode-map "x"
+ '(lambda (arg) (interactive "P")
(idlwave-shell-print arg nil nil t)))
(setq idlwave-shell-suppress-electric-debug nil)
(idlwave-shell-electric-debug-mode t)))
-(defvar idlwave-shell-electric-debug-read-only)
+(defvar idlwave-shell-electric-debug-read-only)
(defvar idlwave-shell-electric-debug-buffers nil)
(define-minor-mode idlwave-shell-electric-debug-mode
"Toggle Electric Debug mode.
-With no argument, this command toggles the mode.
+With no argument, this command toggles the mode.
Non-null prefix argument turns on the mode.
Null prefix argument turns off the mode.
" *Debugging*"
idlwave-shell-electric-debug-mode-map)
-(add-hook
+(add-hook
'idlwave-shell-electric-debug-mode-on-hook
(lambda ()
(set (make-local-variable 'idlwave-shell-electric-debug-read-only)
(setq buffer-read-only t)
(add-to-list 'idlwave-shell-electric-debug-buffers (current-buffer))
(if idlwave-shell-stop-line-overlay
- (overlay-put idlwave-shell-stop-line-overlay 'face
+ (overlay-put idlwave-shell-stop-line-overlay 'face
idlwave-shell-electric-stop-line-face))
(if (facep 'fringe)
(set-face-foreground 'fringe idlwave-shell-electric-stop-color
(selected-frame)))))
-(add-hook
+(add-hook
'idlwave-shell-electric-debug-mode-off-hook
(lambda ()
;; Return to previous read-only state
(setq idlwave-shell-electric-debug-buffers
(delq (current-buffer) idlwave-shell-electric-debug-buffers))
(if idlwave-shell-stop-line-overlay
- (overlay-put idlwave-shell-stop-line-overlay 'face
+ (overlay-put idlwave-shell-stop-line-overlay 'face
idlwave-shell-stop-line-face)
(if (facep 'fringe)
(set-face-foreground 'fringe (face-foreground 'default))))))
;; easy-mmode defines electric-debug-mode for us, so we need to advise it.
(defadvice idlwave-shell-electric-debug-mode (after print-enter activate)
- "Print out an entrance message"
+ "Print out an entrance message."
(when idlwave-shell-electric-debug-mode
(message
"Electric Debugging mode entered. Press [C-?] for help, [q] to quit"))
;; Show the help text
(defun idlwave-shell-electric-debug-help ()
(interactive)
- (with-output-to-temp-buffer "*IDLWAVE Electric Debug Help*"
+ (with-output-to-temp-buffer "*IDLWAVE Electric Debug Help*"
(princ idlwave-shell-electric-debug-help))
(let* ((current-window (selected-window))
(window (get-buffer-window "*IDLWAVE Electric Debug Help*"))
`("Debug"
["Electric Debug Mode"
idlwave-shell-electric-debug-mode
- :style toggle :selected idlwave-shell-electric-debug-mode
+ :style toggle :selected idlwave-shell-electric-debug-mode
:included (eq major-mode 'idlwave-mode) :keys "C-c C-d C-v"]
"--"
("Compile & Run"
"--"
["Goto Next Error" idlwave-shell-goto-next-error t]
"--"
- ["Compile and Run Region" idlwave-shell-run-region
+ ["Compile and Run Region" idlwave-shell-run-region
(eq major-mode 'idlwave-mode)]
- ["Evaluate Region" idlwave-shell-evaluate-region
+ ["Evaluate Region" idlwave-shell-evaluate-region
(eq major-mode 'idlwave-mode)]
"--"
["Execute Default Cmd" idlwave-shell-execute-default-command-line t]
["Edit Default Cmd" idlwave-shell-edit-default-command-line t])
("Breakpoints"
- ["Set Breakpoint" idlwave-shell-break-here
+ ["Set Breakpoint" idlwave-shell-break-here
:keys "C-c C-d C-b" :active (eq major-mode 'idlwave-mode)]
("Set Special Breakpoint"
["Set After Count Breakpoint"
["Set Condition Breakpoint"
(idlwave-shell-break-here '(4))
:active (eq major-mode 'idlwave-mode)])
- ["Break in Module" idlwave-shell-break-in
+ ["Break in Module" idlwave-shell-break-in
:keys "C-c C-d C-i" :active (eq major-mode 'idlwave-mode)]
["Break in this Module" idlwave-shell-break-this-module
:keys "C-c C-d C-j" :active (eq major-mode 'idlwave-mode)]
["Clear Breakpoint" idlwave-shell-clear-current-bp t]
["Clear All Breakpoints" idlwave-shell-clear-all-bp t]
["Disable/Enable Breakpoint" idlwave-shell-toggle-enable-current-bp t]
- ["Goto Previous Breakpoint" idlwave-shell-goto-previous-bp
+ ["Goto Previous Breakpoint" idlwave-shell-goto-previous-bp
:keys "C-c C-d [" :active (eq major-mode 'idlwave-mode)]
- ["Goto Next Breakpoint" idlwave-shell-goto-next-bp
+ ["Goto Next Breakpoint" idlwave-shell-goto-next-bp
:keys "C-c C-d ]" :active (eq major-mode 'idlwave-mode)]
["List All Breakpoints" idlwave-shell-list-all-bp t]
["Resync Breakpoints" idlwave-shell-bp-query t])
["Redisplay and Sync" idlwave-shell-redisplay t])
("Show Commands"
["Everything" (if (eq idlwave-shell-show-commands 'everything)
- (progn
+ (progn
(setq idlwave-shell-show-commands
(get 'idlwave-shell-show-commands 'last-val))
(put 'idlwave-shell-show-commands 'last-val nil))
- (put 'idlwave-shell-show-commands 'last-val
+ (put 'idlwave-shell-show-commands 'last-val
idlwave-shell-show-commands)
(setq idlwave-shell-show-commands 'everything))
:style toggle :selected (and (not (listp idlwave-shell-show-commands))
- (eq idlwave-shell-show-commands
+ (eq idlwave-shell-show-commands
'everything))]
"--"
["Compiling Commands" (idlwave-shell-add-or-remove-show 'run)
- :style toggle
- :selected (not (idlwave-shell-hide-p
+ :style toggle
+ :selected (not (idlwave-shell-hide-p
'run
(get 'idlwave-shell-show-commands 'last-val)))
:active (not (eq idlwave-shell-show-commands 'everything))]
["Breakpoint Commands" (idlwave-shell-add-or-remove-show 'breakpoint)
- :style toggle
- :selected (not (idlwave-shell-hide-p
+ :style toggle
+ :selected (not (idlwave-shell-hide-p
'breakpoint
(get 'idlwave-shell-show-commands 'last-val)))
:active (not (eq idlwave-shell-show-commands 'everything))]
["Debug Commands" (idlwave-shell-add-or-remove-show 'debug)
- :style toggle
- :selected (not (idlwave-shell-hide-p
+ :style toggle
+ :selected (not (idlwave-shell-hide-p
'debug
(get 'idlwave-shell-show-commands 'last-val)))
:active (not (eq idlwave-shell-show-commands 'everything))]
["Miscellaneous Commands" (idlwave-shell-add-or-remove-show 'misc)
- :style toggle
- :selected (not (idlwave-shell-hide-p
+ :style toggle
+ :selected (not (idlwave-shell-hide-p
'misc
(get 'idlwave-shell-show-commands 'last-val)))
:active (not (eq idlwave-shell-show-commands 'everything))])
:style toggle :selected idlwave-shell-use-input-mode-magic])
"--"
["Update Working Dir" idlwave-shell-resync-dirs t]
- ["Save Path Info"
+ ["Save Path Info"
(idlwave-shell-send-command idlwave-shell-path-query
'idlwave-shell-get-path-info
'hide)
(easy-menu-define
idlwave-shell-mode-menu idlwave-shell-mode-map "IDL shell menus"
idlwave-shell-menu-def)
- (save-excursion
- (mapc (lambda (buf)
- (set-buffer buf)
- (if (eq major-mode 'idlwave-mode)
- (progn
- (easy-menu-remove idlwave-mode-debug-menu)
- (easy-menu-add idlwave-mode-debug-menu))))
- (buffer-list)))))
+ (save-current-buffer
+ (dolist (buf (buffer-list))
+ (set-buffer buf)
+ (if (eq major-mode 'idlwave-mode)
+ (progn
+ (easy-menu-remove idlwave-mode-debug-menu)
+ (easy-menu-add idlwave-mode-debug-menu)))))))
;; The Breakpoint Glyph -------------------------------------------------------
\" .XXXX. \",
\" .... \",
\" \"};"))) im-cons im)
-
+
(while (setq im-cons (pop image-alist))
(setq im (cond ((and (featurep 'xemacs)
(featurep 'xpm))
((and (not (featurep 'xemacs))
(fboundp 'image-type-available-p)
(image-type-available-p 'xpm))
- (list 'image :type 'xpm :data (cdr im-cons)
+ (list 'image :type 'xpm :data (cdr im-cons)
:ascent 'center))
(t nil)))
(if im (push (cons (car im-cons) im) idlwave-shell-bp-glyph))))
(provide 'idlw-shell)
(provide 'idlwave-shell)
-;;; Load the toolbar when wanted by the user.
+;; Load the toolbar when wanted by the user.
-(autoload 'idlwave-toolbar-toggle "idlw-toolbar"
- "Toggle the IDLWAVE toolbar")
+(autoload 'idlwave-toolbar-toggle "idlw-toolbar"
+ "Toggle the IDLWAVE toolbar.")
(autoload 'idlwave-toolbar-add-everywhere "idlw-toolbar"
- "Add IDLWAVE toolbar")
+ "Add IDLWAVE toolbar.")
(defun idlwave-shell-toggle-toolbar ()
"Toggle the display of the debugging toolbar."
(interactive)
(if idlwave-shell-use-toolbar
(add-hook 'idlwave-shell-mode-hook 'idlwave-toolbar-add-everywhere))
-;; arch-tag: 20c2e8ce-0709-41d8-a5b6-bb039148440a
;;; idlw-shell.el ends here
HCoop / bpt / emacs.git / blobdiff