xemacs-beta: lisp/edebug/edebug.el comparison

comparison lisp/edebug/edebug.el @ 4:b82b59fe008d r19-15b3

Import from CVS: tag r19-15b3

author	cvs
date	Mon, 13 Aug 2007 08:46:56 +0200
parents	376386a54a3c
children	441bb1e64a06

comparison

equal deleted inserted replaced

-:30df88044ec6
+:b82b59fe008d
 ;; Copyright (C) 1988,'89,'90,'91,'92,'93,'94,'95 Free Software Foundation, Inc
 ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu>
 ;; Keywords: lisp, tools, maint
+;; This file is part of XEmacs.
+;; XEmacs 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 2, or (at your option)
+;; any later version.
+;; XEmacs is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+;; You should have received a copy of the GNU General Public License
+;; along with XEmacs; see the file COPYING.  If not, write to the Free
+;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;; 02111-1307, USA.
+;;; Synched up with: Not in FSF
+;;; Commentary:
 ;; LCD Archive Entry:
 ;; edebug|Daniel LaLiberte|liberte@cs.uiuc.edu
 ;; |A source level debugger for Emacs Lisp.
-;; |$Date: 1996/12/18 03:33:28 $|$Revision: 1.1.1.1 $|~/modes/edebug.el|
+;; |$Date: 1996/12/18 03:54:30 $|$Revision: 1.1.1.2 $|~/modes/edebug.el|
-;; This file is part of GNU Emacs.
+;; This minor mode allows programmers to step through Emacs Lisp
+;; source code while executing functions.  You can also set
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; breakpoints, trace (stopping at each expression), evaluate
-;; it under the terms of the GNU General Public License as published by
+;; expressions as if outside Edebug, reevaluate and display a list of
-;; the Free Software Foundation; either version 2, or (at your option)
+;; expressions, trap errors normally caught by debug, and display a
-;; any later version.
+;; debug style backtrace.
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; Installation
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; =============
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
+;; Put edebug.el in some directory in your load-path and
+;; byte-compile it.  Also read the beginning of edebug-epoch.el,
-;; You should have received a copy of the GNU General Public License
+;; cl-specs.el, and edebug-cl-read.el if they apply to you.
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; Unless you are using Emacs 19 which is already set up to use Edebug,
+;; put the following forms in your .emacs file.
-;;;; Commentary:
+;; (define-key emacs-lisp-mode-map "\C-xx" 'edebug-eval-top-level-form)
+;; (autoload 'edebug-eval-top-level-form "edebug")
-;;; This minor mode allows programmers to step through Emacs Lisp
-;;; source code while executing functions.  You can also set
+;; If you wish to change the default edebug global command prefix, change:
-;;; breakpoints, trace (stopping at each expression), evaluate
+;; (setq edebug-global-prefix "\C-xX")
-;;; expressions as if outside Edebug, reevaluate and display a list of
-;;; expressions, trap errors normally caught by debug, and display a
+;; Other options, are described in the manual.
-;;; debug style backtrace.
+;; In previous versions of Edebug, users were directed to set
-;;;; Installation
+;; `debugger' to `edebug-debug'.  This is no longer necessary
-;;; =============
+;; since Edebug automatically sets it whenever Edebug is active.
-;;; Put edebug.el in some directory in your load-path and
+;; Minimal Instructions
-;;; byte-compile it.  Also read the beginning of edebug-epoch.el,
+;; =====================
-;;; cl-specs.el, and edebug-cl-read.el if they apply to you.
+;; First evaluate a defun with C-xx, then run the function.  Step
-;;; Unless you are using Emacs 19 which is already set up to use Edebug,
+;; through the code with SPC, mark breakpoints with b, go until a
-;;; put the following forms in your .emacs file.
+;; breakpoint is reached with g, and quit execution with q.  Use the
-;;; (define-key emacs-lisp-mode-map "\C-xx" 'edebug-eval-top-level-form)
+;; "?" command in edebug to describe other commands.  See edebug.tex
-;;; (autoload 'edebug-eval-top-level-form "edebug")
+;; or the Emacs 19 Lisp Reference Manual for more instructions.
-;;; If you wish to change the default edebug global command prefix, change:
+;; Send me your enhancements, ideas, bugs, or fixes.
-;;; (setq edebug-global-prefix "\C-xX")
+;; For bugs, you can call edebug-submit-bug-report if you have reporter.el.
+;; There is an edebug mailing list if you want to keep up
-;;; Other options, are described in the manual.
+;; with the latest developments. Requests to: edebug-request@cs.uiuc.edu
-;;; In previous versions of Edebug, users were directed to set
+;; Daniel LaLiberte   217-398-4114
-;;; `debugger' to `edebug-debug'.  This is no longer necessary
+;; University of Illinois, Urbana-Champaign
-;;; since Edebug automatically sets it whenever Edebug is active.
+;; Department of Computer Science
+;; 1304 W Springfield
-;;;; Minimal Instructions
+;; Urbana, IL  61801
-;;; =====================
+;; uiucdcs!liberte
-;;; First evaluate a defun with C-xx, then run the function.  Step
+;; liberte@cs.uiuc.edu
-;;; through the code with SPC, mark breakpoints with b, go until a
-;;; breakpoint is reached with g, and quit execution with q.  Use the
+;; ===============================
-;;; "?" command in edebug to describe other commands.  See edebug.tex
+;; For the early revision history, see edebug-history.
-;;; or the Emacs 19 Lisp Reference Manual for more instructions.
+;;; Code:
-;;; Send me your enhancements, ideas, bugs, or fixes.
-;;; For bugs, you can call edebug-submit-bug-report if you have reporter.el.
-;;; There is an edebug mailing list if you want to keep up
-;;; with the latest developments. Requests to: edebug-request@cs.uiuc.edu
-;;; Daniel LaLiberte   217-398-4114
-;;; University of Illinois, Urbana-Champaign
-;;; Department of Computer Science
-;;; 1304 W Springfield
-;;; Urbana, IL  61801
-;;; uiucdcs!liberte
-;;; liberte@cs.uiuc.edu
-;;; ===============================
-;;; For the early revision history, see edebug-history.
 (defconst edebug-version
-(let ((raw-version "$Revision: 1.1.1.1 $"))
+(let ((raw-version "$Revision: 1.1.1.2 $"))
 (substring raw-version (string-match "[0-9.]*" raw-version)
 	       (match-end 0))))
 (require 'backquote)
 ;; Emacs 18 doesnt have defalias.
 (eval-and-compile
 (or (fboundp 'defalias) (fset 'defalias 'fset)))
-;;;; Bug reporting
+;; Bug reporting
-;;; ==============
+;; ==============
 (defconst edebug-maintainer-address "liberte@cs.uiuc.edu")
 (defun edebug-submit-bug-report ()
 "Submit, via mail, a bug report on edebug."
 'edebug-print-level
 'edebug-print-circle
 	       ))))
-;;;; Options
+;; Options
-;;; ===============================
+;; ===============================
 (defvar edebug-setup-hook nil
 "*Functions to call before edebug is used.
 Each time it is set to a new value, Edebug will call those functions
 once and then `edebug-setup-hook' is reset to nil.  You could use this
 (defvar edebug-global-break-condition nil
 "*If non-nil, an expression to test for at every stop point.
 If the result is non-nil, then break.  Errors are ignored.")
-;;;; Form spec utilities.
+;; Form spec utilities.
-;;; ===============================
+;; ===============================
 ;;;###autoload
 (defmacro def-edebug-spec (symbol spec)
 "Set the edebug-form-spec property of SYMBOL according to SPEC.
 Both SYMBOL and SPEC are unevaluated. The SPEC can be 0, t, a symbol
 (setq edebug-form-spec indirect))
 edebug-form-spec
 ))
-;;;; Utilities
+;; Utilities
-;;; ===============================
+;; ===============================
 ;; Define edebug-gensym - from old cl.el
 (defvar edebug-gensym-index 0
 "Integer used by `edebug-gensym' to produce new names.")
 (defun edebug-functionp (object)
 "Returns the function named by OBJECT, or nil if it is not a function."
 (setq object (edebug-lookup-function object))
 (if (or (subrp object)
-	  (byte-code-function-p object)
+	  (compiled-function-p object)
 	  (and (listp object)
 	       (eq (car object) 'lambda)
 	       (listp (car (cdr object)))))
 object))
 	   (progn (,@ body))
 	 (save-excursion
 	   (set-buffer (marker-buffer edebug:s-r-beg))
 	   (narrow-to-region edebug:s-r-beg edebug:s-r-end))))))
-;;;; Display
+;; Display
-;;; ============
+;; ============
 (defconst edebug-trace-buffer "*edebug-trace*"
 "Name of the buffer to put trace info in.")
 (defun edebug-pop-to-buffer (buffer &optional window)
 (defalias 'edebug-get-buffer-window 'get-buffer-window)
 (defalias 'edebug-sit-for 'sit-for)
 (defalias 'edebug-input-pending-p 'input-pending-p)
-;;;; Redefine read and eval functions
+;; Redefine read and eval functions
-;;; =================================
+;; =================================
-;;; read is redefined to maybe instrument forms.
+;; read is redefined to maybe instrument forms.
-;;; eval-defun is redefined to check edebug-all-forms and edebug-all-defs.
+;; eval-defun is redefined to check edebug-all-forms and edebug-all-defs.
-;;; Use the Lisp version of eval-region.
+;; Use the Lisp version of eval-region.
 (require 'eval-reg "eval-reg")
 ;; Save the original read function
 (or (fboundp 'edebug-original-read)
 (defalias 'edebug-original-read  (symbol-function 'read)))
 (elisp-eval-region-uninstall)
 (defalias 'read (symbol-function 'edebug-original-read))
 (defalias 'eval-defun (symbol-function 'edebug-original-eval-defun)))
-;;;; Edebug internal data
+;; Edebug internal data
-;;; ===============================
+;; ===============================
-;;; The internal data that is needed for edebugging is kept in the
+;; The internal data that is needed for edebugging is kept in the
-;;; buffer-local variable `edebug-form-data'.
+;; buffer-local variable `edebug-form-data'.
 ;; XEmacs change?
 (defconst edebug-form-data nil)
 (make-variable-buffer-local 'edebug-form-data)
 	;; (set-marker (nth 1 entry) nil)
 	;; (set-marker (nth 2 entry) nil)
 	(setq edebug-form-data (delq entry edebug-form-data)))))
-;;;; Parser utilities
+;; Parser utilities
-;;; ===============================
+;; ===============================
 (defun edebug-syntax-error (&rest args)
 ;; Signal an invalid-read-syntax with ARGS.
 (signal 'invalid-read-syntax args))
 (list 'quote (edebug-read-sexp)))
 (t ; anything else, just read it.
 (edebug-original-read (current-buffer))))))
-;;;; Offsets for reader
+;; Offsets for reader
-;;; ==============================
+;; ==============================
 ;; Define a structure to represent offset positions of expressions.
 ;; Each offset structure looks like: (before . after) for constituents,
 ;; or for structures that have elements: (before <subexpressions> . after)
 ;; where the <subexpressions> are the offset structures for subexpressions
 	   (edebug-store-before-offset (, point))
 	   (,@ body))
 (edebug-store-after-offset (point)))))
