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

[Miles Bader]

Index: emacs/lisp/loadhist.el
diff -c emacs/lisp/loadhist.el:1.23 emacs/lisp/loadhist.el:1.24
*** emacs/lisp/loadhist.el:1.23 Fri Aug 23 23:00:29 2002
--- emacs/lisp/loadhist.el      Sat Sep 28 23:34:12 2002
***************
*** 167,174 ****
                ;; Remove any feature names that this file provided.
                (if (eq (car x) 'provide)
                    (setq features (delq (cdr x) features)))
!               (if (eq (car x) 'defvar)
!                 (makunbound (cdr x))))
             (t
              (when (fboundp x)
                (if (fboundp 'ad-unadvise)
--- 167,180 ----
                ;; Remove any feature names that this file provided.
                (if (eq (car x) 'provide)
                    (setq features (delq (cdr x) features)))
!               (when (eq (car x) 'defvar)
!               ;; Kill local values as much as possible.
!               (dolist (buf (buffer-list))
!                 (with-current-buffer buf
!                   (kill-local-variable (cdr x))))
!               ;; Get rid of the default binding if we can.
!               (unless (local-variable-if-set-p (cdr x))
!                 (makunbound (cdr x)))))
             (t
              (when (fboundp x)
                (if (fboundp 'ad-unadvise)