Build the list L at compile time.

2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2f1e33f4b28..612a7ea5009 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2001-12-16  Stefan Monnier  <monnier@cs.yale.edu>
 
+        * international/fontset.el: Build the list L at compile time.
+
         * language/ind-util.el (mapthread): Make a closure.
 
 2001-12-15  Richard M. Stallman  <rms@gnu.org>
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index bf95f60cd23..9ea6e8d3f8e 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -40,7 +40,11 @@
 ;; character `*' is embedded in `CHARSET_ENCODING' field.  The
 ;; REGISTRY for ASCII characters are predefined as "ISO8859-1".
 
-(let ((l `((latin-iso8859-1 . (nil . "ISO8859-1"))
+(let ((l
+       ;; Eval this at compile-time, since fontset.el is always loaded
+       ;; when run under X and this would always load ind-util.el as well.
+       (eval-when-compile
+         `((latin-iso8859-1 . (nil . "ISO8859-1"))
            (latin-iso8859-2 . (nil . "ISO8859-2"))
            (latin-iso8859-3 . (nil . "ISO8859-3"))
            (latin-iso8859-4 . (nil . "ISO8859-4"))
@@ -114,7 +118,7 @@
              . ,(indian-glyph-char 255 'kannada)) . ("*" . "Kannada-CDAC"))
            ((,(indian-glyph-char 0 'malayalam)
              . ,(indian-glyph-char 255 'malayalam)) . ("*" . "Malayalam-CDAC"))
-           ))
+           )))
       charset font-spec arg)
   (while l
     (setq charset (car (car l)) font-spec (cdr (car l)) l (cdr l))