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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4cd6f32..2883420 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 fc3c656..3ea5f41 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!

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 2b56315..ae72d18 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-25  Eli Zaretskii  <eliz@gnu.org>
+
+       * sed6.inp (INFO_EXT): Edit to .info.
+       (INFO_OPTS): Edit to --no-split.
+
 2012-05-22  Paul Eggert  <eggert@cs.ucla.edu>
 
        Remove src/m/*.

diff --git a/msdos/sed6.inp b/msdos/sed6.inp
index 6d44f99..2205214 100644 (file)
--- a/msdos/sed6.inp
+++ b/msdos/sed6.inp
@@ -19,6 +19,8 @@
 /^srcdir *=/s/@[^@\n]*@/./
 /^VPATH *=/s/@[^@\n]*@/./
 /^MAKEINFO *=/s/@[^@\n]*@/makeinfo/
+/^INFO_EXT *=/s/@[^@\n]*@/.info/
+/^INFO_OPTS *=/s/@[^@\n]*@/--no-split/
 /^ENVADD/,/^$/c\
 ENVADD =\
 export TEXINPUTS := $(srcdir)";"$(TEXINPUTS)\