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

[Miles Bader]

Index: emacs/lisp/emacs-lisp/edebug.el
diff -c emacs/lisp/emacs-lisp/edebug.el:3.62.4.3 
emacs/lisp/emacs-lisp/edebug.el:3.62.4.4
*** emacs/lisp/emacs-lisp/edebug.el:3.62.4.3    Fri Nov 12 02:53:00 2004
--- emacs/lisp/emacs-lisp/edebug.el     Wed Dec  8 05:02:25 2004
***************
*** 3240,3248 ****
  
  
  (defun edebug-set-global-break-condition (expression)
!   (interactive (list (read-minibuffer
!                     "Global Condition: "
!                     (format "%s" edebug-global-break-condition))))
    (setq edebug-global-break-condition expression))
  
  
--- 3240,3254 ----
  
  
  (defun edebug-set-global-break-condition (expression)
!   (interactive
!    (list
!     (let ((initial (and edebug-global-break-condition
!                       (format "%s" edebug-global-break-condition))))
!       (read-from-minibuffer
!        "Global Condition: " initial read-expression-map t
!        (if (equal (car read-expression-history) initial)
!          '(read-expression-history . 1)
!        'read-expression-history)))))
    (setq edebug-global-break-condition expression))
  
  
***************
*** 4315,4323 ****
  
  (defalias 'edebug-window-live-p 'window-live-p)
  
- ;; Mark takes an argument in Emacs 19.
  (defun edebug-mark ()
!   (mark t))   ;; Does this work for lemacs too?
  
  (defun edebug-set-conditional-breakpoint (arg condition)
    "Set a conditional breakpoint at nearest sexp.
--- 4321,4328 ----
  
  (defalias 'edebug-window-live-p 'window-live-p)
  
  (defun edebug-mark ()
!   (mark t))
  
  (defun edebug-set-conditional-breakpoint (arg condition)
    "Set a conditional breakpoint at nearest sexp.
***************
*** 4327,4333 ****
    (interactive
     (list
      current-prefix-arg
! ;; Read condition as follows; getting previous condition is cumbersome:
      (let ((edebug-stop-point (edebug-find-stop-point)))
        (if edebug-stop-point
          (let* ((edebug-def-name (car edebug-stop-point))
--- 4332,4338 ----
    (interactive
     (list
      current-prefix-arg
!     ;; Read condition as follows; getting previous condition is cumbersome:
      (let ((edebug-stop-point (edebug-find-stop-point)))
        (if edebug-stop-point
          (let* ((edebug-def-name (car edebug-stop-point))
***************
*** 4336,4358 ****
                 (edebug-breakpoints (car (cdr edebug-data)))
                 (edebug-break-data (assq index edebug-breakpoints))
                 (edebug-break-condition (car (cdr edebug-break-data)))
!                (edebug-expression-history
!                 ;; Prepend the current condition, if any.
!                 (if edebug-break-condition
!                     (cons edebug-break-condition read-expression-history)
!                   read-expression-history)))
!           (prog1
!               (read-from-minibuffer
!                "Condition: " nil read-expression-map t
!                'edebug-expression-history)
!             (setq read-expression-history edebug-expression-history)
!             ))))))
    (edebug-modify-breakpoint t condition arg))
  
- ;;; The default for all above is Emacs.
- 
- ;; Epoch specific code was in a separate file: edebug-epoch.el.
- 
  (easy-menu-define edebug-menu edebug-mode-map "Edebug menus" 
edebug-mode-menus)
  
  ;;; Byte-compiler
--- 4341,4355 ----
                 (edebug-breakpoints (car (cdr edebug-data)))
                 (edebug-break-data (assq index edebug-breakpoints))
                 (edebug-break-condition (car (cdr edebug-break-data)))
!                (initial (and edebug-break-condition
!                              (format "%s" edebug-break-condition))))
!           (read-from-minibuffer
!            "Condition: " initial read-expression-map t
!            (if (equal (car read-expression-history) initial)
!                '(read-expression-history . 1)
!              'read-expression-history)))))))
    (edebug-modify-breakpoint t condition arg))
  
  (easy-menu-define edebug-menu edebug-mode-map "Edebug menus" 
edebug-mode-menus)
  
  ;;; Byte-compiler