[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.1 
emacs/lisp/emacs-lisp/edebug.el:3.62.4.2
*** emacs/lisp/emacs-lisp/edebug.el:3.62.4.1    Fri Apr 16 12:50:13 2004
--- emacs/lisp/emacs-lisp/edebug.el     Mon Jun 28 07:29:45 2004
***************
*** 477,483 ****
  If the current defun is actually a call to `defvar', then reset the
  variable using its initial value expression even if the variable
  already has some other value.  (Normally `defvar' does not change the
! variable's value if it already has a value.)
  
  With a prefix argument, instrument the code for Edebug.
  
--- 477,484 ----
  If the current defun is actually a call to `defvar', then reset the
  variable using its initial value expression even if the variable
  already has some other value.  (Normally `defvar' does not change the
! variable's value if it already has a value.)  Treat `defcustom'
! similarly.  Reinitialize the face according to `defface' specification.
  
  With a prefix argument, instrument the code for Edebug.
  
***************
*** 507,513 ****
          ((and (eq (car form) 'defcustom)
                (default-boundp (nth 1 form)))
           ;; Force variable to be bound.
!          (set-default (nth 1 form) (eval (nth 2 form)))))
      (setq edebug-result (eval form))
      (if (not edebugging)
        (princ edebug-result)
--- 508,519 ----
          ((and (eq (car form) 'defcustom)
                (default-boundp (nth 1 form)))
           ;; Force variable to be bound.
!          (set-default (nth 1 form) (eval (nth 2 form))))
!           ((eq (car form) 'defface)
!            ;; Reset the face.
!            (put (nth 1 form) 'face-defface-spec nil)
!            (setq face-new-frame-defaults
!                  (assq-delete-all (nth 1 form) face-new-frame-defaults))))
      (setq edebug-result (eval form))
      (if (not edebugging)
        (princ edebug-result)
***************
*** 3692,3699 ****
    (setq edebug-previous-result
        (concat "Result: "
                (edebug-safe-prin1-to-string edebug-previous-value)
!               (let ((name (prin1-char edebug-previous-value)))
!                 (if name (concat " = " name))))))
  
  (defun edebug-previous-result ()
    "Print the previous result."
--- 3698,3704 ----
    (setq edebug-previous-result
        (concat "Result: "
                (edebug-safe-prin1-to-string edebug-previous-value)
!               (eval-expression-print-format edebug-previous-value))))
  
  (defun edebug-previous-result ()
    "Print the previous result."
***************
*** 3712,3718 ****
    (princ
     (edebug-outside-excursion
      (setq values (cons (edebug-eval edebug-expr) values))
!     (edebug-safe-prin1-to-string (car values)))))
  
  (defun edebug-eval-last-sexp ()
    "Evaluate sexp before point in the outside environment; value in 
minibuffer."
--- 3717,3724 ----
    (princ
     (edebug-outside-excursion
      (setq values (cons (edebug-eval edebug-expr) values))
!     (concat (edebug-safe-prin1-to-string (car values))
!             (eval-expression-print-format (car values))))))
  
  (defun edebug-eval-last-sexp ()
    "Evaluate sexp before point in the outside environment; value in 
minibuffer."