From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 7 May 2010 14:07:51 +0000 (+0300)
Subject: Fix MSDOS build broken by autoconfiscation and changes in symbol handling.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~239
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=59d93e877072c242f5947ed6f2a536a14629393b;p=emacs.git

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

59d93e877072c242f5947ed6f2a536a14629393b
diff --cc lisp/ChangeLog
index 24e1b98f736,1bced3edfdf..e2aeabf1fe1
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,9 -1,7 +1,13 @@@
+ 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.
 +	* simple.el (auto-save-mode): Move from files.el.
 +	* minibuffer.el (completion--common-suffix): Fix copy&paste error.
 +
  2010-05-07  Christian von Roques <roques@mti.ag> (tiny change)
  
  	* lisp/epg.el (epg-key-capablity-alist): Add "D" flag (Bug#5592).
diff --cc src/ChangeLog
index 04d9d6b8266,0cea5ff8e45..9570c0ce3c7
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,3 -1,18 +1,20 @@@
+ 2010-05-07  Eli Zaretskii  <eliz@gnu.org>
+ 
+ 	* msdos.c (dos_set_window_size):
+ 	* w16select.c (Fx_selection_exists_p): Use `Fsymbol_value (foo)'
+ 	instead of `XSYMBOL (foo)->value'.
+ 
++2010-05-07  Eli Zaretskii  <eliz@gnu.org>
++
+ 	Fix the MS-DOS build, broken by autoconfiscation.
+ 
+ 	* 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).
+ 
+ 	* s/msdos.h (UNEXEC): Don't define (@unexec@ in Makefile.in is
+ 	edited directly by msdos/sed1v2.inp).
+ 
  2010-05-07  Glenn Morris  <rgm@gnu.org>
  
  	* Makefile.in (LD_SWITCH_SYSTEM): Set with configure, not cpp.