[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/debug.el

[Richard M . Stallman]

Index: emacs/lisp/emacs-lisp/debug.el
diff -c emacs/lisp/emacs-lisp/debug.el:1.79 emacs/lisp/emacs-lisp/debug.el:1.80
*** emacs/lisp/emacs-lisp/debug.el:1.79 Tue Mar 29 13:58:55 2005
--- emacs/lisp/emacs-lisp/debug.el      Mon Jun  6 12:29:57 2005
***************
*** 97,102 ****
--- 97,107 ----
  This variable is used by `debugger-jump', `debugger-step-through',
  and `debugger-reenable' to temporarily disable debug-on-entry.")
  
+ (defvar debugger-window nil
+   "If non-nil,  the last window used by the debugger for its buffer.
+ The next call to the debugger reuses the same window, if it is still live.
+ That case would normally occur when the window is in a separate frame.")
+ 
  ;;;###autoload
  (setq debugger 'debug)
  ;;;###autoload
***************
*** 178,184 ****
                  ;; Place an extra debug-on-exit for macro's.
                  (when (eq 'lambda (car-safe (cadr (backtrace-frame 4))))
                    (backtrace-debug 5 t)))
!               (pop-to-buffer debugger-buffer)
                (debugger-mode)
                (debugger-setup-buffer debugger-args)
                (when noninteractive
--- 183,195 ----
                  ;; Place an extra debug-on-exit for macro's.
                  (when (eq 'lambda (car-safe (cadr (backtrace-frame 4))))
                    (backtrace-debug 5 t)))
!               (if (and debugger-window
!                        (window-live-p debugger-window))
!                   (progn
!                     (set-window-buffer debugger-window debugger-buffer)
!                     (select-window debugger-window))
!                 (pop-to-buffer debugger-buffer))
!               (setq debugger-window (selected-window))
                (debugger-mode)
                (debugger-setup-buffer debugger-args)
                (when noninteractive