-;;;; Reader for Emacs Lisp.
+;; Reader for Emacs Lisp.
-;;; ==========================================
+;; ==========================================
 ;; Uses edebug-next-token-class (and edebug-skip-whitespace) above.
 (defconst edebug-read-alist
 '((symbol . edebug-read-symbol)
 (lparen . edebug-read-list)
 (forward-char 1)			; skip \]
 ))
-;;;; Cursors for traversal of list and vector elements with offsets.
+;; Cursors for traversal of list and vector elements with offsets.
-;;;====================================================================
+;;====================================================================
 (defvar edebug-dotted-spec nil)
 (defun edebug-new-cursor (expressions offsets)
 ;; Return a new cursor for EXPRESSIONS with OFFSETS.
 (let ((offset (edebug-top-offset cursor)))
 (while (consp offset)
 (setq offset (cdr offset)))
 offset))
-;;;; The Parser
+;; The Parser
-;;; ===============================
+;; ===============================
-;;; The top level function for parsing forms is
+;; The top level function for parsing forms is
-;;; edebug-read-and-maybe-wrap-form; it calls all the rest.  It checks the
+;; edebug-read-and-maybe-wrap-form; it calls all the rest.  It checks the
-;;; syntax a bit and leaves point at any error it finds, but otherwise
+;; syntax a bit and leaves point at any error it finds, but otherwise
-;;; should appear to work like eval-defun.
+;; should appear to work like eval-defun.
-;;; The basic plan is to surround each expression with a call to
+;; The basic plan is to surround each expression with a call to
-;;; the edebug debugger together with indexes into a table of positions of
+;; the edebug debugger together with indexes into a table of positions of
-;;; all expressions.  Thus an expression "exp" becomes:
+;; all expressions.  Thus an expression "exp" becomes:
-;;; (edebug-after (edebug-before 1) 2 exp)
+;; (edebug-after (edebug-before 1) 2 exp)
-;;; When this is evaluated, first point is moved to the beginning of
+;; When this is evaluated, first point is moved to the beginning of
-;;; exp at offset 1 of the current function.  The expression is
+;; exp at offset 1 of the current function.  The expression is
-;;; evaluated, which may cause more edebug calls, and then point is
+;; evaluated, which may cause more edebug calls, and then point is
-;;; moved to offset 2 after the end of exp.
+;; moved to offset 2 after the end of exp.
-;;; The highest level expressions of the function are wrapped in a call to
+;; The highest level expressions of the function are wrapped in a call to
-;;; edebug-enter, which supplies the function name and the actual
+;; edebug-enter, which supplies the function name and the actual
-;;; arguments to the function.  See functions edebug-enter, edebug-before,
+;; arguments to the function.  See functions edebug-enter, edebug-before,
-;;; and edebug-after for more details.
+;; and edebug-after for more details.
 ;; Dynamically bound vars, left unbound, but globally declared.
 ;; This is to quiet the byte compiler.
 ;; Window data of the highest definition being wrapped.
 		;; This is incorrect in general!! But OK most of the time.
 		def-name (if (and defining-form-p
 				  (eq 'name (car (cdr spec)))
 				  (eq 'symbol (edebug-next-token-class)))
 			     (edebug-original-read (current-buffer))))))
