diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index e92edfd64b1..311a28a3e39 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2012-07-07 Chong Yidong + + * custom.texi (Init File): Index site-lisp (Bug#11435). + 2012-07-06 Chong Yidong * emacs.texi: Re-order top-level menu to correspond to logical diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index e46ffe4a186..f352898a4d4 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -2103,11 +2103,12 @@ loading of this library, use the option @samp{--no-site-file}. better to put them in @file{default.el}, so that users can more easily override them. +@cindex site-lisp directories You can place @file{default.el} and @file{site-start.el} in any of the directories which Emacs searches for Lisp libraries. The variable @code{load-path} (@pxref{Lisp Libraries}) specifies these directories. -Many sites put these files in the @file{site-lisp} subdirectory of the -Emacs installation directory, typically +Many sites put these files in a subdirectory named @file{site-lisp} in +the Emacs installation directory, such as @file{/usr/local/share/emacs/site-lisp}. Byte-compiling your init file is not recommended (@pxref{Byte diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 62b86e756cf..1faf9e04ec1 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2012-07-07 Chong Yidong + + * loading.texi (Library Search): Index site-lisp directories. + 2012-07-06 Chong Yidong * intro.texi (A Sample Function Description): Fix incorrect diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index 0d3acf3a968..3c9bee96639 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi @@ -262,6 +262,7 @@ Here is how to set it from @code{csh}: setenv EMACSLOADPATH /home/foo/.emacs.d/lisp:/opt/emacs/lisp @end example +@cindex site-lisp directories If @env{EMACSLOADPATH} is not set (which is usually the case), Emacs initializes @code{load-path} with the following two directories: