Minor fixes for MSDOS build to track latest changes.

 msdos/sed6.inp (INFO_EXT): Edit to .info.
 (INFO_OPTS): Edit to --no-split.
 lisp/cus-start.el <vertical-centering-font-regexp>: Avoid warning on
 platforms that don't link in fontset.c.

2 files changed, 9 insertions, 0 deletions

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  <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 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!