From: Eli Zaretskii Date: Fri, 25 May 2012 10:31:18 +0000 (+0300) Subject: Follow-up for 2012-05-02T13:00:29Z!cyd@gnu.org. X-Git-Tag: emacs-24.2.90~471^2~6^2~110^2~4^2 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f31237a47f4ac624db0660103a7b12b0b5f8640f;p=emacs.git Follow-up for 2012-05-02T13:00:29Z!cyd@gnu.org. lisp/cus-start.el : Avoid warning on platforms that don't link in fontset.c. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4cd6f324956..2883420778f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-05-25 Eli Zaretskii + + * cus-start.el : Avoid warning on + platforms that don't link in fontset.c. + 2012-05-25 Juri Linkov 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 fc3c6561a1e..3ea5f41db55 100644 --- 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!