Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 297-298)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-65

3 files changed, 11 insertions, 9 deletions

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index d8c8480c6d3..16ba4acd74a 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * display.texi (Font Selection): Remove description of
+        clear-face-cache.
+
+        * compile.texi (Eval During Compile): Fix a typo.  Add index
+        entries for possible uses of eval-when-compile.
+
 2006-06-04  Thien-Thi Nguyen  <ttn@gnu.org>
 
         * display.texi (Abstract Display): Fix typo.
diff --git a/lispref/compile.texi b/lispref/compile.texi
index 4b796697731..1b18e0ee284 100644
--- a/lispref/compile.texi
+++ b/lispref/compile.texi
@@ -435,15 +435,16 @@ compiler becomes a constant which appears in the compiled program.  If
 you load the source file, rather than compiling it, @var{body} is
 evaluated normally.
 
+@cindex compile-time constant
 If you have a constant that needs some calculation to produce,
-@code{eval-when-compile} can do that done at compile-time.  For
-example,
+@code{eval-when-compile} can do that at compile-time.  For example,
 
 @lisp
 (defvar my-regexp
   (eval-when-compile (regexp-opt '("aaa" "aba" "abb"))))
 @end lisp
 
+@cindex macros, at compile time
 If you're using another package, but only need macros from it (the
 byte compiler will expand those), then @code{eval-when-compile} can be
 used to load it for compiling, but not executing.  For example,
diff --git a/lispref/display.texi b/lispref/display.texi
index 21277d1c587..1b8e66ec23e 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -2381,13 +2381,6 @@ expression in the list.  For example,
 allows the use of scalable fonts with registry @code{muleindian-2}.
 @end defvar
 
-@defun clear-face-cache &optional unload-p
-@tindex clear-face-cache
-This function clears the face cache for all frames.
-If @var{unload-p} is non-@code{nil}, that means to unload
-all unused fonts as well.
-@end defun
-
 @defvar face-font-rescale-alist
 This variable specifies scaling for certain faces.  Its value should
 be a list of elements of the form