-;;;(message "all defs: %s   all forms: %s"  edebug-all-defs edebug-all-forms)
+;;(message "all defs: %s   all forms: %s"  edebug-all-defs edebug-all-forms)
 (cond
 (defining-form-p
 (if (or edebug-all-defs edebug-all-forms)
 	   ;; If it is a defining form and we are edebugging defs,
 	   ;; then let edebug-list-form start it.
 (t (edebug-syntax-error
 	 "Head of list form must be a symbol or lambda expression.")))
 ))
-;;;; Matching of specs.
+;; Matching of specs.
-;;; ===================
+;; ===================
 (defvar edebug-after-dotted-spec nil)
 (defvar edebug-matching-depth 0)  ;; initial value
 (defconst edebug-max-depth 150)  ;; maximum number of matching recursions.
-;;;; Failure to match
+;; Failure to match
-;;; ==================
+;; ==================
 ;; This throws to no-match, if there are higher alternatives.
 ;; Otherwise it signals an error.  The place of the error is found
 ;; with the two before- and after-offset functions.
 (defun edebug-no-match (cursor &rest edebug-args)
 ;; Not to be used otherwise.
 (let ((edebug-inside-func t))
 (list (edebug-wrap-def-body (edebug-forms cursor)))))
-;;;; Edebug Form Specs
+;; Edebug Form Specs
-;;; ==========================================================
+;; ==========================================================
-;;; See cl-specs.el for common lisp specs.
+;; See cl-specs.el for common lisp specs.
-;;;;* Spec for def-edebug-spec
+;;* Spec for def-edebug-spec
-;;; Out of date.
+;; Out of date.
 (defun edebug-spec-p (object)
 "Return non-nil if OBJECT is a symbol with an edebug-form-spec property."
 (and (symbolp object)
 (get object 'edebug-form-spec)))
 edebug-spec-p  ;; Including all the special ones e.g. form.
 symbolp;; a predicate
 ))
-;;;;* Emacs special forms and some functions.
+;;* Emacs special forms and some functions.
 ;; quote expects only one argument, although it allows any number.
 (def-edebug-spec quote sexp)
 ;; The standard defining forms.
 	   [&optional stringp]
 	   [&optional ("interactive" interactive)]
 	   def-body))
