Fix MSDOS build broken by autoconfiscation and changes in symbol handling.

 src/msdos.c (dos_set_window_size):
 src/w16select.c (Fx_selection_exists_p): Use `Fsymbol_value (foo)'
 instead of `XSYMBOL (foo)->value'.
 config.bat: Allow for 2 leading `#'s in comments in
 src/Makefile.in.
 src/Makefile.in: Don't use Make-style comments past the "start of
 cpp stuff" line.
 (MSDOS_OBJ): Remove xmenu.o (it is now defined by XMENU_OBJ).
 src/s/msdos.h (UNEXEC): Don't define (@unexec@ in Makefile.in is
 edited directly by msdos/sed1v2.inp).
 msdos/sed3v2.inp (C_SWITCH_MACHINE): Edit to empty.
 msdos/sed1v2.inp (@LIB_MATH@): Edit to -lm.
 (C_SWITCH_MACHINE, C_SWITCH_SYSTEM, LD_SWITCH_SYSTEM_TEMACS)
 (LD_SWITCH_X_SITE_AUX, LD_SWITCH_X_SITE_AUX_RPATH)
 (LD_SWITCH_SYSTEM, LD_SWITCH_SYSTEM_EXTRA, LIBTIFF, LIBJPEG)
 (LIBPNG, LIBGIF, LIBXPM, XFT_LIBS, DBUS_CFLAGS, DBUS_LIBS)
 (DBUS_OBJ, GCONF_CFLAGS, GCONF_LIBS, GTK_OBJ, LIBXMU, LIBXSM)
 (LIBXTR6, XOBJ, TOOLKIT_LIBW, WIDGET_OBJ, CYGWIN_OBJ, NS_OBJ)
 (NS_SUPPORT, LIBSELINUX_LIBS, START_FILES): Edit to empty.
 (XMENU_OBJ): Edit to xmenu.o.
 (FONT_OBJ): Edit to value used for X on Unix.
 (PRE_ALLOC_OBJ): Edit to lastfile.o.
 (POST_ALLOC_OBJ): Edit to $(vmlimitobj).
 (@unexec@): Edit to unexec.o.
 lisp/cus-start.el (all): Add native condition for tool-bar-* symbols.

2 files changed, 8 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24e1b98f736..e2aeabf1fe1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * cus-start.el (all): Add native condition for tool-bar-* symbols.
+
 2010-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 07f7702e9d6..bc48aa88cc5 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -408,6 +408,10 @@ since it could result in memory overflow and make Emacs crash."
                        (fboundp 'define-fringe-bitmap))
                       ((equal "font-use-system-font" (symbol-name symbol))
                        (featurep 'system-font-setting))
+                      ;; Conditioned on x-create-frame, because that's
+                      ;; the condition for loadup.el to preload tool-bar.el.
+                      ((string-match "tool-bar-" (symbol-name symbol))
+                       (fboundp 'x-create-frame))
                       (t t))))
     (if (not (boundp symbol))
         ;; If variables are removed from C code, give an error here!