comparison lisp/emacs-lisp/debug.el @ 11062:302f676eeca0

(debugger-outer-load-read-function): New variable. (debug): Bind load-read-function to nil; save old value in debugger-outer-load-read-function and restore at end. (debugger-eval-expression): Handle load-read-function like other magic variables. (debugger-outer-overriding-local-map): New variable. (debug): Bind overriding-local-map to nil; save old value in debugger-outer-overriding-local-map and restore at end. (debugger-eval-expression): Handle overriding-local-map like other magic variables.

11061:2f41090c58b3

(defvar debugger-old-buffer nil
  "This is the buffer that was current when the debugger was entered.")

(defvar debugger-outer-match-data)
(defvar debugger-outer-track-mouse)
(defvar debugger-outer-last-command)
(defvar debugger-outer-this-command)
(defvar debugger-outer-unread-command-char)
(defvar debugger-outer-unread-command-events)

	;; Don't keep reading from an executing kbd macro!
	(executing-macro nil)
	;; Save the outer values of these vars for the `e' command
	;; before we replace the values.
	(debugger-outer-match-data (match-data))
	(debugger-outer-track-mouse track-mouse)
	(debugger-outer-last-command last-command)
	(debugger-outer-this-command this-command)
	(debugger-outer-unread-command-char unread-command-char)
	(debugger-outer-unread-command-events unread-command-events)

    ;; Don't let these magic variables affect the debugger itself.
    (let ((last-command nil) this-command track-mouse
	  (unread-command-char -1) unread-command-events
	  last-input-event last-command-event last-nonmenu-event
	  last-event-frame
	  (standard-input t) (standard-output t)
	  (cursor-in-echo-area nil))
      (unwind-protect
	  (save-excursion
	    (save-window-excursion

	      (fundamental-mode))
	  (kill-buffer debugger-buffer))
	(store-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 track-mouse debugger-outer-track-mouse)
    (setq last-command debugger-outer-last-command)
    (setq this-command debugger-outer-this-command)
    (setq unread-command-char debugger-outer-unread-command-char)
    (setq unread-command-events debugger-outer-unread-command-events)

	  (last-command-event debugger-outer-last-command-event)
	  (last-nonmenu-event debugger-outer-last-nonmenu-event)
	  (last-event-frame debugger-outer-last-event-frame)
	  (standard-input debugger-outer-standard-input)
	  (standard-output debugger-outer-standard-output)
	  (cursor-in-echo-area debugger-outer-cursor-in-echo-area))
      (store-match-data debugger-outer-match-data)
      (prog1 (eval-expression exp)
	(setq debugger-outer-match-data (match-data))
	(setq debugger-outer-track-mouse track-mouse)
	(setq debugger-outer-last-command last-command)
	(setq debugger-outer-this-command this-command)
	(setq debugger-outer-unread-command-char unread-command-char)
	(setq debugger-outer-unread-command-events unread-command-events)

11062:302f676eeca0

(defvar debugger-old-buffer nil
  "This is the buffer that was current when the debugger was entered.")

(defvar debugger-outer-match-data)
(defvar debugger-outer-load-read-function)
(defvar debugger-outer-overriding-local-map)
(defvar debugger-outer-track-mouse)
(defvar debugger-outer-last-command)
(defvar debugger-outer-this-command)
(defvar debugger-outer-unread-command-char)
(defvar debugger-outer-unread-command-events)

	;; Don't keep reading from an executing kbd macro!
	(executing-macro nil)
	;; Save the outer values of these vars for the `e' command
	;; before we replace the values.
	(debugger-outer-match-data (match-data))
	(debugger-outer-load-read-function load-read-function)
	(debugger-outer-overriding-local-map overriding-local-map)
	(debugger-outer-track-mouse track-mouse)
	(debugger-outer-last-command last-command)
	(debugger-outer-this-command this-command)
	(debugger-outer-unread-command-char unread-command-char)
	(debugger-outer-unread-command-events unread-command-events)

    ;; Don't let these magic variables affect the debugger itself.
    (let ((last-command nil) this-command track-mouse
	  (unread-command-char -1) unread-command-events
	  last-input-event last-command-event last-nonmenu-event
	  last-event-frame
	  overriding-local-map
	  load-read-function
	  (standard-input t) (standard-output t)
	  (cursor-in-echo-area nil))
      (unwind-protect
	  (save-excursion
	    (save-window-excursion

	      (fundamental-mode))
	  (kill-buffer debugger-buffer))
	(store-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)
    (setq track-mouse debugger-outer-track-mouse)
    (setq last-command debugger-outer-last-command)
    (setq this-command debugger-outer-this-command)
    (setq unread-command-char debugger-outer-unread-command-char)
    (setq unread-command-events debugger-outer-unread-command-events)

	  (last-command-event debugger-outer-last-command-event)
	  (last-nonmenu-event debugger-outer-last-nonmenu-event)
	  (last-event-frame debugger-outer-last-event-frame)
	  (standard-input debugger-outer-standard-input)
	  (standard-output debugger-outer-standard-output)
	  (cursor-in-echo-area debugger-outer-cursor-in-echo-area)
	  (overriding-local-map debugger-outer-overriding-local-map)
	  (load-read-function debugger-outer-load-read-function))
      (store-match-data debugger-outer-match-data)
      (prog1 (eval-expression exp)
	(setq debugger-outer-match-data (match-data))
	(setq debugger-outer-load-read-function load-read-function)
	(setq debugger-outer-overriding-local-map overriding-local-map)
	(setq debugger-outer-track-mouse track-mouse)
	(setq debugger-outer-last-command last-command)
	(setq debugger-outer-this-command this-command)
	(setq debugger-outer-unread-command-char unread-command-char)
	(setq debugger-outer-unread-command-events unread-command-events)