From: Kenichi Handa <handa@m17n.org>
Date: Thu, 17 Aug 2000 01:08:11 +0000 (+0000)
Subject: (normal-top-level): Look in each dir in load-path for a leim-list.el
X-Git-Tag: emacs-pretest-21.0.90~2220
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=357438ebe064605fbd5301ab2e04d27600a8ec0b;p=emacs.git

(normal-top-level): Look in each dir in load-path for a leim-list.el
file too.  This assures of loading leim-list.el that is created at
Emacs installation time even if a user have his own leim-list.el.
---

diff --git a/lisp/startup.el b/lisp/startup.el
index 42a7dcffbcb..08082ed31cf 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -408,6 +408,8 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
     ;; Look in each dir in load-path for a subdirs.el file.
     ;; If we find one, load it, which will add the appropriate subdirs
     ;; of that dir into load-path,
+    ;; Look for a leim-list.el file too.  Loading it will register
+    ;; available input methods.
     (let ((tail load-path)
 	  new)
       (while tail
@@ -415,6 +417,9 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
 	(condition-case nil
 	    (let ((default-directory (car tail)))
 	      (load (expand-file-name "subdirs.el" (car tail)) t t t)))
+	(condition-case nil
+	    (let ((default-directory (car tail)))
+	      (load (expand-file-name "leim-list.el" (car tail)) t t t)))
 	(setq tail (cdr tail))))
     (if (not (eq system-type 'vax-vms))
 	(progn
@@ -662,9 +667,6 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
   (if site-run-file 
       (load site-run-file t t))
 
-  ;; Register available input methods by loading LEIM list file.
-  (load "leim-list.el" 'noerror 'nomessage 'nosuffix)
-
   ;; Sites should not disable this.  Only individuals should disable
   ;; the startup message.
   (setq inhibit-startup-message nil)