comparison lisp/emacs-lisp/edebug.el @ 15302:c23c9712ef5c

Use executing-kbd-macro, not executing-macro.

15301:a68e276baffd

;; Keywords: lisp, tools, maint

;; LCD Archive Entry:
;; edebug|Daniel LaLiberte|[e-mail]
;; |A source level debugger for Emacs Lisp.
;; |$Date: 1996/03/20 13:19:48 $|$Revision: 3.5.1.27 $|~/modes/edebug.el|

;; This file is part of GNU Emacs.

;; 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

;; For the early revision history, see edebug-history.

;;; Code:

(defconst edebug-version
  (let ((raw-version "$Revision: 3.5.1.27 $"))
    (substring raw-version (string-match "[0-9.]*" raw-version)
	       (match-end 0))))
     
(require 'backquote)

	    ;; 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-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 
		   (if edebug-continue-kbd-macro executing-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
		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
		)))
    

	     (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)
	     (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-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

15302:c23c9712ef5c

;; Keywords: lisp, tools, maint

;; LCD Archive Entry:
;; edebug|Daniel LaLiberte|[e-mail]
;; |A source level debugger for Emacs Lisp.
;; |$Date: 1996/03/20 13:30:16 $|$Revision: 3.6 $|~/modes/edebug.el|

;; This file is part of GNU Emacs.

;; 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

;; For the early revision history, see edebug-history.

;;; Code:

(defconst edebug-version
  (let ((raw-version "$Revision: 3.6 $"))
    (substring raw-version (string-match "[0-9.]*" raw-version)
	       (match-end 0))))
     
(require 'backquote)

	    ;; 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-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-kbd-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-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
		)))
    

	     (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-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-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