From: Luc Teirlinck <teirllm@auburn.edu>
Date: Fri, 22 Jul 2005 01:26:03 +0000 (+0000)
Subject: (define-minor-mode): Never call the mode function using `eval-after-load'.
X-Git-Tag: emacs-pretest-22.0.90~7919
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f4cb1d8caecffded4f2ef5187d096d9751c39d6e;p=emacs.git

(define-minor-mode): Never call the mode function using `eval-after-load'.
---

diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 87f3e7249aa..09abd272e53 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -267,12 +267,7 @@ With zero or negative ARG turn mode off.
        (add-minor-mode ',mode ',lighter
 		       ,(if keymap keymap-sym
 			  `(if (boundp ',keymap-sym)
-			       (symbol-value ',keymap-sym))))
-
-       ;; If the mode is global, call the function according to the default.
-       ,(if globalp
-	    `(if (and load-file-name (not (equal ,init-value ,mode)))
-		 (eval-after-load load-file-name '(,mode (if ,mode 1 -1))))))))
+			       (symbol-value ',keymap-sym)))))))
 
 ;;;
 ;;; make global minor mode