3 files changed, 32 insertions, 15 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6f5519e8803..fd41ed84d64 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-26  Glenn Morris  <rgm@gnu.org>
+
+        Preload leim-list.el.  (Bug#4789)
+        * loadup.el: Load leim-list.el when found.
+        * startup.el (normal-top-level): Skip re-loading leim/leim-list.el.
+
 2013-11-25  Bozhidar Batsov  <bozhidar@batsov.com>
 
         * emacs-lisp/bytecomp.el (byte-compile-form): Fix a typo.
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 98e3b877144..fe4fe1fe571 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -1,7 +1,7 @@
 ;;; loadup.el --- load up standardly loaded Lisp files for Emacs
 
-;; Copyright (C) 1985-1986, 1992, 1994, 2001-2013 Free Software
-;; Foundation, Inc.
+;; Copyright (C) 1985-1986, 1992, 1994, 2001-2013
+;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -98,6 +98,8 @@
 (load "env")
 (load "format")
 (load "bindings")
+;; This sets temporary-file-directory, used by eg
+;; auto-save-file-name-transforms in files.el.
 (load "cus-start")
 (load "window")  ; Needed here for `replace-buffer-in-windows'.
 (setq load-source-file-function 'load-with-code-conversion)
@@ -278,12 +280,16 @@
 (load "vc/ediff-hook")
 (if (not (eq system-type 'ms-dos)) (load "tooltip"))
 
-;If you want additional libraries to be preloaded and their
-;doc strings kept in the DOC file rather than in core,
-;you may load them with a "site-load.el" file.
-;But you must also cause them to be scanned when the DOC file
-;is generated.
-;For other systems, you must edit ../src/Makefile.in.
+;; This file doesn't exist when building a development version of Emacs
+;; from the repository.  It is generated just after temacs is built.
+(load "leim-list.el" t)
+
+;; If you want additional libraries to be preloaded and their
+;; doc strings kept in the DOC file rather than in core,
+;; you may load them with a "site-load.el" file.
+;; But you must also cause them to be scanned when the DOC file
+;; is generated.
+;; For other systems, you must edit ../src/Makefile.in.
 (load "site-load" t)
 
 ;; Make sure default-directory is unibyte when dumping.  This is
diff --git a/lisp/startup.el b/lisp/startup.el
index 88ec1f359eb..0b1c55b36a0 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -499,18 +499,23 @@ It is the default value of the variable `top-level'."
     ;; available input methods.
     (let ((tail load-path)
           (lispdir (expand-file-name "../lisp" data-directory))
-          ;; For out-of-tree builds, leim-list is generated in the build dir.
-;;;          (leimdir (expand-file-name "../leim" doc-directory))
+          ;; For out-of-tree builds, leim-list is generated in the build dir.
+          (leimdir (expand-file-name "../leim" doc-directory))
           dir)
       (while tail
         (setq dir (car tail))
         (let ((default-directory dir))
           (load (expand-file-name "subdirs.el") t t t))
-        ;; Do not scan standard directories that won't contain a leim-list.el.
-        ;; http://lists.gnu.org/archive/html/emacs-devel/2009-10/msg00502.html
-        (or (string-match (concat "\\`" lispdir) dir)
-            (let ((default-directory dir))
-              (load (expand-file-name "leim-list.el") t t t)))
+        ;; Do not scan standard directories that won't contain a leim-list.el.
+        ;; http://lists.gnu.org/archive/html/emacs-devel/2009-10/msg00502.html
+        ;; Also skip leim/leim-list.el, since we preloaded that one.
+        (or (string-prefix-p lispdir dir)
+            ;; Not supposed to be subdirs.el in leim, but someone
+            ;; might have added one and be keeping their own leim-list
+            ;; files in subdirs of leim.
+            (string-equal leimdir dir)
+            (let ((default-directory dir))
+              (load (expand-file-name "leim-list.el") t t t)))
         ;; We don't use a dolist loop and we put this "setq-cdr" command at
         ;; the end, because the subdirs.el files may add elements to the end
         ;; of load-path and we want to take it into account.