emacs: lisp/emacs-lisp/debug.el comparison

comparison lisp/emacs-lisp/debug.el @ 90201:fbb2bea03df9

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-69 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 474-484) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 88-91) - Merge from emacs--cvs-trunk--0 - Update FSF's address in GPL notices - Update from CVS

author	Miles Bader <miles@gnu.org>
date	Thu, 14 Jul 2005 08:02:00 +0000
parents	f9a65d7ebd29 193c8e4fb4d1
children	2d92f5c9d6ae

comparison

equal deleted inserted replaced

-:f9a65d7ebd29
+:fbb2bea03df9
 	  (debugger-outer-last-nonmenu-event last-nonmenu-event)
 	  (debugger-outer-last-event-frame last-event-frame)
 	  (debugger-outer-standard-input standard-input)
 	  (debugger-outer-standard-output standard-output)
 	  (debugger-outer-inhibit-redisplay inhibit-redisplay)
-	  (debugger-outer-cursor-in-echo-area cursor-in-echo-area))
+	  (debugger-outer-cursor-in-echo-area cursor-in-echo-area)
+	  (debugger-with-timeout-suspend (with-timeout-suspend)))
 ;; Set this instead of binding it, so that `q'
 ;; will not restore it.
 (setq overriding-terminal-local-map nil)
 ;; Don't let these magic variables affect the debugger itself.
 (let ((last-command nil) this-command track-mouse
 ;; here would cause flashing.
 ;; Use quit-window rather than bury-buffer to quieten
 ;; Drew Adams.  --Stef
 (quit-window))))
 	    (kill-buffer debugger-buffer))
+	  (with-timeout-unsuspend debugger-with-timeout-suspend)
 	  (set-match-data debugger-outer-match-data)))
 ;; Put into effect the modified values of these variables
 ;; in case the user set them with the `e' command.
 (setq load-read-function debugger-outer-load-read-function)
 (setq overriding-local-map debugger-outer-overriding-local-map)
 		(current-buffer))
 	 (insert ?\n)))
 ;; After any frame that uses eval-buffer,
 ;; insert a line that states the buffer position it's reading at.
 (save-excursion
-(while (re-search-forward "^  eval-buffer(" nil t)
+(let ((tem eval-buffer-list))
-(end-of-line)
+(while (and tem
-(insert (format "\n  ;;; Reading at buffer position %d"
+		  (re-search-forward "^  eval-\\(buffer\\|region\\)(" nil t))
-		      (with-current-buffer (nth 2 (backtrace-frame (debugger-frame-number)))
+	(end-of-line)
-			(point))))))
+	(insert (format "  ; Reading at buffer position %d"
+			;; This will get the wrong result
+			;; if there are two nested eval-region calls
+			;; for the same buffer.  That's not a very useful case.
+			(with-current-buffer (car tem)
+			  (point))))
+	(pop tem))))
 (debugger-make-xrefs))
 (defun debugger-make-xrefs (&optional buffer)
 "Attach cross-references to function names in the `*Backtrace*' buffer."
 (interactive "b")
 (define-key map "h" 'describe-mode)
 (define-key map "q" 'top-level)
 (define-key map "e" 'debugger-eval-expression)
 (define-key map " " 'next-line)
 (define-key map "R" 'debugger-record-expression)
-(define-key map "\C-m" 'help-follow)
+(define-key map "\C-m" 'debug-help-follow)
 (define-key map [mouse-2] 'push-button)
 map))
+(put 'debugger-mode 'mode-class 'special)
+(defun debugger-mode ()
+"Mode for backtrace buffers, selected in debugger.
+\\<debugger-mode-map>
+A line starts with `*' if exiting that frame will call the debugger.
+Type \\[debugger-frame] or \\[debugger-frame-clear] to set or remove the `*'.
+When in debugger due to frame being exited,
+use the \\[debugger-return-value] command to override the value
+being returned from that frame.
+Use \\[debug-on-entry] and \\[cancel-debug-on-entry] to control
+which functions will enter the debugger when called.
+Complete list of commands:
+\\{debugger-mode-map}"
+(kill-all-local-variables)
+(setq major-mode 'debugger-mode)
+(setq mode-name "Debugger")
+(setq truncate-lines t)
+(set-syntax-table emacs-lisp-mode-syntax-table)
+(use-local-map debugger-mode-map)
+(run-mode-hooks 'debugger-mode-hook))
 (defcustom debugger-record-buffer "*Debugger-record*"
 "*Buffer name for expression values, for \\[debugger-record-expression]."
 :type 'string
 :group 'debugger
 :version "20.3")
 (with-current-buffer (get-buffer debugger-record-buffer)
 (message "%s"
 	     (buffer-substring (line-beginning-position 0)
 			       (line-end-position 0)))))
-(put 'debugger-mode 'mode-class 'special)
+(defun debug-help-follow (&optional pos)
+"Follow cross-reference at POS, defaulting to point.
-(defun debugger-mode ()
-"Mode for backtrace buffers, selected in debugger.
+For the cross-reference format, see `help-make-xrefs'."
-\\<debugger-mode-map>
+(interactive "d")
-A line starts with `*' if exiting that frame will call the debugger.
+(require 'help-mode)
-Type \\[debugger-frame] or \\[debugger-frame-clear] to set or remove the `*'.
+(unless pos
+(setq pos (point)))
-When in debugger due to frame being exited,
+(unless (push-button pos)
-use the \\[debugger-return-value] command to override the value
+;; check if the symbol under point is a function or variable
-being returned from that frame.
+(let ((sym
+	   (intern
-Use \\[debug-on-entry] and \\[cancel-debug-on-entry] to control
+	    (save-excursion
-which functions will enter the debugger when called.
+	      (goto-char pos) (skip-syntax-backward "w_")
+	      (buffer-substring (point)
-Complete list of commands:
+				(progn (skip-syntax-forward "w_")
-\\{debugger-mode-map}"
+				       (point)))))))
-(kill-all-local-variables)
+(when (or (boundp sym) (fboundp sym) (facep sym))
-(setq major-mode 'debugger-mode)
+	(switch-to-buffer-other-window (generate-new-buffer "*Help*"))
-(setq mode-name "Debugger")
+	(help-do-xref pos #'help-xref-interned (list sym))))))
-(setq truncate-lines t)
-(set-syntax-table emacs-lisp-mode-syntax-table)
-(use-local-map debugger-mode-map)
-(run-mode-hooks 'debugger-mode-hook))
 ;; When you change this, you may also need to change the number of
 ;; frames that the debugger skips.
 (defun implement-debug-on-entry ()
 "Conditionally call the debugger.

Mercurial > emacs

comparison lisp/emacs-lisp/debug.el @ 90201:fbb2bea03df9