[Emacs-diffs] /srv/bzr/emacs/trunk r108361: Minor fixes for MSDOS build to track latest changes.

[Eli Zaretskii]

------------------------------------------------------------
revno: 108361 [merge]
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2012-05-25 13:35:13 +0300
message:
  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.
modified:
  lisp/ChangeLog
  lisp/cus-start.el
  msdos/ChangeLog
  msdos/sed6.inp

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-25 00:55:40 +0000
+++ b/lisp/ChangeLog    2012-05-25 10:31:18 +0000
@@ -1,3 +1,8 @@
+2012-05-25  Eli Zaretskii  <address@hidden>
+
+       * cus-start.el <vertical-centering-font-regexp>: Avoid warning on
+       platforms that don't link in fontset.c.
+
 2012-05-25  Juri Linkov  <address@hidden>
 
        Use the same diff color scheme as in modern VCSes (bug#10181).

=== modified file 'lisp/cus-start.el'
--- a/lisp/cus-start.el 2012-05-10 00:55:57 +0000
+++ b/lisp/cus-start.el 2012-05-25 10:31:18 +0000
@@ -549,6 +549,10 @@
                      ;; 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!

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2012-05-22 16:20:27 +0000
+++ b/msdos/ChangeLog   2012-05-25 10:21:30 +0000
@@ -1,3 +1,8 @@
+2012-05-25  Eli Zaretskii  <address@hidden>
+
+       * sed6.inp (INFO_EXT): Edit to .info.
+       (INFO_OPTS): Edit to --no-split.
+
 2012-05-22  Paul Eggert  <address@hidden>
 
        Remove src/m/*.

=== modified file 'msdos/sed6.inp'
--- a/msdos/sed6.inp    2012-01-19 07:21:25 +0000
+++ b/msdos/sed6.inp    2012-05-25 10:21:30 +0000
@@ -19,6 +19,8 @@
 /^srcdir *=/s/@address@hidden@/./
 /^VPATH *=/s/@address@hidden@/./
 /^MAKEINFO *=/s/@address@hidden@/makeinfo/
+/^INFO_EXT *=/s/@address@hidden@/.info/
+/^INFO_OPTS *=/s/@address@hidden@/--no-split/
 /^ENVADD/,/^$/c\
 ENVADD =\
 export TEXINPUTS := $(srcdir)";"$(TEXINPUTS)\