-;;;; The debugger itself
+;; The debugger itself
-;;; ===============================
+;; ===============================
 (defvar edebug-active nil)  ;; Non-nil when edebug is active
-;;; add minor-mode-alist entry
+;; add minor-mode-alist entry
 (or (assq 'edebug-active minor-mode-alist)
 (setq minor-mode-alist (cons (list 'edebug-active " *Debugging*")
 				 minor-mode-alist)))
 (defvar edebug-stack nil)
 (defvar post-command-hook nil)
 (defvar post-command-idle-hook nil)
 (defvar cl-lexical-debug)  ;; Defined in cl.el
-;;; Handling signals
+;; Handling signals
-;;; =================
+;; =================
 (if (not (fboundp 'edebug-original-signal))
 (defalias 'edebug-original-signal (symbol-function 'signal)))
 ;; We should use advise for this!!
 ;; If we reach here without another non-local exit, then send signal again.
 ;; i.e. the signal is not continuable, yet.
 (edebug-original-signal edebug-signal-name edebug-signal-data))
-;;; Entering Edebug
+;; Entering Edebug
-;;; ==================
+;; ==================
 (defun edebug-enter (edebug-function edebug-args edebug-body)
 ;; Entering FUNC.  The arguments are ARGS, and the body is BODY.
 ;; Setup edebug variables and evaluate BODY.  This function is called
 ;; when a function evaluated with edebug-eval-top-level-form is entered.
 	    ;; Lexical bindings must be uncompiled for this to work.
 	    (cl-lexical-debug t)
 	    ;; Save the outside value of executing macro.  (here??)
-	    (edebug-outside-executing-macro executing-macro)
+	    (edebug-outside-executing-macro executing-kbd-macro)
 	    (edebug-outside-pre-command-hook pre-command-hook)
 	    (edebug-outside-post-command-hook post-command-hook)
 	    (edebug-outside-post-command-idle-hook post-command-idle-hook))
 	(unwind-protect
 	    (let (;; Don't keep reading from an executing kbd macro
 		  ;; within edebug unless edebug-continue-kbd-macro is
 		  ;; non-nil.  Again, local binding may not be best.
-		  (executing-macro
+		  (executing-kbd-macro
-		   (if edebug-continue-kbd-macro executing-macro))
+		   (if edebug-continue-kbd-macro executing-kbd-macro))
 		  ;; Disable command hooks.  This is essential when
 		  ;; a hook function is instrumented - to avoid infinite loop.
 		  ;; This may be more than we need, however.
 		  (pre-command-hook nil)
 	      (fset 'signal 'edebug-signal)
 	      (unwind-protect
 		  (edebug-enter edebug-function edebug-args edebug-body)
 		(fset 'signal (symbol-function 'edebug-original-signal))))
 	  ;; Reset global variables in case outside value was changed.
-	  (setq executing-macro edebug-outside-executing-macro
+	  (setq executing-kbd-macro edebug-outside-executing-macro
 		pre-command-hook edebug-outside-pre-command-hook
 		post-command-hook edebug-outside-post-command-hook
 		post-command-idle-hook edebug-outside-post-command-idle-hook
 		)))
 defining-kbd-macro edebug-outside-defining-kbd-macro
 ))
 ))
