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

[Richard M . Stallman]

Index: emacs/lisp/emacs-lisp/edebug.el
diff -c emacs/lisp/emacs-lisp/edebug.el:3.80 
emacs/lisp/emacs-lisp/edebug.el:3.81
*** emacs/lisp/emacs-lisp/edebug.el:3.80        Sun Jul 10 17:23:44 2005
--- emacs/lisp/emacs-lisp/edebug.el     Mon Jul 11 04:05:07 2005
***************
*** 2244,2250 ****
            (max-specpdl-size (+ 200 max-specpdl-size))
  
            (debugger edebug-debugger)  ; only while edebug is active.
-           (edebug-with-timeout-suspend (with-timeout-suspend))
            (edebug-outside-debug-on-error debug-on-error)
            (edebug-outside-debug-on-quit debug-on-quit)
            ;; Binding these may not be the right thing to do.
--- 2244,2249 ----
***************
*** 2290,2296 ****
              (edebug-enter edebug-function edebug-args edebug-body))
          ;; Reset global variables in case outside value was changed.
          (setq executing-kbd-macro edebug-outside-executing-macro)
-         (with-timeout-unsuspend edebug-with-timeout-suspend)
          (edebug-restore-status
           'post-command-hook edebug-outside-post-command-hook)
          (edebug-restore-status
--- 2289,2294 ----
***************
*** 2376,2393 ****
  
  
  (defun edebug-slow-before (edebug-before-index)
!   ;; Debug current function given BEFORE position.
!   ;; Called from functions compiled with edebug-eval-top-level-form.
!   ;; Return the before index.
!   (setcar edebug-offset-indices edebug-before-index)
! 
!   ;; Increment frequency count
!   (aset edebug-freq-count edebug-before-index
!       (1+ (aref edebug-freq-count edebug-before-index)))
! 
!   (if (or (not (memq edebug-execution-mode '(Go-nonstop next)))
!         (edebug-input-pending-p))
!       (edebug-debugger edebug-before-index 'before nil))
    edebug-before-index)
  
  (defun edebug-fast-before (edebug-before-index)
--- 2374,2392 ----
  
  
  (defun edebug-slow-before (edebug-before-index)
!   (unless edebug-active
!     ;; Debug current function given BEFORE position.
!     ;; Called from functions compiled with edebug-eval-top-level-form.
!     ;; Return the before index.
!     (setcar edebug-offset-indices edebug-before-index)
! 
!     ;; Increment frequency count
!     (aset edebug-freq-count edebug-before-index
!         (1+ (aref edebug-freq-count edebug-before-index)))
! 
!     (if (or (not (memq edebug-execution-mode '(Go-nonstop next)))
!           (edebug-input-pending-p))
!       (edebug-debugger edebug-before-index 'before nil)))
    edebug-before-index)
  
  (defun edebug-fast-before (edebug-before-index)
***************
*** 2395,2416 ****
    )
  
  (defun edebug-slow-after (edebug-before-index edebug-after-index edebug-value)
!   ;; Debug current function given AFTER position and VALUE.
!   ;; Called from functions compiled with edebug-eval-top-level-form.
!   ;; Return VALUE.
!   (setcar edebug-offset-indices edebug-after-index)
! 
!   ;; Increment frequency count
!   (aset edebug-freq-count edebug-after-index
!       (1+ (aref edebug-freq-count edebug-after-index)))
!   (if edebug-test-coverage (edebug-update-coverage))
! 
!   (if (and (eq edebug-execution-mode 'Go-nonstop)
!          (not (edebug-input-pending-p)))
!       ;; Just return result.
        edebug-value
!     (edebug-debugger edebug-after-index 'after edebug-value)
!     ))
  
  (defun edebug-fast-after (edebug-before-index edebug-after-index edebug-value)
    ;; Do nothing but return the value.
--- 2394,2417 ----
    )
  
  (defun edebug-slow-after (edebug-before-index edebug-after-index edebug-value)
!   (if edebug-active
        edebug-value
!     ;; Debug current function given AFTER position and VALUE.
!     ;; Called from functions compiled with edebug-eval-top-level-form.
!     ;; Return VALUE.
!     (setcar edebug-offset-indices edebug-after-index)
! 
!     ;; Increment frequency count
!     (aset edebug-freq-count edebug-after-index
!         (1+ (aref edebug-freq-count edebug-after-index)))
!     (if edebug-test-coverage (edebug-update-coverage))
! 
!     (if (and (eq edebug-execution-mode 'Go-nonstop)
!            (not (edebug-input-pending-p)))
!       ;; Just return result.
!       edebug-value
!       (edebug-debugger edebug-after-index 'after edebug-value)
!       )))
  
  (defun edebug-fast-after (edebug-before-index edebug-after-index edebug-value)
    ;; Do nothing but return the value.
***************
*** 2535,2540 ****
--- 2536,2542 ----
    ;; Uses local variables of edebug-enter, edebug-before, edebug-after
    ;; and edebug-debugger.
    (let ((edebug-active t)             ; for minor mode alist
+       (edebug-with-timeout-suspend (with-timeout-suspend))
        edebug-stop                     ; should we enter recursive-edit
        (edebug-point (+ edebug-def-mark
                         (aref (nth 2 edebug-data) edebug-offset-index)))
***************
*** 2761,2766 ****
--- 2763,2769 ----
            (set-buffer current-buffer))
          ;; ... nothing more.
          )
+       (with-timeout-unsuspend edebug-with-timeout-suspend)
        ;; Reset global variables to outside values in case they were changed.
        (setq
         overlay-arrow-position edebug-outside-o-a-p