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

[Miles Bader]

Index: emacs/lisp/emacs-lisp/edebug.el
diff -c emacs/lisp/emacs-lisp/edebug.el:3.53.2.6 
emacs/lisp/emacs-lisp/edebug.el:3.53.2.7
*** emacs/lisp/emacs-lisp/edebug.el:3.53.2.6    Tue Jul  6 09:31:50 2004
--- emacs/lisp/emacs-lisp/edebug.el     Tue Jul  6 10:00:20 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)