-;;; Display related functions
+;; Display related functions
-;;; ===============================
+;; ===============================
 (defun edebug-adjust-window (old-start)
 ;; If pos is not visible, adjust current window to fit following context.
-;;;  (message "window: %s old-start: %s window-start: %s pos: %s"
+;;  (message "window: %s old-start: %s window-start: %s pos: %s"
-;;;	   (selected-window) old-start (window-start) (point)) (sit-for 5)
+;;	   (selected-window) old-start (window-start) (point)) (sit-for 5)
 (if (not (pos-visible-in-window-p))
 (progn
 	;; First try old-start
 	(if old-start
 	    (set-window-start (selected-window) old-start))
 	    (cons buffer edebug-display-buffer-list)))
 (message "Displaying %s %s" buffer
 	     (if already-displaying "off" "on"))))
-;;; Breakpoint related functions
+;; Breakpoint related functions
-;;; ===============================
+;; ===============================
 (defun edebug-find-stop-point ()
 ;; Return (function . index) of the nearest edebug stop point.
 (let* ((edebug-def-name (edebug-form-data-symbol))
 	 (edebug-data
 		      "Global Condition: "
 		      (format "%s" edebug-global-break-condition))))
 (setq edebug-global-break-condition expression))
-;;; Mode switching functions
+;; Mode switching functions
-;;; ===============================
+;; ===============================
 (defun edebug-set-mode (mode shortmsg msg)
 ;; Set the edebug mode to MODE.
 ;; Display SHORTMSG, or MSG if not within edebug.
 (if (eq (1+ edebug-recursion-depth) (recursion-depth))
 ;;  "Go until the current function exits."
 ;;  (interactive)
 ;;  (edebug-set-mode 'exiting "Exit..."))
-;;; -----------------------------------------------------------------
+;; -----------------------------------------------------------------
-;;; The following initial mode setting definitions are not used yet.
+;; The following initial mode setting definitions are not used yet.
 '(defconst edebug-initial-mode-alist
 '((edebug-Continue-fast . Continue-fast)
 (edebug-Trace-fast . Trace-fast)
 (edebug-continue . continue)
 		   this-function mode))
 (error "Key must map to one of the mode changing commands")
 )))
