*** empty log message ***

diff --git a/INSTALL b/INSTALL
index b7b315a6d303a6992da379fb900adaf6ad32fae3..aa5f7eaec73a8ed155337b01f3b89187ecb4943c 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -20,18 +20,20 @@ ADDITIONAL DISTRIBUTION FILES
 * leim-M.N.tar.gz
 
 The Emacs Lisp code for input methods for various international
-character scripts is distributed in a separate tar file because of its
-large size.  This file is called leim-M.N.tar.gz, with the same
-version number as Emacs, and it unpacks into the directory
-emacs-M.N/leim.  Thus, if you unpack it in the same directory where
-you unpacked the Emacs distribution, it fills in a subdirectory
-of the Emacs distribution.
-
-If you have already unpacked the Leim tar file into a subdirectory of
-the Emacs sources, building and installing Emacs automatically
-installs the input method support as well.  If you unpack the Leim tar
-file into the Emacs sources after building and installing Emacs, just
-build Emacs again and install it again.
+character scripts is distributed in a separate tar file because it
+amounts to a significant fraction of the size of the distribution.
+This tar file is called leim-M.N.tar.gz, with the same version number
+as Emacs, and it unpacks into the directory emacs-M.N/leim.
+
+You should unpack leim-M.N.tar.gz into the same directory where you
+have previously unpacked the main Emacs distribution.  It fills in the
+contents of one subdirectory, which is present in the main Emacs
+distribution only in dummy form.
+
+Once you have unpacked the Leim tar file into the Emacs source tree,
+building and installing Emacs automatically installs the input method
+support as well.  If you have built Emacs without unpacking Leim
+first, just unpack Leim, build Emacs again, and install it again.
 
 * intlfonts-VERSION.tar.gz
 

diff --git a/lispref/tips.texi b/lispref/tips.texi
index b52c0352e0ac928621ce07567f1aeb7b0a76b17b..2ab8b2899602d42e0263a5f44e314662ae24c164 100644 (file)
--- a/lispref/tips.texi
+++ b/lispref/tips.texi
@@ -85,6 +85,19 @@ compiled code that won't work right.  @xref{Compiling Macros}.
 Using @code{eval-when-compile} avoids loading @var{bar} when
 the compiled version of @var{foo} is @emph{used}.
 
+@item
+Please don't require the @code{cl} package of Common Lisp extensions at
+run time.  Use of this package is optional, and it is not part of the
+standard Emacs namespace.  If your package loads @code{cl} at run time,
+that could cause name clashes for users who don't use that package.
+
+However, there is no problem with using the @code{cl} package at compile
+time, for the sake of macros.  You do that like this:
+
+@example
+(eval-when-compile (require 'cl))
+@end example
+
 @item
 When defining a major mode, please follow the major mode
 conventions.  @xref{Major Mode Conventions}.