(loadhist-hook-functions): Remove before-change-function,

after-change-function.
(unload-feature): Deal with symbols which are both bound and fbound.

2 files changed, 22 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac4b9f8dafc..90f215465a8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2000-05-31  Dave Love  <fx@gnu.org>
+
+        * loadhist.el (loadhist-hook-functions): Remove
+        before-change-function, after-change-function.
+        (unload-feature): Deal with symbols which are both bound and
+        fbound.
+
+        * mouse.el (mouse-save-then-kill-delete-region): Don't bind
+        before-change-function, after-change-function.
+
+        * simple.el (newline): Don't bind before-change-function,
+        after-change-function.
+
 2000-05-31  Rajesh Vaidheeswarran <rv@gnu.org>
 
         * whitespace.el (whitespace-rescan-timer-time): Update interval
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index beb4dd46e5c..95208bc7908 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -97,8 +97,8 @@ return the feature \(symbol\)."
                            nil t)))
 
 (defvar loadhist-hook-functions
-  '(after-change-function after-change-functions
-after-insert-file-functions auto-fill-function before-change-function
+  '(after-change-functions
+after-insert-file-functions auto-fill-function
 before-change-functions blink-paren-function
 buffer-access-fontify-functions command-line-functions
 comment-indent-function kill-buffer-query-functions
@@ -161,11 +161,13 @@ is nil, raise an error."
               ;; Remove any feature names that this file provided.
               (if (eq (car x) 'provide)
                   (setq features (delq (cdr x) features))))
-             ((boundp x) (makunbound x))
-             ((fboundp x)
-              (fmakunbound x)
-              (let ((aload (get x 'autoload)))
-                (if aload (fset x (cons 'autoload aload)))))))
+             (t
+              (when (boundp x)
+                (makunbound x))
+              (when (fboundp x)
+                (fmakunbound x)
+                (let ((aload (get x 'autoload)))
+                  (if aload (fset x (cons 'autoload aload))))))))
      (cdr flist))
     ;; Delete the load-history element for this file.
     (let ((elt (assoc file load-history)))