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

[Stefan Monnier]

Index: emacs/lisp/emacs-lisp/debug.el
diff -c emacs/lisp/emacs-lisp/debug.el:1.81 emacs/lisp/emacs-lisp/debug.el:1.82
*** emacs/lisp/emacs-lisp/debug.el:1.81 Mon Jun  6 19:47:05 2005
--- emacs/lisp/emacs-lisp/debug.el      Wed Jun  8 19:35:54 2005
***************
*** 97,106 ****
  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)
--- 97,103 ----
  This variable is used by `debugger-jump', `debugger-step-through',
  and `debugger-reenable' to temporarily disable debug-on-entry.")
  
! (defvar inhibit-trace)                  ;Not yet implemented.
  
  ;;;###autoload
  (setq debugger 'debug)
***************
*** 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
--- 180,186 ----
                  ;; 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
***************
*** 226,237 ****
                (erase-buffer)
                (fundamental-mode)
                (with-selected-window (get-buffer-window debugger-buffer 0)
!                   (when (window-dedicated-p (selected-window))
                      ;; If the window is not dedicated, burying the buffer
                      ;; will mean that the frame created for it is left
!                     ;; around showing smoe random buffer, and next time we
                      ;; pop to the debugger buffer we'll create yet
                      ;; another frame.
                      (bury-buffer))))
            (kill-buffer debugger-buffer))
          (set-match-data debugger-outer-match-data)))
--- 217,233 ----
                (erase-buffer)
                (fundamental-mode)
                (with-selected-window (get-buffer-window debugger-buffer 0)
!                   (when (and (window-dedicated-p (selected-window))
!                              (not debugger-step-after-exit))
                      ;; If the window is not dedicated, burying the buffer
                      ;; will mean that the frame created for it is left
!                     ;; around showing some random buffer, and next time we
                      ;; pop to the debugger buffer we'll create yet
                      ;; another frame.
+                     ;; If debugger-step-after-exit is non-nil, the frame
+                     ;; would need to be de-iconified anyway immediately
+                     ;; after when we re-enter the debugger, so iconifying it
+                     ;; here would cause flashing.
                      (bury-buffer))))
            (kill-buffer debugger-buffer))
          (set-match-data debugger-outer-match-data)))