From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 29 Sep 2002 03:34:12 +0000 (+0000)
Subject: (unload-feature): When undefining a variable, delete its buffer-local bindings.
X-Git-Tag: ttn-vms-21-2-B4~13007
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3147ee6dbce06908d914c41cee3d79b086062c0d;p=emacs.git

(unload-feature): When undefining a variable, delete its buffer-local bindings.
---

diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 00597615c2d..e609596e4a8 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -167,8 +167,14 @@ is nil, raise an error."
               ;; 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))))
+              (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)