From 521677279bd0409b78ed77f35a1ec36ca57d62a6 Mon Sep 17 00:00:00 2001 From: Lute Kamstra Date: Thu, 16 Jun 2005 12:40:54 +0000 Subject: [PATCH] (fundamental-mode): Run after-change-major-mode-hook conditionally. --- lisp/ChangeLog | 5 +++++ lisp/simple.el | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 82ee1698d33..8b81afbe376 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-06-16 Lute Kamstra + + * simple.el (fundamental-mode): Run after-change-major-mode-hook + conditionally. + 2005-06-16 Juanma Barranquero * tooltip.el (tooltip-start-delayed-tip, tooltip-timeout) diff --git a/lisp/simple.el b/lisp/simple.el index ba661e54a19..0ba6c424a4a 100644 --- 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. -- 2.39.2