aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-11-25 21:58:51 -0500
committerGlenn Morris2013-11-25 21:58:51 -0500
commitd668605594cb2bb8622d77b1fc07b5beeb3252c1 (patch)
tree4b64c01a78cbebbc91e81db8be604213e2236172
parent624780f09dd117edbe8b2b71be44622fc7002f91 (diff)
downloademacs-d668605594cb2bb8622d77b1fc07b5beeb3252c1.tar.gz
emacs-d668605594cb2bb8622d77b1fc07b5beeb3252c1.zip
* doc/lispref/os.texi (Startup Summary): Update for leim-list being preloaded.
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/os.texi13
2 files changed, 12 insertions, 5 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index bd84546551f..778e952697f 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
12013-11-26 Glenn Morris <rgm@gnu.org>
2
3 * os.texi (Startup Summary): Update for leim-list being preloaded.
4
12013-11-23 Brian Jenkins <brian@brianjenkins.org> (tiny change) 52013-11-23 Brian Jenkins <brian@brianjenkins.org> (tiny change)
2 6
3 * frames.texi (Input Focus): 7 * frames.texi (Input Focus):
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index ed9b8b93a89..c5949fd5f15 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -71,11 +71,14 @@ in their turn. The files @file{subdirs.el} are normally generated
71automatically when Emacs is installed. 71automatically when Emacs is installed.
72 72
73@item 73@item
74If the library @file{leim-list.el} exists, Emacs loads it. This 74It loads any @file{leim-list.el} that it finds in the @code{load-path}
75optional library is intended for registering input methods; Emacs 75directories. This file is intended for registering input methods.
76looks for it in @code{load-path} (@pxref{Library Search}), skipping 76The search is only for any personal @file{leim-list.el} files that you
77those directories containing the standard Emacs libraries (since 77may have created; so it skips the directories containing the standard Emacs
78@file{leim-list.el} should not exist in those directories). 78libraries (for efficiency, since @file{leim-list.el} should not exist
79in those directories), as well as the @file{leim} directory that is
80part of the distribution (since the @file{leim-list.el} file in this
81directory is compiled into the Emacs executable).
79 82
80@vindex before-init-time 83@vindex before-init-time
81@item 84@item