# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 966474491 0
# Node ID 429c384fc02430060bdf4332f9252add4a845141
# Parent  7a113c33bf9f505915e162a2fdd5252c50a22287
(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 -r 7a113c33bf9f -r 429c384fc024 lisp/startup.el
--- a/lisp/startup.el	Thu Aug 17 01:07:41 2000 +0000
+++ b/lisp/startup.el	Thu Aug 17 01:08:11 2000 +0000
@@ -408,6 +408,8 @@
     ;; 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 @@
 	(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 @@
   (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)