Follow-up for 2012-05-02T13:00:29Z!cyd@gnu.org.

 lisp/cus-start.el <vertical-centering-font-regexp>: Avoid warning on
 platforms that don't link in fontset.c.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4cd6f3249565464f2a9b3d0a0404bef4ca1b9286..2883420778f5de4fbea73bff32fca68aa34905dc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-25  Eli Zaretskii  <eliz@gnu.org>
+
+       * cus-start.el <vertical-centering-font-regexp>: Avoid warning on
+       platforms that don't link in fontset.c.
+
 2012-05-25  Juri Linkov  <juri@jurta.org>
 
        Use the same diff color scheme as in modern VCSes (bug#10181).

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index fc3c6561a1e9318a664eb3c49abe8a5d263f1165..3ea5f41db555dfb0ee458a05200971f1752c6d0c 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -549,6 +549,10 @@ since it could result in memory overflow and make Emacs crash."
                      ;; the condition for loadup.el to preload tool-bar.el.
                      ((string-match "tool-bar-" (symbol-name symbol))
                       (fboundp 'x-create-frame))
+                     ((equal "vertical-centering-font-regexp"
+                             (symbol-name symbol))
+                      ;; Any function from fontset.c will do.
+                      (fboundp 'new-fontset))
                      (t t))))
     (if (not (boundp symbol))
        ;; If variables are removed from C code, give an error here!