-;;; Evaluation of expressions
+;; Evaluation of expressions
-;;; ===============================
+;; ===============================
 (def-edebug-spec edebug-outside-excursion t)
 (defmacro edebug-outside-excursion (&rest body)
 "Evaluate an expression list in the outside context.
 	     (last-nonmenu-event edebug-outside-last-nonmenu-event)
 	     (track-mouse edebug-outside-track-mouse)
 	     (standard-output edebug-outside-standard-output)
 	     (standard-input edebug-outside-standard-input)
-	     (executing-macro edebug-outside-executing-macro)
+	     (executing-kbd-macro edebug-outside-executing-macro)
 	     (defining-kbd-macro edebug-outside-defining-kbd-macro)
 	     (pre-command-hook edebug-outside-pre-command-hook)
 	     (post-command-hook edebug-outside-post-command-hook)
 	     (post-command-idle-hook edebug-outside-post-command-idle-hook)
 	    edebug-outside-last-nonmenu-event last-nonmenu-event
 	    edebug-outside-track-mouse track-mouse
 	    edebug-outside-standard-output standard-output
 	    edebug-outside-standard-input standard-input
-	    edebug-outside-executing-macro executing-macro
+	    edebug-outside-executing-macro executing-kbd-macro
 	    edebug-outside-defining-kbd-macro defining-kbd-macro
 	    edebug-outside-pre-command-hook pre-command-hook
 	    edebug-outside-post-command-hook post-command-hook
 	    edebug-outside-post-command-idle-hook post-command-idle-hook
 (edebug-eval edebug-expr)
 (error (edebug-format "%s: %s"  ;; could
 			  (get (car edebug-err) 'error-message)
 			  (car (cdr edebug-err))))))
-;;;; Printing
+;; Printing
-;;; =========
+;; =========
 ;; Replace printing functions.
 ;; obsolete names
 (defalias 'edebug-install-custom-print-funcs 'edebug-install-custom-print)
 (defalias 'edebug-reset-print-funcs 'edebug-uninstall-custom-print)
 (defun edebug-previous-result ()
 "Print the previous result."
 (interactive)
 (message "%s" edebug-previous-result))
-;;;; Read, Eval and Print
+;; Read, Eval and Print
-;;; =====================
+;; =====================
 (defun edebug-eval-expression (edebug-expr)
 "Evaluate an expression in the outside environment.
 If interactive, prompt for the expression.
 Print result in minibuffer."
 (princ edebug-result-string)
 (princ "\n")
 ))
-;;;; Edebug Minor Mode
+;; Edebug Minor Mode
-;;; ===============================
+;; ===============================
 ;; Global GUD bindings for all emacs-lisp-mode buffers.
 (define-key emacs-lisp-mode-map "\C-x\C-a\C-s" 'edebug-step-mode)
 (define-key emacs-lisp-mode-map "\C-x\C-a\C-n" 'edebug-next-mode)
 (define-key emacs-lisp-mode-map "\C-x\C-a\C-c" 'edebug-go-mode)
 edebug-global-break-condition
 "
 (use-local-map edebug-mode-map))
-;;;; edebug eval list mode
+;; edebug eval list mode
-;;; ===============================================
+;; ===============================================
 ;; A list of expressions and their evaluations is displayed in *edebug*.
 (defun edebug-eval-result-list ()
 "Return a list of evaluations of edebug-eval-list"
 ;; Assumes in outside environment.
 (setq major-mode 'edebug-eval-mode)
 (setq mode-name "Edebug-Eval")
 (use-local-map edebug-eval-mode-map))
-;;;; Interface with standard debugger.
+;; Interface with standard debugger.
-;;; ========================================
+;; ========================================
 ;; (setq debugger 'edebug) ; to use the edebug debugger
 ;; (setq debugger 'debug)  ; use the standard debugger
 ;; Note that debug and its utilities must be byte-compiled to work,
 	  (delete-region last-ok-point (point))
 	  )))
 )))))
