(fundamental-mode): Run after-change-major-mode-hook conditionally.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 82ee1698d33b094334e518c6d0a9f8ff6ed18918..8b81afbe376a761b4f57205aa5f3f3fe13487dc8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-16  Lute Kamstra  <lute@gnu.org>
+
+       * simple.el (fundamental-mode): Run after-change-major-mode-hook
+       conditionally.
+
 2005-06-16  Juanma Barranquero  <lekktu@gmail.com>
 
        * tooltip.el (tooltip-start-delayed-tip, tooltip-timeout)

diff --git a/lisp/simple.el b/lisp/simple.el
index ba661e54a1900fa2546ab3f5ff7be8f29651214d..0ba6c424a4a042dd1b0134d36332b9e8ee0c7fd7 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -327,7 +327,8 @@ location."
 Other major modes are defined by comparison with this one."
   (interactive)
   (kill-all-local-variables)
-  (run-hooks 'after-change-major-mode-hook))
+  (unless delay-mode-hooks
+    (run-hooks 'after-change-major-mode-hook)))
 
 ;; Making and deleting lines.
 
@@ -4842,7 +4843,7 @@ of the differing parts is, by contrast, slightly highlighted."
        (if (minibufferp mainbuf)
            (if (and (symbolp minibuffer-completion-table)
                     (get minibuffer-completion-table 'completion-base-size-function))
-               (setq completion-base-size 
+               (setq completion-base-size
                      (funcall (get minibuffer-completion-table 'completion-base-size-function)))
              (setq completion-base-size 0))))
       ;; Put faces on first uncommon characters and common parts.