-;;;; Trace display
+;; Trace display
 ;; ===============================
 (defun edebug-trace-display (buf-name fmt &rest args)
 "In buffer BUF-NAME, display FMT and ARGS at the end and make it visible.
 The buffer is created if it does not exist.
 (defun edebug-trace (fmt &rest args)
 "Convenience call to edebug-trace-display using edebug-trace-buffer"
 (apply 'edebug-trace-display edebug-trace-buffer fmt args))
-;;;; Frequency count and coverage
+;; Frequency count and coverage
-;;; ==============================
+;; ==============================
 (defun edebug-display-freq-count ()
 "Display the frequency count data for each line of the current
 definition.  The frequency counts are inserted as comment lines after
 each line, and you can undo all insertions with one `undo' command.
 (edebug-display-freq-count)
 (setq unread-command-char (read-char))
 (undo)))
-;;;; Menus
+;; Menus
-;;;=========
+;;=========
 (defun edebug-toggle (variable)
 (set variable (not (eval variable)))
 (message "%s: %s" variable (eval variable)))
 (edebug-toggle 'edebug-save-displayed-buffer-points) t]
 ))
 "XEmacs style menus for Edebug.")
-;;;; Emacs version specific code
+;; Emacs version specific code
-;;;=============================
+;;=============================
-;;; The default for all above is Emacs 18, because it is easier to compile
+;; The default for all above is Emacs 18, because it is easier to compile
-;;; Emacs 18 code in Emacs 19 than vice versa.  This default will
+;; Emacs 18 code in Emacs 19 than vice versa.  This default will
-;;; change once most people are using Emacs 19 or derivatives.
+;; change once most people are using Emacs 19 or derivatives.
 ;; Epoch specific code is in a separate file: edebug-epoch.el.
 ;; The byte-compiler will complain about changes in number of arguments
 ;; to functions like mark and read-from-minibuffer.  These warnings
 (edebug-outside-excursion
 (setq values (cons (edebug-eval edebug-expr) values))
 (edebug-safe-prin1-to-string (car values)))))
 (easy-menu-define edebug-menu edebug-mode-map "Edebug menus" edebug-mode-menus)
-(if window-system
+(if (eq (console-type) 'x)
 (x-popup-menu nil (lookup-key edebug-mode-map [menu-bar Edebug])))
 )
 (defun edebug-xemacs-specific ()
 (edebug-emacs-19-specific))))
 (edebug-emacs-version-specific)
-;;;; Byte-compiler
+;; Byte-compiler
-;;; ====================
+;; ====================
 ;; Extension for bytecomp to resolve undefined function references.
 ;; Requires new byte compiler.
 ;; Reenable byte compiler warnings about unread-command-char and -event.
 ;; Disabled before edebug-recursive-edit.
 '(read-expression-history))
 )))
-;;;; Autoloading of Edebug accessories
+;; Autoloading of Edebug accessories
-;;;===================================
+;;===================================
 (if (featurep 'cl)
 (add-hook 'edebug-setup-hook
 	      (function (lambda () (require 'cl-specs))))
 ;; The following causes cl-specs to be loaded if you load cl.el.
 ;; The following causes edebug-cl-read to be loaded when you load cl-read.el.
 (add-hook 'cl-read-load-hooks
 	    (function (lambda () (require 'edebug-cl-read)))))
-;;;; Finalize Loading
+;; Finalize Loading
-;;;===================
+;;===================
-;;; Finally, hook edebug into the rest of Emacs.
+;; Finally, hook edebug into the rest of Emacs.
-;;; There are probably some other things that could go here.
+;; There are probably some other things that could go here.
 ;; Install edebug read and eval functions.
 (edebug-install-read-eval-functions)
 (provide 'edebug)
 ;;; edebug.el ends here

Mercurial > hg > xemacs-beta

comparison lisp/edebug/edebug.el @ 4:b82b59fe008d r19-15b3