Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 100252. ------------------------------------------------------------ revno: 100252 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-05-12 20:58:17 -0700 message: Regenerate configure, src/config.in. diff: === modified file 'configure' --- configure 2010-05-12 03:09:56 +0000 +++ configure 2010-05-13 03:58:17 +0000 @@ -26313,27 +26313,31 @@ ### Use configuration here uncanonicalized to avoid exceeding size limits. - - - - - - - - - - - - - - - - - - - - - +## Unused? + + + + + + + + + + + + + + + + + + + + + +## FIXME? Nothing uses @LD_SWITCH_X_SITE@. +## src/Makefile.in did add LD_SWITCH_X_SITE (as a cpp define) to the +## end of LIBX_BASE, but nothing ever set it. @@ -26374,16 +26378,6 @@ _ACEOF -cat >>confdefs.h <<_ACEOF -#define LD_SWITCH_X_SITE ${LD_SWITCH_X_SITE} -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define C_SWITCH_X_SITE ${C_SWITCH_X_SITE} -_ACEOF - - XMENU_OBJ= XOBJ= if test "${HAVE_X_WINDOWS}" = "yes" ; then @@ -26480,7 +26474,7 @@ LIBX_OTHER= fi -if test "$HAVE_GTK" = "yes"; then +if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then OLDXMENU= LIBXMENU= fi === modified file 'src/config.in' --- src/config.in 2010-05-10 00:11:40 +0000 +++ src/config.in 2010-05-13 03:58:17 +0000 @@ -44,12 +44,6 @@ /* Define to 1 if using `getloadavg.c'. */ #undef C_GETLOADAVG -/* Define C_SWITCH_X_SITE to contain any special flags your compiler may need - to deal with X Windows. For instance, if you've defined HAVE_X_WINDOWS - above and your X include files aren't in a place that your compiler can - find on its own, you might want to add "-I/..." or something similar. */ -#undef C_SWITCH_X_SITE - /* Define to 1 for DGUX with . */ #undef DGUX @@ -804,12 +798,6 @@ /* Define to use Kerberos 5 instead of Kerberos 4. */ #undef KERBEROS5 -/* Define LD_SWITCH_X_SITE to contain any special flags your loader may need - to deal with X Windows. For instance, if you've defined HAVE_X_WINDOWS - above and your X libraries aren't in a place that your loader can find on - its own, you might want to add "-L/..." or something similar. */ -#undef LD_SWITCH_X_SITE - /* Define to 1 if localtime caches TZ. */ #undef LOCALTIME_CACHE ------------------------------------------------------------ revno: 100251 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-05-12 20:55:46 -0700 message: Some msdos build fixes (hopefully, possibly, ...) * msdos/sed1x.inp (OLDXMENU): Edit to ${oldXMenudir}libXMenu11.a. (LIBXMENU): Edit to ${OLDXMENU}. (LIBX_OTHER): Edit to ${LIBXT} ${LIBX_EXTRA}. diff: === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2010-05-13 02:50:20 +0000 +++ msdos/ChangeLog 2010-05-13 03:55:46 +0000 @@ -1,5 +1,9 @@ 2010-05-13 Glenn Morris + * sed1x.inp (OLDXMENU): Edit to ${oldXMenudir}libXMenu11.a. + (LIBXMENU): Edit to ${OLDXMENU}. + (LIBX_OTHER): Edit to ${LIBXT} ${LIBX_EXTRA}. + * sed1v2.inp (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD) (FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS, FREETYPE_LIBS) (LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS, M17N_FLT_LIBS) === modified file 'msdos/sed1x.inp' --- msdos/sed1x.inp 2010-05-11 02:51:08 +0000 +++ msdos/sed1x.inp 2010-05-13 03:55:46 +0000 @@ -4,7 +4,9 @@ s!^ cd \${oldXMenudir}; \${MAKE}.*$! ${MAKE} -C ${oldXMenudir}.! s!^ @true *$! @rem! s/DOC/DOC-X/g -#/^LIBXMENU *=/s!= *!= ../oldxmenu/! +/^OLDXMENU *=/s!@OLDXMENU@!${oldXMenudir}libXMenu11.a! +/^LIBXMENU *=/s!@LIBXMENU@!${OLDXMENU}! +/^LIBX_OTHER *=/s!@LIBX_OTHER@!${LIBXT} ${LIBX_EXTRA}! /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys! /^temacs *:/s!OLDXMENU!LIBXMENU! ------------------------------------------------------------ revno: 100250 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-05-12 20:52:07 -0700 message: Let configure set OLDXMENU, LIBXMENU if !HAVE_MENUS. * configure.in (OLDXMENU, LIBXMENU): Set to empty if !HAVE_MENUS. * src/Makefile.in (OLDXMENU, LIBXMENU) [!HAVE_MENUS]: Let configure set these variables (to empty) in this case as well. diff: === modified file 'ChangeLog' --- ChangeLog 2010-05-13 03:18:04 +0000 +++ ChangeLog 2010-05-13 03:52:07 +0000 @@ -1,5 +1,7 @@ 2010-05-13 Glenn Morris + * configure.in (OLDXMENU, LIBXMENU): Set to empty if !HAVE_MENUS. + * configure.in (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Do not define. 2010-05-12 Glenn Morris === modified file 'configure.in' --- configure.in 2010-05-13 03:18:04 +0000 +++ configure.in 2010-05-13 03:52:07 +0000 @@ -3144,7 +3144,7 @@ LIBX_OTHER= fi -if test "$HAVE_GTK" = "yes"; then +if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then OLDXMENU= LIBXMENU= fi === modified file 'src/ChangeLog' --- src/ChangeLog 2010-05-13 03:18:04 +0000 +++ src/ChangeLog 2010-05-13 03:52:07 +0000 @@ -1,5 +1,8 @@ 2010-05-13 Glenn Morris + * Makefile.in (OLDXMENU, LIBXMENU) [!HAVE_MENUS]: + Let configure set these variables (to empty) in this case as well. + * Makefile.in (LD_SWITCH_X_SITE): Define as a variable, not via cpp. (LIBX_BASE): Use $LD_SWITCH_X_SITE. === modified file 'src/Makefile.in' --- src/Makefile.in 2010-05-13 03:18:04 +0000 +++ src/Makefile.in 2010-05-13 03:52:07 +0000 @@ -289,20 +289,12 @@ $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $< #ifdef HAVE_X_WINDOWS -/* This test needs to say in cpp for the time being, since s/msdos.h - defines HAVE_MENUS, and does not use the configure script. */ -#ifdef HAVE_MENUS OLDXMENU=@OLDXMENU@ LIBXMENU=@LIBXMENU@ -#else /* not HAVE_MENUS */ -OLDXMENU= -LIBXMENU= -#endif /* not HAVE_MENUS */ - LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) LIBX_OTHER=@LIBX_OTHER@ -#endif /* not HAVE_X_WINDOWS */ +#endif /* HAVE_X_WINDOWS */ /* A macro which other sections of Makefile can redefine to munge the ------------------------------------------------------------ revno: 100249 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-05-12 20:18:04 -0700 message: Remove some unused #define's, previously replaced by variables. * configure.in (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Do not define. * src/Makefile.in (LD_SWITCH_X_SITE): Define as a variable, not via cpp. (LIBX_BASE): Use $LD_SWITCH_X_SITE. * nt/config.nt (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Remove undefs. * msdos/sed1v2.inp: Comment. diff: === modified file 'ChangeLog' --- ChangeLog 2010-05-12 03:06:50 +0000 +++ ChangeLog 2010-05-13 03:18:04 +0000 @@ -1,3 +1,7 @@ +2010-05-13 Glenn Morris + + * configure.in (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Do not define. + 2010-05-12 Glenn Morris * configure.in (LIB_SRC_EXTRA_INSTALLABLES): Remove, unused. === modified file 'configure.in' --- configure.in 2010-05-12 03:06:50 +0000 +++ configure.in 2010-05-13 03:18:04 +0000 @@ -3012,6 +3012,7 @@ ### Use configuration here uncanonicalized to avoid exceeding size limits. AC_SUBST(version) AC_SUBST(configuration) +## Unused? AC_SUBST(canonical) AC_SUBST(srcdir) AC_SUBST(prefix) @@ -3033,6 +3034,9 @@ AC_SUBST(gamedir) AC_SUBST(gameuser) AC_SUBST(unexec) +## FIXME? Nothing uses @LD_SWITCH_X_SITE@. +## src/Makefile.in did add LD_SWITCH_X_SITE (as a cpp define) to the +## end of LIBX_BASE, but nothing ever set it. AC_SUBST(LD_SWITCH_X_SITE) AC_SUBST(C_SWITCH_X_SITE) AC_SUBST(C_SWITCH_X_SYSTEM) @@ -3060,18 +3064,6 @@ [Define to the used machine dependent file.]) AC_DEFINE_UNQUOTED(config_opsysfile, "${opsysfile}", [Define to the used os dependent file.]) -AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE, ${LD_SWITCH_X_SITE}, -[Define LD_SWITCH_X_SITE to contain any special flags your loader - may need to deal with X Windows. For instance, if you've defined - HAVE_X_WINDOWS above and your X libraries aren't in a place that - your loader can find on its own, you might want to add "-L/..." or - something similar.]) -AC_DEFINE_UNQUOTED(C_SWITCH_X_SITE, ${C_SWITCH_X_SITE}, -[Define C_SWITCH_X_SITE to contain any special flags your compiler - may need to deal with X Windows. For instance, if you've defined - HAVE_X_WINDOWS above and your X include files aren't in a place - that your compiler can find on its own, you might want to add - "-I/..." or something similar.]) XMENU_OBJ= XOBJ= === modified file 'msdos/sed1v2.inp' --- msdos/sed1v2.inp 2010-05-13 02:50:20 +0000 +++ msdos/sed1v2.inp 2010-05-13 03:18:04 +0000 @@ -46,6 +46,7 @@ /^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@// /^C_SWITCH_X_SYSTEM *=/s/@C_SWITCH_X_SYSTEM@// /^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@// +#/^LD_SWITCH_X_SITE *=/s/@LD_SWITCH_X_SITE@// /^LD_SWITCH_SYSTEM_TEMACS *=/s/@LD_SWITCH_SYSTEM_TEMACS@// /^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@// /^LD_SWITCH_X_SITE_AUX_RPATH *=/s/@LD_SWITCH_X_SITE_AUX_RPATH@// === modified file 'nt/ChangeLog' --- nt/ChangeLog 2010-05-11 02:04:13 +0000 +++ nt/ChangeLog 2010-05-13 03:18:04 +0000 @@ -1,3 +1,7 @@ +2010-05-13 Glenn Morris + + * config.nt (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Remove undefs. + 2010-05-07 Chong Yidong * Version 23.2 released. === modified file 'nt/config.nt' --- nt/config.nt 2010-05-04 03:13:35 +0000 +++ nt/config.nt 2010-05-13 03:18:04 +0000 @@ -1,6 +1,7 @@ /* GNU Emacs site configuration template file. -*- C -*- - Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + +Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, + 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -318,20 +319,6 @@ #define subprocesses -/* Define LD_SWITCH_X_SITE to contain any special flags your loader - may need to deal with X Windows. For instance, if you've defined - HAVE_X_WINDOWS above and your X libraries aren't in a place that - your loader can find on its own, you might want to add "-L/..." or - something similar. */ -#undef LD_SWITCH_X_SITE - -/* Define C_SWITCH_X_SITE to contain any special flags your compiler - may need to deal with X Windows. For instance, if you've defined - HAVE_X_WINDOWS above and your X include files aren't in a place - that your compiler can find on its own, you might want to add - "-I/..." or something similar. */ -#undef C_SWITCH_X_SITE - /* Define STACK_DIRECTION here, but not if m/foo.h did. */ #ifndef STACK_DIRECTION #undef STACK_DIRECTION === modified file 'src/ChangeLog' --- src/ChangeLog 2010-05-13 02:50:20 +0000 +++ src/ChangeLog 2010-05-13 03:18:04 +0000 @@ -1,5 +1,8 @@ 2010-05-13 Glenn Morris + * Makefile.in (LD_SWITCH_X_SITE): Define as a variable, not via cpp. + (LIBX_BASE): Use $LD_SWITCH_X_SITE. + * Makefile.in (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD) (LIB_MATH, FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS) (FREETYPE_LIBS, LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS) === modified file 'src/Makefile.in' --- src/Makefile.in 2010-05-13 02:50:20 +0000 +++ src/Makefile.in 2010-05-13 03:18:04 +0000 @@ -85,6 +85,15 @@ ## This is used before C_SWITCH_X_SYSTEM and may override it. C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ +## Define LD_SWITCH_X_SITE to contain any special flags your loader +## may need to deal with X Windows. For instance, if your X libraries +## aren't in a place that your loader can find on its own, you might +## want to add "-L/..." or something similar. Only used if +## HAVE_X_WINDOWS. +## FIXME? configure sets a value for this, but it has never been +## substituted in this or any other Makefile. Cf C_SWITCH_X_SITE. +LD_SWITCH_X_SITE= + ## This holds any special options for linking temacs only (ie, not ## used by configure). Not used elsewhere because it sometimes ## contains options that have to do with using Emacs's crt0, @@ -241,11 +250,6 @@ do not let it interfere with this file. */ #undef register -/* This macro is for switches specifically related to X Windows. */ -#ifndef LD_SWITCH_X_SITE -#define LD_SWITCH_X_SITE -#endif - #ifdef NS_IMPL_GNUSTEP /* Pull in stuff from GNUstep-make. */ FOUNDATION_LIB=gnu @@ -296,7 +300,7 @@ #endif /* not HAVE_MENUS */ LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) -LIBX_BASE=$(LIBXMENU) LD_SWITCH_X_SITE +LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) LIBX_OTHER=@LIBX_OTHER@ #endif /* not HAVE_X_WINDOWS */ ------------------------------------------------------------ revno: 100248 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-05-12 19:50:20 -0700 message: Define some variables to hold configure's output, for clarity. * src/Makefile.in (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD) (LIB_MATH, FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS) (FREETYPE_LIBS, LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS) (M17N_FLT_LIBS, GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBGPM) (LIBRESOLV, UNEXEC_OBJ): For clarity, define variables to hold the values output be configure. (ALL_CFLAGS, obj, LIBES, temacs${EXEEXT}): Use the above variables. * msdos/sed1v2.inp (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD) (FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS, FREETYPE_LIBS) (LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS, M17N_FLT_LIBS) (GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBRESOLV, LIBGPM): Edit to empty, (LIB_MATH): Edit to -lm. (UNEXEC_OBJ): Edit to unexec.o. diff: === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2010-05-12 03:06:50 +0000 +++ msdos/ChangeLog 2010-05-13 02:50:20 +0000 @@ -1,3 +1,13 @@ +2010-05-13 Glenn Morris + + * sed1v2.inp (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD) + (FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS, FREETYPE_LIBS) + (LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS, M17N_FLT_LIBS) + (GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBRESOLV, LIBGPM): + Edit to empty, + (LIB_MATH): Edit to -lm. + (UNEXEC_OBJ): Edit to unexec.o. + 2010-05-12 Glenn Morris * sed3v2.inp (INSTALLABLES): No more @LIB_SRC_EXTRA_INSTALLABLES@. === modified file 'msdos/sed1v2.inp' --- msdos/sed1v2.inp 2010-05-12 03:01:16 +0000 +++ msdos/sed1v2.inp 2010-05-13 02:50:20 +0000 @@ -38,13 +38,14 @@ /^CPPFLAGS *=/s/@[^@\n]*@// /^LDFLAGS *=/s/@[^@\n]*@// /^LIBS *=/s/@[^@\n]*@// -s/@LIB_MATH@/-lm/ /^LIBES *=/,/^ *$/ { s/@[^@\n]*@//g } /^LIBOBJS *=/s/@[^@\n]*@/getloadavg.o/ /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// /^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@// +/^C_SWITCH_X_SYSTEM *=/s/@C_SWITCH_X_SYSTEM@// +/^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@// /^LD_SWITCH_SYSTEM_TEMACS *=/s/@LD_SWITCH_SYSTEM_TEMACS@// /^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@// /^LD_SWITCH_X_SITE_AUX_RPATH *=/s/@LD_SWITCH_X_SITE_AUX_RPATH@// @@ -52,12 +53,22 @@ /^LD_SWITCH_SYSTEM_EXTRA *=/s/@LD_SWITCH_SYSTEM_EXTRA@// /^LIBS_SYSTEM *=/s/@LIBS_SYSTEM@// /^LIB_GCC *=/s/@LIB_GCC@/-Lgcc/ +/^LIB_STANDARD *=/s/@LIB_STANDARD@// +/^LIB_MATH *=/s/@LIB_MATH@/-lm/ /^LIBTIFF *=/s/@LIBTIFF@// /^LIBJPEG *=/s/@LIBJPEG@// /^LIBPNG *=/s/@LIBPNG@// /^LIBGIF *=/s/@LIBGIF@// /^LIBXPM *=/s/@LIBXPM@// /^XFT_LIBS *=/s/@XFT_LIBS@// +/^FONTCONFIG_CFLAGS *=/s/@FONTCONFIG_CFLAGS@// +/^FONTCONFIG_LIBS *=/s/@FONTCONFIG_LIBS@// +/^FREETYPE_CFLAGS *=/s/@FREETYPE_CFLAGS@// +/^FREETYPE_LIBS *=/s/@FREETYPE_LIBS@// +/^LIBOTF_CFLAGS *=/s/@LIBOTF_CFLAGS@// +/^LIBOTF_LIBS *=/s/@LIBOTF_LIBS@// +/^M17N_FLT_CFLAGS *=/s/@M17N_FLT_CFLAGS@// +/^M17N_FLT_LIBS *=/s/@M17N_FLT_LIBS@// /^DBUS_CFLAGS *=/s/@DBUS_CFLAGS@// /^DBUS_LIBS *=/s/@DBUS_LIBS@// /^DBUS_OBJ *=/s/@DBUS_OBJ@// @@ -79,16 +90,20 @@ /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@// /^NS_OBJ *=/s/@NS_OBJ@// /^NS_SUPPORT *=/s/@NS_SUPPORT@// +/^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@// +/^GNUSTEP_SYSTEM_LIBRARIES *=/s/@GNUSTEP_SYSTEM_LIBRARIES@// +/^LIBRESOLV *=/s/@LIBRESOLV@// /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// /^GETLOADAVG_LIBS *=/s/@[^@\n]*@// /^START_FILES *=/s/@START_FILES@// /^OTHER_FILES *=/s/@OTHER_FILES@// /^XMENU_OBJ *=/s/@XMENU_OBJ@/xmenu.o/ /^FONT_OBJ *=/s/@FONT_OBJ@/xfont.o ftfont.o xftfont.o ftxfont.o/ +/^LIBGPM *=/s/@LIBGPM@// /^EXEEXT *=/s/@EXEEXT@/.exe/ /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/ /^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/ -s/@unexec@/unexec.o/g +/^UNEXEC_OBJ *=/s/@unexec@/unexec.o/ /^version *=/s/@[^@\n]*@// /^M_FILE *=/s!@[^@\n]*@!m/intel386.h! /^S_FILE *=/s!@[^@\n]*@!s/msdos.h! === modified file 'src/ChangeLog' --- src/ChangeLog 2010-05-12 03:44:36 +0000 +++ src/ChangeLog 2010-05-13 02:50:20 +0000 @@ -1,3 +1,13 @@ +2010-05-13 Glenn Morris + + * Makefile.in (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD) + (LIB_MATH, FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS) + (FREETYPE_LIBS, LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS) + (M17N_FLT_LIBS, GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBGPM) + (LIBRESOLV, UNEXEC_OBJ): For clarity, define variables to hold + the values output be configure. + (ALL_CFLAGS, obj, LIBES, temacs${EXEEXT}): Use the above variables. + 2010-05-12 Glenn Morris * Makefile.in (YMF_PASS_LDFLAGS, LD, LINKER): Simplify the logic. === modified file 'src/Makefile.in' --- src/Makefile.in 2010-05-12 03:44:36 +0000 +++ src/Makefile.in 2010-05-13 02:50:20 +0000 @@ -72,19 +72,35 @@ C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ ## System-specific CFLAGS. C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ + +## Currently only set if NS_IMPL_GNUSTEP. +## C_SWITCH_X_SITE may override this. +C_SWITCH_X_SYSTEM=@C_SWITCH_X_SYSTEM@ + +## Define C_SWITCH_X_SITE to contain any special flags your compiler +## may need to deal with X Windows. For instance, if you've defined +## HAVE_X_WINDOWS and your X include files aren't in a place that your +## compiler can find on its own, you might want to add "-I/..." or +## something similar. This is normally set by configure. +## This is used before C_SWITCH_X_SYSTEM and may override it. +C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ + ## This holds any special options for linking temacs only (ie, not ## used by configure). Not used elsewhere because it sometimes ## contains options that have to do with using Emacs's crt0, ## which are only good with temacs. LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@ + ## Next two must come before LD_SWITCH_SYSTEM. ## If needed, a -R option that says where to find X windows at run time. LD_SWITCH_X_SITE_AUX=@LD_SWITCH_X_SITE_AUX@ ## As above, but using -rpath instead. LD_SWITCH_X_SITE_AUX_RPATH=@LD_SWITCH_X_SITE_AUX_RPATH@ + ## System-specific LDFLAGS. LD_SWITCH_SYSTEM=@LD_SWITCH_SYSTEM@ LD_SWITCH_SYSTEM_EXTRA=@LD_SWITCH_SYSTEM_EXTRA@ + ## Flags to pass to ld only for temacs. TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_EXTRA) $(LD_SWITCH_SYSTEM_TEMACS) @@ -94,6 +110,12 @@ ## Where to find libgcc.a, if using gcc and necessary. LIB_GCC=@LIB_GCC@ +## May use $CRT_DIR. +LIB_STANDARD=@LIB_STANDARD@ + +## -lm, or empty. +LIB_MATH=@LIB_MATH@ + LIBTIFF=@LIBTIFF@ LIBJPEG=@LIBJPEG@ LIBPNG=@LIBPNG@ @@ -102,6 +124,15 @@ XFT_LIBS=@XFT_LIBS@ LIBX_EXTRA=$(LIBTIFF) $(LIBJPEG) $(LIBPNG) $(LIBGIF) $(LIBXPM) -lX11 $(XFT_LIBS) +FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ +FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ +FREETYPE_LIBS = @FREETYPE_LIBS@ +LIBOTF_CFLAGS = @LIBOTF_CFLAGS@ +LIBOTF_LIBS = @LIBOTF_LIBS@ +M17N_FLT_CFLAGS = @M17N_FLT_CFLAGS@ +M17N_FLT_LIBS = @M17N_FLT_LIBS@ + DBUS_CFLAGS = @DBUS_CFLAGS@ DBUS_LIBS = @DBUS_LIBS@ DBUS_OBJ = @DBUS_OBJ@ @@ -145,6 +176,9 @@ NS_OBJ=@NS_OBJ@ NS_SUPPORT=@NS_SUPPORT@ +## Next two only set if NS_IMPL_GNUSTEP. +GNU_OBJC_CFLAGS=@GNU_OBJC_CFLAGS@ +GNUSTEP_SYSTEM_LIBRARIES=@GNUSTEP_SYSTEM_LIBRARIES@ ## Only used if HAVE_X_WINDOWS and HAVE_WINDOW_SYSTEM. FONT_OBJ=@FONT_OBJ@ @@ -152,6 +186,7 @@ ## ${lispsource}mouse.elc if HAVE_GPM, otherwise empty. ## Not used if HAVE_MOUSE. GPM_MOUSE_SUPPORT=@GPM_MOUSE_SUPPORT@ +LIBGPM = @LIBGPM@ BASE_WINDOW_SUPPORT=${lispsource}fringe.elc ${lispsource}image.elc \ ${lispsource}international/fontset.elc ${lispsource}dnd.elc \ @@ -160,6 +195,9 @@ X_WINDOW_SUPPORT=${lispsource}x-dnd.elc ${lispsource}term/common-win.elc \ ${lispsource}term/x-win.elc ${lispsource}dynamic-setting.elc +## -lresolv, or empty. +LIBRESOLV = @LIBRESOLV@ + LIBSELINUX_LIBS = @LIBSELINUX_LIBS@ INTERVALS_H = dispextern.h intervals.h composite.h @@ -170,6 +208,8 @@ START_FILES = @START_FILES@ +UNEXEC_OBJ = @unexec@ + # ========================== start of cpp stuff ======================= /* From here on, comments must be done in C syntax. */ @@ -227,10 +267,10 @@ the information in ``config.h''. */ /* C_SWITCH_X_SITE must come before C_SWITCH_X_SYSTEM - since it may have -I options that should override those two. */ + since it may have -I options that should override those. */ /* MYCPPFLAGS only referenced in etc/DEBUG. */ -ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} ${C_SWITCH_MACHINE} ${C_SWITCH_SYSTEM} @C_SWITCH_X_SITE@ @C_SWITCH_X_SYSTEM@ ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ ${DEPFLAGS} -ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@ +ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} ${C_SWITCH_MACHINE} ${C_SWITCH_SYSTEM} ${C_SWITCH_X_SITE} ${C_SWITCH_X_SYSTEM} ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} ${FREETYPE_CFLAGS} ${FONTCONFIG_CFLAGS} ${LIBOTF_CFLAGS} ${M17N_FLT_CFLAGS} ${DEPFLAGS} +ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS) .SUFFIXES: .m .c.o: @@ -334,7 +374,7 @@ cmds.o casetab.o casefiddle.o indent.o search.o regex.o undo.o \ alloc.o data.o doc.o editfns.o callint.o \ eval.o floatfns.o fns.o font.o print.o lread.o \ - syntax.o @unexec@ bytecode.o \ + syntax.o $(UNEXEC_OBJ) bytecode.o \ process.o callproc.o \ region-cache.o sound.o atimer.o \ doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \ @@ -634,10 +674,10 @@ with GCC, we might need gnulib again after them. */ LIBES = $(LOADLIBES) $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \ - $(RSVG_LIBS) $(DBUS_LIBS) @LIBGPM@ @LIBRESOLV@ $(LIBS_SYSTEM) \ + $(RSVG_LIBS) $(DBUS_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \ $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) ${GCONF_LIBS} ${LIBSELINUX_LIBS} \ - @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \ - $(GNULIB_VAR) @LIB_MATH@ @LIB_STANDARD@ $(GNULIB_VAR) + $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ + $(GNULIB_VAR) $(LIB_MATH) $(LIB_STANDARD) $(GNULIB_VAR) all: emacs${EXEEXT} $(OTHER_FILES) @@ -682,7 +722,7 @@ temacs${EXEEXT}: $(LOCALCPP) $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT} #ifdef NS_IMPL_GNUSTEP $(CC) -rdynamic YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \ - -L@GNUSTEP_SYSTEM_LIBRARIES@ -lgnustep-gui -lgnustep-base \ + -L$(GNUSTEP_SYSTEM_LIBRARIES) -lgnustep-gui -lgnustep-base \ -lobjc $(CONFIG_SYSTEM_LIBS) -lpthread ) -o temacs \ ${obj} ${otherobj} ${LIBES} #else ------------------------------------------------------------ revno: 100247 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2010-05-12 20:44:22 -0400 message: * progmodes/sh-script.el (sh-mode): Use define-derived-mode. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-05-13 00:35:07 +0000 +++ lisp/ChangeLog 2010-05-13 00:44:22 +0000 @@ -1,5 +1,7 @@ 2010-05-13 Stefan Monnier + * progmodes/sh-script.el (sh-mode): Use define-derived-mode. + * dos-fns.el: Add "dos-" prefix for namespace control. (convert-standard-filename): Define as alias for dos-convert-standard-filename but only if applicable. === modified file 'lisp/progmodes/sh-script.el' --- lisp/progmodes/sh-script.el 2010-02-28 21:34:58 +0000 +++ lisp/progmodes/sh-script.el 2010-05-13 00:44:22 +0000 @@ -1480,7 +1480,7 @@ ;; mode-command and utility functions ;;;###autoload -(defun sh-mode () +(define-derived-mode sh-mode prog-mode "Shell-script" "Major mode for editing shell scripts. This mode works for many shells, since they all have roughly the same syntax, as far as commands, arguments, variables, pipes, comments etc. are concerned. @@ -1533,11 +1533,6 @@ If your shell gives error messages with line numbers, you can use \\[executable-interpret] with your script for an edit-interpret-debug cycle." - (interactive) - (kill-all-local-variables) - (setq major-mode 'sh-mode - mode-name "Shell-script") - (use-local-map sh-mode-map) (make-local-variable 'skeleton-end-hook) (make-local-variable 'paragraph-start) (make-local-variable 'paragraph-separate) @@ -1613,8 +1608,7 @@ "sh") (t sh-shell-file)) - nil nil) - (run-mode-hooks 'sh-mode-hook)) + nil nil)) ;;;###autoload (defalias 'shell-script-mode 'sh-mode) ------------------------------------------------------------ revno: 100246 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2010-05-12 20:35:07 -0400 message: * dos-fns.el: Add "dos-" prefix for namespace control. (convert-standard-filename): Define as alias for dos-convert-standard-filename but only if applicable. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-05-12 11:06:12 +0000 +++ lisp/ChangeLog 2010-05-13 00:35:07 +0000 @@ -1,3 +1,9 @@ +2010-05-13 Stefan Monnier + + * dos-fns.el: Add "dos-" prefix for namespace control. + (convert-standard-filename): Define as alias for + dos-convert-standard-filename but only if applicable. + 2010-05-12 Alan Mackenzie * progmodes/cc-cmds.el (c-beginning-of-defun, c-end-of-defun): === modified file 'lisp/dos-fns.el' --- lisp/dos-fns.el 2010-01-13 08:35:10 +0000 +++ lisp/dos-fns.el 2010-05-13 00:35:07 +0000 @@ -31,7 +31,7 @@ (declare-function msdos-long-file-names "msdos.c") ;; This overrides a trivial definition in files.el. -(defun convert-standard-filename (filename) +(defun dos-convert-standard-filename (filename) "Convert a standard file's name to something suitable for the current OS. This means to guarantee valid names and perhaps to canonicalize certain patterns. @@ -48,7 +48,7 @@ (let ((flen (length filename))) ;; If FILENAME has a trailing slash, remove it and recurse. (if (memq (aref filename (1- flen)) '(?/ ?\\)) - (concat (convert-standard-filename + (concat (dos-convert-standard-filename (substring filename 0 (1- flen))) "/") (let* (;; ange-ftp gets in the way for names like "/foo:bar". @@ -122,12 +122,17 @@ (aset string (1- (length string)) lastchar)))) (concat (if (and (stringp dir) (memq (aref dir dlen-m-1) '(?/ ?\\))) - (concat (convert-standard-filename + (concat (dos-convert-standard-filename (substring dir 0 dlen-m-1)) "/") - (convert-standard-filename dir)) + (dos-convert-standard-filename dir)) string)))))) +;; Only redirect convert-standard-filename if it has a chance of working, +;; otherwise loading dos-fns.el might make your non-DOS Emacs misbehave. +(when (fboundp 'msdos-long-file-names) + (defalias 'convert-standard-filename 'dos-convert-standard-filename)) + (defun dos-8+3-filename (filename) "Truncate FILENAME to DOS 8+3 limits." (if (or (not (stringp filename)) @@ -188,12 +193,12 @@ ;; This is for the sake of standard file names elsewhere in Emacs that ;; are defined as constant strings or via defconst, and whose -;; conversion via `convert-standard-filename' does not give good +;; conversion via `dos-convert-standard-filename' does not give good ;; enough results. (defun dosified-file-name (file-name) "Return a variant of FILE-NAME that is valid on MS-DOS filesystems. -This function is for those rare cases where `convert-standard-filename' +This function is for those rare cases where `dos-convert-standard-filename' does not do a job that is good enough, e.g. if you need to preserve the file-name extension. It recognizes only certain specific file names that are used in Emacs Lisp sources; any other file name will be @@ -209,13 +214,13 @@ (defvar msdos-shells) ;; Override settings chosen at startup. -(defun set-default-process-coding-system () +(defun dos-set-default-process-coding-system () (setq default-process-coding-system (if (default-value 'enable-multibyte-characters) '(undecided-dos . undecided-dos) '(raw-text-dos . raw-text-dos)))) -(add-hook 'before-init-hook 'set-default-process-coding-system) +(add-hook 'before-init-hook 'dos-set-default-process-coding-system) ;; File names defined in preloaded packages can be incorrect or ;; invalid if long file names were available during dumping, but not @@ -232,17 +237,17 @@ (add-hook 'before-init-hook 'dos-reevaluate-defcustoms) -(defvar register-name-alist +(defvar dos-register-name-alist '((ax . 0) (bx . 1) (cx . 2) (dx . 3) (si . 4) (di . 5) (cflag . 6) (flags . 7) (al . (0 . 0)) (bl . (1 . 0)) (cl . (2 . 0)) (dl . (3 . 0)) (ah . (0 . 1)) (bh . (1 . 1)) (ch . (2 . 1)) (dh . (3 . 1)))) -(defun make-register () +(defun dos-make-register () (make-vector 8 0)) -(defun register-value (regs name) - (let ((where (cdr (assoc name register-name-alist)))) +(defun dos-register-value (regs name) + (let ((where (cdr (assoc name dos-register-name-alist)))) (cond ((consp where) (let ((tem (aref regs (car where)))) (if (zerop (cdr where)) @@ -252,10 +257,10 @@ (aref regs where)) (t nil)))) -(defun set-register-value (regs name value) +(defun dos-set-register-value (regs name value) (and (numberp value) (>= value 0) - (let ((where (cdr (assoc name register-name-alist)))) + (let ((where (cdr (assoc name dos-register-name-alist)))) (cond ((consp where) (let ((tem (aref regs (car where))) (value (logand value 255))) @@ -268,18 +273,18 @@ (aset regs where (logand value 65535)))))) regs) -(defsubst intdos (regs) +(defsubst dos-intdos (regs) (int86 33 regs)) ;; Backward compatibility for obsolescent functions which ;; set screen size. -(defun mode25 () +(defun dos-mode25 () "Changes the number of screen rows to 25." (interactive) (set-frame-size (selected-frame) 80 25)) -(defun mode4350 () +(defun dos-mode4350 () "Changes the number of rows to 43 or 50. Emacs always tries to set the screen height to 50 rows first. If this fails, it will try to set it to 43 rows, on the assumption ------------------------------------------------------------ revno: 100245 [merge] committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2010-05-12 14:10:21 +0000 message: Synch with Gnus trunk. (gnus-summary-read-group-1): Don't jump to next group when catching the `C-g'. Reported by: "Leo" By Andreas Seltenreich. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-05-12 08:24:25 +0000 +++ lisp/gnus/ChangeLog 2010-05-12 14:09:25 +0000 @@ -1,3 +1,8 @@ +2010-05-12 Andreas Seltenreich + + * gnus-sum.el (gnus-summary-read-group-1): Don't jump to next group + when catching the `C-g'. Reported by: "Leo" + 2010-05-12 Katsumi Yamaoka * message.el (message-forward-make-body-plain) === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2010-05-11 06:04:22 +0000 +++ lisp/gnus/gnus-sum.el 2010-05-12 14:09:25 +0000 @@ -3931,7 +3931,6 @@ (progn (set-buffer gnus-group-buffer) (gnus-group-jump-to-group group) - (gnus-group-next-unread-group 1) (gnus-configure-windows 'group 'force)) (gnus-handle-ephemeral-exit quit-config)) ;; Finally signal the quit. ------------------------------------------------------------ revno: 100244 committer: Alan Mackenzie branch nick: trunk timestamp: Wed 2010-05-12 11:06:12 +0000 message: * progmodes/cc-cmds.el (c-beginning-of-defun, c-end-of-defun): Push the mark at the start of these functions when appropriate. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-05-12 00:39:46 +0000 +++ lisp/ChangeLog 2010-05-12 11:06:12 +0000 @@ -1,3 +1,8 @@ +2010-05-12 Alan Mackenzie + + * progmodes/cc-cmds.el (c-beginning-of-defun, c-end-of-defun): + Push the mark at the start of these functions when appropriate. + 2010-05-12 Stefan Monnier * minibuffer.el (completion-cycle-threshold): New custom var. === modified file 'lisp/progmodes/cc-cmds.el' --- lisp/progmodes/cc-cmds.el 2010-04-19 15:07:52 +0000 +++ lisp/progmodes/cc-cmds.el 2010-05-12 11:06:12 +0000 @@ -1501,6 +1501,11 @@ (interactive "p") (or arg (setq arg 1)) + (or (not (eq this-command 'c-beginning-of-defun)) + (eq last-command 'c-beginning-of-defun) + (and transient-mark-mode mark-active) + (push-mark)) + (c-save-buffer-state (beginning-of-defun-function end-of-defun-function (start (point)) @@ -1604,6 +1609,11 @@ (interactive "p") (or arg (setq arg 1)) + (or (not (eq this-command 'c-end-of-defun)) + (eq last-command 'c-end-of-defun) + (and transient-mark-mode mark-active) + (push-mark)) + (c-save-buffer-state (beginning-of-defun-function end-of-defun-function (start (point)) ------------------------------------------------------------ revno: 100243 [merge] committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2010-05-12 08:25:16 +0000 message: Synch with Gnus trunk. (message-forward-make-body-plain, message-forward-make-body-mml): Use mm-multibyte-string-p instead of multibyte-string-p. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-05-12 02:09:58 +0000 +++ lisp/gnus/ChangeLog 2010-05-12 08:24:25 +0000 @@ -1,5 +1,11 @@ 2010-05-12 Katsumi Yamaoka + * message.el (message-forward-make-body-plain) + (message-forward-make-body-mml): Use mm-multibyte-string-p instead of + multibyte-string-p. + +2010-05-12 Katsumi Yamaoka + * message.el (message-forward-make-body-mml): Assume original message is multibyte string; error on unibyte. (message-forward-make-body-plain): Ditto; don't add excessive newline === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2010-05-12 02:09:58 +0000 +++ lisp/gnus/message.el 2010-05-12 08:24:25 +0000 @@ -7165,7 +7165,7 @@ (contents (with-current-buffer forward-buffer (buffer-string))) e) (unless (featurep 'xemacs) - (unless (multibyte-string-p contents) + (unless (mm-multibyte-string-p contents) (error "Attempt to insert unibyte string from the buffer \"%s\"\ to the multibyte buffer \"%s\"" (if (bufferp forward-buffer) @@ -7220,7 +7220,7 @@ (if (not message-forward-decoded-p) (let ((contents (with-current-buffer forward-buffer (buffer-string)))) (unless (featurep 'xemacs) - (unless (multibyte-string-p contents) + (unless (mm-multibyte-string-p contents) (error "Attempt to insert unibyte string from the buffer \"%s\"\ to the multibyte buffer \"%s\"" (if (bufferp forward-buffer) ------------------------------------------------------------ revno: 100242 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-05-11 23:53:03 -0700 message: Reformat some comments in src/s/*.h. diff: === modified file 'src/s/aix4-2.h' --- src/s/aix4-2.h 2010-05-10 02:16:09 +0000 +++ src/s/aix4-2.h 2010-05-12 06:53:03 +0000 @@ -17,68 +17,48 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ -/* - * Define symbols to identify the version of Unix this is. - * Define all the symbols that apply correctly. - */ - +/* Define symbols to identify the version of Unix this is. + Define all the symbols that apply correctly. */ #define USG /* System III, System V, etc */ #define USG5 -/* This symbol should be defined on AIX Version 3 ??????? */ +/* This symbol should be defined on AIX Version 3 ??????? */ #ifndef _AIX #define _AIX #endif /* SYSTEM_TYPE should indicate the kind of system you are using. It sets the Lisp variable system-type. */ - #define SYSTEM_TYPE "aix" /* In AIX, you allocate a pty by opening /dev/ptc to get the master side. To get the name of the slave side, you just ttyname() the master side. */ - #define PTY_ITERATION for (c = 0; !c ; c++) #define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptc"); #define PTY_TTY_NAME_SPRINTF strcpy (pty_name, ttyname (fd)); -/* - * Define HAVE_TERMIO if the system provides sysV-style ioctls - * for terminal control. - */ - +/* Define HAVE_TERMIO if the system provides sysV-style ioctls + for terminal control. */ #define HAVE_TERMIOS -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - +/* Define HAVE_PTYS if the system supports pty devices. */ #define HAVE_PTYS /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */ - #define HAVE_SOCKETS -/* - * Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir - * library functions. Almost, but not quite the same as - * the 4.2 functions - */ - +/* Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir library + functions. Almost, but not quite the same as the 4.2 functions. */ #define SYSV_SYSTEM_DIR -/* Define this symbol if your system has the functions bcopy, etc. */ - +/* Define this symbol if your system has the functions bcopy, etc. */ #define BSTRING /* The file containing the kernel's symbol table is called /unix. */ - #define KERNEL_FILE "/unix" -/* The symbol in the kernel where the load average is found - is named avenrun. */ - +/* The kernel symbol where the load average is found is named avenrun. */ #define LDAV_SYMBOL "avenrun" /* Special itemss needed to make Emacs run on this system. */ @@ -125,8 +105,7 @@ that shared library. Emacs currently calls xrealloc on the results of get_current_dir name, - to avoid a crash just use the Emacs implementation for that function. -*/ + to avoid a crash just use the Emacs implementation for that function. */ #define BROKEN_GET_CURRENT_DIR_NAME 1 #define UNEXEC unexaix.o === modified file 'src/s/bsd-common.h' --- src/s/bsd-common.h 2010-05-10 00:07:47 +0000 +++ src/s/bsd-common.h 2010-05-12 06:53:03 +0000 @@ -19,8 +19,8 @@ along with GNU Emacs. If not, see . */ -/* Define symbols to identify the version of Unix this is. - * Define all the symbols that apply correctly. */ +/* Define symbols to identify the version of Unix this is. + Define all the symbols that apply correctly. */ /* We give these symbols the numeric values found in to avoid warnings about redefined macros. */ @@ -84,8 +84,7 @@ /* The file containing the kernel's symbol table is called /vmunix. */ #define KERNEL_FILE "/vmunix" -/* The symbol in the kernel where the load average is found - is named _avenrun. */ +/* The kernel symbol where the load average is found is named _avenrun. */ #define LDAV_SYMBOL "_avenrun" /* Send signals to subprocesses by "typing" special chars at them. */ === modified file 'src/s/cygwin.h' --- src/s/cygwin.h 2010-05-12 03:01:16 +0000 +++ src/s/cygwin.h 2010-05-12 06:53:03 +0000 @@ -1,6 +1,7 @@ /* System description header file for Cygwin. - Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + +Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004, 2005, 2006, + 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -19,7 +20,6 @@ /* SYSTEM_TYPE should indicate the kind of system you are using. It sets the Lisp variable system-type. */ - #define SYSTEM_TYPE "cygwin" /* Emacs can read input using SIGIO and buffering characters itself, @@ -43,26 +43,19 @@ It would have Emacs fork off a separate process to read the input and send it to the true Emacs process through a pipe. */ - #undef INTERRUPT_INPUT -/* - * Define HAVE_TERMIOS if the system provides POSIX-style - * functions and macros for terminal control. - * - * Define HAVE_TERMIO if the system provides sysV-style ioctls - * for terminal control. - * - * Do not define both. HAVE_TERMIOS is preferred, if it is - * supported on your system. - */ - +/* Define HAVE_TERMIOS if the system provides POSIX-style + functions and macros for terminal control. + + Define HAVE_TERMIO if the system provides sysV-style ioctls + for terminal control. + + Do not define both. HAVE_TERMIOS is preferred, if it is + supported on your system. */ #define HAVE_TERMIOS -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - +/* Define HAVE_PTYS if the system supports pty devices. */ #define HAVE_PTYS #define PTY_ITERATION for (i = 0; i < 1; i++) /* ick */ #define PTY_NAME_SPRINTF /* none */ @@ -81,13 +74,11 @@ while (0) /* Define this symbol if your system has the functions bcopy, etc. */ - #define BSTRING /* Define CLASH_DETECTION if you want lock files to be written so that Emacs can tell instantly when you try to modify a file that someone else has modified in his Emacs. */ - #define CLASH_DETECTION /* If the system's imake configuration file defines `NeedWidePrototypes' @@ -95,10 +86,9 @@ generated in the Makefile generated by `xmkmf'. If we don't define NARROWPROTO, we will see the wrong function prototypes for X functions taking float or double parameters. */ - #define NARROWPROTO 1 -/* used in various places to enable cygwin-specific code changes */ +/* Used in various places to enable cygwin-specific code changes. */ #define CYGWIN 1 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) @@ -127,7 +117,5 @@ returns ENOSYS. A workaround is to set G_SLICE=always-malloc. */ #define G_SLICE_ALWAYS_MALLOC -/* the end */ - /* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b (do not change this comment) */ === modified file 'src/s/darwin.h' --- src/s/darwin.h 2010-05-10 00:07:47 +0000 +++ src/s/darwin.h 2010-05-12 06:53:03 +0000 @@ -19,9 +19,8 @@ along with GNU Emacs. If not, see . */ -/* Define symbols to identify the version of Unix this is. - * Define all the symbols that apply correctly. */ - +/* Define symbols to identify the version of Unix this is. + Define all the symbols that apply correctly. */ #define BSD4_2 /* BSD4_3 and BSD4_4 are already defined in sys/param.h */ #define BSD_SYSTEM @@ -29,12 +28,12 @@ /* More specific than the above two. We cannot use __APPLE__ as this may not be defined on non-OSX Darwin, and we cannot define DARWIN here because Panther and lower CoreFoundation.h uses DARWIN to - distinguish OS X from pure Darwin. */ + distinguish OS X from pure Darwin. */ #define DARWIN_OS /* SYSTEM_TYPE should indicate the kind of system you are using. - It sets the Lisp variable system-type. */ + It sets the Lisp variable system-type. */ #define SYSTEM_TYPE "darwin" /* Emacs can read input using SIGIO and buffering characters itself, @@ -64,26 +63,21 @@ if system supports pty's. 'a' means it is /dev/ptya0 */ #define FIRST_PTY_LETTER 'p' -/* - * Define HAVE_TERMIOS if the system provides POSIX-style - * functions and macros for terminal control. - * - * Define HAVE_TERMIO if the system provides sysV-style ioctls - * for terminal control. - * - * Do not define both. HAVE_TERMIOS is preferred, if it is - * supported on your system. - */ +/* Define HAVE_TERMIOS if the system provides POSIX-style + functions and macros for terminal control. + + Define HAVE_TERMIO if the system provides sysV-style ioctls + for terminal control. + + Do not define both. HAVE_TERMIOS is preferred, if it is supported + on your system. */ #define HAVE_TERMIOS #define NO_TERMIO -/* - * Define HAVE_PTYS if the system supports pty devices. - * Note: PTYs are broken on darwin <6. Use at your own risk. - */ +/* Define HAVE_PTYS if the system supports pty devices. + Note: PTYs are broken on darwin <6. Use at your own risk. */ #define HAVE_PTYS -/* Run only once. We need a `for'-loop because the code uses - `continue'. */ +/* Run only once. We need a `for'-loop because the code uses `continue'. */ #define PTY_ITERATION for (i = 0; i < 1; i++) #define PTY_NAME_SPRINTF /* none */ #define PTY_TTY_NAME_SPRINTF /* none */ @@ -101,11 +95,8 @@ } \ while (0) -/** - * PTYs only work correctly on Darwin 7 or higher. So make the - * default for process-connection-type dependent on the kernel - * version. - */ +/* PTYs only work correctly on Darwin 7 or higher. So make the default + for process-connection-type dependent on the kernel version. */ #define MIN_PTY_KERNEL_VERSION '7' /* Define this symbol if your system has the functions bcopy, etc. */ @@ -123,12 +114,10 @@ /* Used in dispnew.c. Copied from freebsd.h. */ #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) -/* System uses OXTABS instead of the expected TAB3. (Copied from - bsd386.h.) */ +/* System uses OXTABS instead of the expected TAB3. (Copied from bsd386.h.) */ #define TAB3 OXTABS -/* Darwin ld insists on the use of malloc routines in the System - framework. */ +/* Darwin ld insists on the use of malloc routines in the System framework. */ #define SYSTEM_MALLOC /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */ @@ -154,8 +143,7 @@ #define malloc unexec_malloc #define realloc unexec_realloc #define free unexec_free -/* Don't use posix_memalign because it is not compatible with - unexmacosx.c. */ +/* Don't use posix_memalign because it is not compatible with unexmacosx.c. */ #undef HAVE_POSIX_MEMALIGN #endif @@ -183,8 +171,7 @@ ioctl TIOCSCTTY. */ #define DONT_REOPEN_PTY -/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the - stack. */ +/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack. */ #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS /* arch-tag: 481d443d-4f89-43ea-b5fb-49706d95fa41 === modified file 'src/s/freebsd.h' --- src/s/freebsd.h 2010-05-12 03:01:16 +0000 +++ src/s/freebsd.h 2010-05-12 06:53:03 +0000 @@ -33,7 +33,7 @@ #define HAVE_GETLOADAVG 1 #define DECLARE_GETPWUID_WITH_UID_T -/* this silences a few compilation warnings */ +/* This silences a few compilation warnings. */ #undef BSD_SYSTEM #if __FreeBSD__ == 1 #define BSD_SYSTEM 199103 @@ -61,23 +61,17 @@ successfully after processing (for example with CRs added if the terminal is set up that way which it is here). The same bytes will be seen again in a later read(2), without the CRs. */ - #define BROKEN_PTY_READ_AFTER_EAGAIN 1 /* Tell that garbage collector that setjmp is known to save all - registers relevant for conservative garbage collection in the - jmp_buf. */ - + registers relevant for conservative garbage collection in the jmp_buf. */ #define GC_SETJMP_WORKS 1 -/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the - stack. */ - +/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack. */ #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS /* Define USE_MMAP_FOR_BUFFERS to let Emacs use mmap(2) to allocate buffer text. This overrides REL_ALLOC. */ - #define USE_MMAP_FOR_BUFFERS 1 /* arch-tag: 426529ca-b7c4-448f-b10a-d4dcdc9c78eb === modified file 'src/s/gnu-linux.h' --- src/s/gnu-linux.h 2010-05-12 03:01:16 +0000 +++ src/s/gnu-linux.h 2010-05-12 06:53:03 +0000 @@ -3,6 +3,8 @@ Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +This file was put together by Michael K. Johnson and Rik Faith. + This file is part of GNU Emacs. GNU Emacs is free software: you can redistribute it and/or modify @@ -18,20 +20,13 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ -/* This file was put together by Michael K. Johnson and Rik Faith. */ - - -/* - * Define symbols to identify the version of Unix this is. - * Define all the symbols that apply correctly. - */ - +/* Define symbols to identify the version of Unix this is. + Define all the symbols that apply correctly. */ #define USG #define GNU_LINUX /* SYSTEM_TYPE should indicate the kind of system you are using. - It sets the Lisp variable system-type. */ - + It sets the Lisp variable system-type. */ #define SYSTEM_TYPE "gnu/linux" /* All the best software is free. */ #ifndef NOT_C_CODE @@ -50,9 +45,7 @@ #if defined HAVE_GRANTPT #define UNIX98_PTYS -/* Run only once. We need a `for'-loop because the code uses - `continue'. */ - +/* Run only once. We need a `for'-loop because the code uses `continue'. */ #define PTY_ITERATION for (i = 0; i < 1; i++) #ifdef HAVE_GETPT @@ -64,7 +57,6 @@ /* Note that grantpt and unlockpt may fork. We must block SIGCHLD to prevent sigchld_handler from intercepting the child's death. */ - #define PTY_TTY_NAME_SPRINTF \ { \ char *ptyname; \ @@ -86,23 +78,20 @@ /* Letter to use in finding device name of first pty, if system supports pty's. 'p' means it is /dev/ptyp0 */ - #define FIRST_PTY_LETTER 'p' #endif /* not HAVE_GRANTPT */ /* Define HAVE_TERMIOS if the system provides POSIX-style functions and macros for terminal control. */ - #define HAVE_TERMIOS -/* Define HAVE_PTYS if the system supports pty devices. */ - +/* Define HAVE_PTYS if the system supports pty devices. */ #define HAVE_PTYS #define HAVE_SOCKETS -/* Define this symbol if your system has the functions bcopy, etc. */ +/* Define this symbol if your system has the functions bcopy, etc. */ #define BSTRING /* This is used in list_system_processes. */ @@ -121,20 +110,19 @@ your system and must be used only through an encapsulation (Which you should place, by convention, in sysdep.c). */ -/* This is needed for dispnew.c:update_frame */ - +/* This is needed for dispnew.c:update_frame. */ #ifdef emacs #include /* Get the definition of _IO_STDIO_H. */ #if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM) -/* new C libio names */ +/* New C libio names. */ #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \ ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base) #elif defined (__UCLIBC__) -/* using the uClibc library */ +/* Using the uClibc library. */ #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \ ((FILE)->__bufpos - (FILE)->__bufstart) #else /* !_IO_STDIO_H && ! __UCLIBC__ */ -/* old C++ iostream names */ +/* Old C++ iostream names. */ #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \ ((FILE)->_pptr - (FILE)->_pbase) #endif /* !_IO_STDIO_H && ! __UCLIBC__ */ @@ -165,8 +153,7 @@ #endif /* Tell that garbage collector that setjmp is known to save all - registers relevant for conservative garbage collection in the - jmp_buf. */ + registers relevant for conservative garbage collection in the jmp_buf. */ /* Not all the architectures are tested, but there are Debian packages for SCM and/or Guile on them, so the technique must work. See also comments in alloc.c concerning setjmp and gcc. Fixme: it's @@ -174,7 +161,6 @@ register window-flushing. */ /* Don't use #cpu here since in newest development versions of GCC, we must call cpp with -traditional, and that disables #cpu. */ - #if defined __i386__ || defined __sparc__ || defined __mc68000__ \ || defined __alpha__ || defined __mips__ || defined __s390__ \ || defined __arm__ || defined __powerpc__ || defined __amd64__ \ === modified file 'src/s/hpux10-20.h' --- src/s/hpux10-20.h 2010-05-10 02:16:09 +0000 +++ src/s/hpux10-20.h 2010-05-12 06:53:03 +0000 @@ -21,56 +21,39 @@ #define RUN_TIME_REMAP -/* - * Define symbols to identify the version of Unix this is. - * Define all the symbols that apply correctly. - */ - +/* Define symbols to identify the version of Unix this is. + Define all the symbols that apply correctly. */ #define USG /* System III, System V, etc */ - #define USG5 - #define HPUX /* SYSTEM_TYPE should indicate the kind of system you are using. - It sets the Lisp variable system-type. */ - + It sets the Lisp variable system-type. */ #define SYSTEM_TYPE "hpux" /* Letter to use in finding device name of first pty, - if system supports pty's. 'p' means it is /dev/ptym/ptyp0 */ - + if system supports pty's. 'p' means it is /dev/ptym/ptyp0 */ #define FIRST_PTY_LETTER 'p' -/* - * Define HAVE_TERMIO if the system provides sysV-style ioctls - * for terminal control. - */ - +/* Define HAVE_TERMIO if the system provides sysV-style ioctls + for terminal control. */ #define HAVE_TERMIO -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - +/* Define HAVE_PTYS if the system supports pty devices. */ #define HAVE_PTYS /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */ - #define HAVE_SOCKETS /* Define this symbol if your system has the functions bcopy, etc. - * s800 and later versions of s300 (s200) kernels have equivalents - * of the BSTRING functions of BSD. If your s200 kernel doesn't have - * em comment out this section. - */ - + s800 and later versions of s300 (s200) kernels have equivalents + of the BSTRING functions of BSD. If your s200 kernel doesn't have + em comment out this section. */ #define BSTRING /* Define CLASH_DETECTION if you want lock files to be written so that Emacs can tell instantly when you try to modify a file that someone else has modified in his Emacs. */ - #define CLASH_DETECTION /* The symbol in the kernel where the load average is found @@ -80,11 +63,9 @@ /* In hpux, the symbol SIGIO is defined, but the feature doesn't work in the way Emacs needs it to. */ - #define BROKEN_SIGIO /* Some additional system facilities exist. */ - #define HAVE_PERROR /* Delete this line for version 6. */ #define UNEXEC unexhp9k800.o @@ -112,7 +93,7 @@ version number A.09.05. You can fix the math library by installing patch number PHSS_4630. - But we can fix it more reliably for Emacs like this. */ + But we can fix it more reliably for Emacs like this. */ #undef HAVE_RINT /* We have to go this route, rather than hpux9's approach of renaming the @@ -129,8 +110,7 @@ /* Rainer Malzbender says definining - HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 - using GCC. */ + HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC. */ #ifndef HAVE_XRMSETDATABASE #define HAVE_XRMSETDATABASE #endif @@ -145,7 +125,6 @@ to change the boundary between the text section and data section when Emacs is dumped. If you define this, the preloaded Lisp code will not be sharable; but that's better than failing completely. */ - #define NO_REMAP /* Define VIRT_ADDR_VARIES if the virtual addresses of @@ -154,35 +133,29 @@ Otherwise Emacs assumes that text space precedes data space, numerically. */ - #define VIRT_ADDR_VARIES -/* the data segment on this machine always starts at address 0x40000000. */ - +/* The data segment on this machine always starts at address 0x40000000. */ #define DATA_SEG_BITS 0x40000000 #define DATA_START 0x40000000 #define TEXT_START 0x00000000 /* Data type of load average, as read out of kmem. */ - #define LOAD_AVE_TYPE double /* Convert that into an integer that is 100 for a load average of 1.0 */ - #define LOAD_AVE_CVT(x) ((int) (x * 100.0)) -/* The symbol in the kernel where the load average is found - is named _avenrun. At this time there are two major flavors - of hp-ux (there is the s800 and s300 (s200) flavors). The - differences are thusly moved to the corresponding machine description file. -*/ +/* The kernel symbol where the load average is found is named _avenrun. + At this time there are two major flavors of hp-ux (there is the s800 + and s300 (s200) flavors). The differences are thusly moved to the + corresponding machine description file. */ -/* no underscore please */ +/* No underscore please. */ #define LDAV_SYMBOL "avenrun" -/* On USG systems these have different names. */ - +/* On USG systems these have different names. */ #define index strchr #define rindex strrchr === modified file 'src/s/irix6-5.h' --- src/s/irix6-5.h 2010-05-10 00:07:47 +0000 +++ src/s/irix6-5.h 2010-05-12 06:53:03 +0000 @@ -41,7 +41,7 @@ #define SIGNALS_VIA_CHARACTERS /* Letter to use in finding device name of first pty, - if system supports pty's. 'a' means it is /dev/ptya0 */ + if system supports pty's. 'a' means it is /dev/ptya0 */ #undef FIRST_PTY_LETTER #define FIRST_PTY_LETTER 'q' === modified file 'src/s/ms-w32.h' --- src/s/ms-w32.h 2010-05-10 00:07:47 +0000 +++ src/s/ms-w32.h 2010-05-12 06:53:03 +0000 @@ -18,10 +18,8 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ -/* - * Define symbols to identify the version of Unix this is. - * Define all the symbols that apply correctly. - */ +/* Define symbols to identify the version of Unix this is. + Define all the symbols that apply correctly. */ #ifndef WINDOWSNT #define WINDOWSNT @@ -31,63 +29,53 @@ #endif /* If you are compiling with a non-C calling convention but need to - declare vararg routines differently, put it here */ + declare vararg routines differently, put it here. */ #define _VARARGS_ __cdecl /* If you are providing a function to something that will call the function back (like a signal handler and signal, or main) its calling - convention must be whatever standard the libraries expect */ + convention must be whatever standard the libraries expect. */ #define _CALLBACK_ __cdecl /* SYSTEM_TYPE should indicate the kind of system you are using. - It sets the Lisp variable system-type. */ - + It sets the Lisp variable system-type. */ #define SYSTEM_TYPE "windows-nt" #define SYMS_SYSTEM syms_of_ntterm () #define NO_MATHERR 1 /* Letter to use in finding device name of first pty, - if system supports pty's. 'a' means it is /dev/ptya0 */ - + if system supports pty's. 'a' means it is /dev/ptya0 */ #define FIRST_PTY_LETTER 'a' -/* - * Define HAVE_TIMEVAL if the system supports the BSD style clock values. - * Look in for a timeval structure. - */ - +/* Define HAVE_TIMEVAL if the system supports the BSD style clock values. + Look in for a timeval structure. */ #define HAVE_TIMEVAL 1 -/* NT supports Winsock which is close enough (with some hacks) */ - +/* NT supports Winsock which is close enough (with some hacks). */ #define HAVE_SOCKETS 1 /* But our select implementation doesn't allow us to make non-blocking connects. So until that is fixed, this is necessary: */ - #define BROKEN_NON_BLOCKING_CONNECT 1 /* And the select implementation does 1-byte read-ahead waiting for received packets, so datagrams are broken too. */ - #define BROKEN_DATAGRAM_SOCKETS 1 -/* Define this symbol if your system has the functions bcopy, etc. */ - +/* Define this symbol if your system has the functions bcopy, etc. */ #define BSTRING #define bzero(b, l) memset(b, 0, l) #define bcopy(s, d, l) memmove(d, s, l) #define bcmp(a, b, l) memcmp(a, b, l) -/* bcopy (aka memmove aka memcpy at least on x86) under MSVC is quite safe */ +/* bcopy (aka memmove aka memcpy at least on x86) under MSVC is quite safe. */ #define GAP_USE_BCOPY 1 #define BCOPY_UPWARD_SAFE 1 #define BCOPY_DOWNWARD_SAFE 1 /* If your system uses COFF (Common Object File Format) then define the - preprocessor symbol "COFF". */ - + preprocessor symbol "COFF". */ #define COFF 1 #define MAIL_USE_POP 1 @@ -101,17 +89,16 @@ /* ============================================================ */ -/* Here, add any special hacks needed - to make Emacs work on this system. For example, - you might define certain system call names that don't - exist on your system, or that do different things on - your system and must be used only through an encapsulation - (Which you should place, by convention, in sysdep.c). */ +/* Here, add any special hacks needed to make Emacs work on this + system. For example, you might define certain system call names + that don't exist on your system, or that do different things on + your system and must be used only through an encapsulation (which + you should place, by convention, in sysdep.c). */ -/* Define this to be the separator between path elements */ +/* Define this to be the separator between path elements. */ #define DIRECTORY_SEP XINT (Vdirectory_sep_char) -/* Define this to be the separator between devices and paths */ +/* Define this to be the separator between devices and paths. */ #define DEVICE_SEP ':' /* We'll support either convention on NT. */ @@ -128,7 +115,7 @@ #define SIG_SETMASK 2 #define SIG_UNBLOCK 3 -/* The null device on Windows NT. */ +/* The null device on Windows NT. */ #define NULL_DEVICE "NUL:" #ifndef MAXPATHLEN @@ -218,11 +205,11 @@ #define MODE_LINE_BINARY_TEXT(_b_) (NILP ((_b_)->buffer_file_type) ? "T" : "B") -/* get some redefinitions in place */ +/* Get some redefinitions in place. */ #ifdef emacs -/* calls that are emulated or shadowed */ +/* Calls that are emulated or shadowed. */ #undef access #define access sys_access #undef chdir @@ -259,17 +246,17 @@ #undef write #define write sys_write -/* subprocess calls that are emulated */ +/* Subprocess calls that are emulated. */ #define spawnve sys_spawnve #define wait sys_wait #define kill sys_kill #define signal sys_signal -/* termcap.c calls that are emulated */ +/* termcap.c calls that are emulated. */ #define tputs sys_tputs #define tgetstr sys_tgetstr -/* cm.c calls that are emulated */ +/* cm.c calls that are emulated. */ #define chcheckmagic sys_chcheckmagic #define cmcostinit sys_cmcostinit #define cmgoto sys_cmgoto @@ -278,7 +265,7 @@ #endif /* emacs */ -/* map to MSVC names */ +/* Map to MSVC names. */ #define execlp _execlp #define execvp _execvp #define fdopen _fdopen @@ -312,8 +299,8 @@ #define utime _utime #endif -/* this is hacky, but is necessary to avoid warnings about macro - redefinitions using the SDK compilers */ +/* This is hacky, but is necessary to avoid warnings about macro + redefinitions using the SDK compilers. */ #ifndef __STDC__ #define __STDC__ 1 #define MUST_UNDEF__STDC__ @@ -326,7 +313,7 @@ #undef MUST_UNDEF__STDC__ #endif -/* Defines that we need that aren't in the standard signal.h */ +/* Defines that we need that aren't in the standard signal.h. */ #define SIGHUP 1 /* Hang up */ #define SIGQUIT 3 /* Quit process */ #define SIGTRAP 5 /* Trace trap */ @@ -369,8 +356,7 @@ #include -/* Define for those source files that do not include enough NT - system files. */ +/* Define for those source files that do not include enough NT system files. */ #ifndef NULL #ifdef __cplusplus #define NULL 0 @@ -405,7 +391,7 @@ removed. Also, obviously, all files that define initialized data must include config.h to pick up this pragma. */ -/* Names must be < 8 bytes */ +/* Names must be < 8 bytes. */ #ifdef _MSC_VER #pragma data_seg("EMDATA") #pragma bss_seg("EMBSS") === modified file 'src/s/msdos.h' --- src/s/msdos.h 2010-05-12 03:01:16 +0000 +++ src/s/msdos.h 2010-05-12 06:53:03 +0000 @@ -21,11 +21,8 @@ /* Note: lots of stuff here was taken from s-msdos.h in demacs. */ -/* - * Define symbols to identify the version of Unix this is. - * Define all the symbols that apply correctly. - */ - +/* Define symbols to identify the version of Unix this is. + Define all the symbols that apply correctly. */ #ifndef MSDOS #define MSDOS #endif @@ -38,40 +35,34 @@ #undef BSD_SYSTEM /* SYSTEM_TYPE should indicate the kind of system you are using. - It sets the Lisp variable system-type. */ - + It sets the Lisp variable system-type. */ #define SYSTEM_TYPE "ms-dos" #define SYMS_SYSTEM syms_of_dosfns();syms_of_msdos();syms_of_win16select() #define SYSV_SYSTEM_DIR -/* Define this symbol if your system has the functions bcopy, etc. */ - +/* Define this symbol if your system has the functions bcopy, etc. */ #define BSTRING /* Define this is the compiler understands `volatile'. */ #define HAVE_VOLATILE -/* subprocesses should be defined if you want to - have code for asynchronous subprocesses - (as used in M-x compile and M-x shell). +/* subprocesses should be defined if you want to have code for + asynchronous subprocesses (as used in M-x compile and M-x shell). This is the only system that needs this. */ - #undef subprocesses /* If your system uses COFF (Common Object File Format) then define the - preprocessor symbol "COFF". */ - + preprocessor symbol "COFF". */ #define COFF -/* Here, on a separate page, add any special hacks needed - to make Emacs work on this system. For example, - you might define certain system call names that don't - exist on your system, or that do different things on - your system and must be used only through an encapsulation - (Which you should place, by convention, in sysdep.c). */ +/* Here, on a separate page, add any special hacks needed to make + Emacs work on this system. For example, you might define certain + system call names that don't exist on your system, or that do + different things on your system and must be used only through an + encapsulation (which you should place, by convention, in sysdep.c). */ /* Avoid incompatibilities between gmalloc.c and system header files in how to declare valloc. */ @@ -83,7 +74,6 @@ /* setjmp and longjmp can safely replace _setjmp and _longjmp, but they will run slower. */ - #define _setjmp setjmp #define _longjmp longjmp @@ -109,17 +99,17 @@ :AB=:AF=:op=:" /* Define this to a function (Fdowncase, Fupcase) if your file system - likes that */ + likes that. */ #define FILE_SYSTEM_CASE Fmsdos_downcase_filename -/* Define this to be the separator between devices and paths */ +/* Define this to be the separator between devices and paths. */ #define DEVICE_SEP ':' /* We'll support either convention on MSDOG. */ #define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\') #define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_)) -/* bcopy under djgpp is quite safe */ +/* bcopy under djgpp is quite safe. */ #define GAP_USE_BCOPY #define BCOPY_UPWARD_SAFE 1 #define BCOPY_DOWNWARD_SAFE 1 @@ -153,9 +143,7 @@ #endif /* Tell the garbage collector that setjmp is known to save all - registers relevant for conservative garbage collection in the - jmp_buf. */ - + registers relevant for conservative garbage collection in the jmp_buf. */ #define GC_SETJMP_WORKS 1 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS === modified file 'src/s/netbsd.h' --- src/s/netbsd.h 2010-05-12 03:01:16 +0000 +++ src/s/netbsd.h 2010-05-12 06:53:03 +0000 @@ -19,7 +19,7 @@ along with GNU Emacs. If not, see . */ -/* Get most of the stuff from bsd-common */ +/* Get most of the stuff from bsd-common. */ #include "bsd-common.h" #define HAVE_GETLOADAVG 1 @@ -30,9 +30,8 @@ /* On post 1.3 releases of NetBSD, gcc -nostdlib also clears the library search parth, i.e. it won't search /usr/lib - for libc and friends. Using -nostartfiles instead avoids - this problem, and will also work on earlier NetBSD releases */ - + for libc and friends. Using -nostartfiles instead avoids + this problem, and will also work on earlier NetBSD releases. */ #define LINKER $(CC) -nostartfiles #define DEFAULT_SOUND_DEVICE "/dev/audio" @@ -40,7 +39,6 @@ /* Greg A. Woods says we must include signal.h before syssignal.h is included, to work around interface conflicts that are handled with CPP __RENAME() macro in signal.h. */ - #ifndef NOT_C_CODE #include #endif @@ -48,17 +46,13 @@ /* Don't close pty in process.c to make it as controlling terminal. It is already a controlling terminal of subprocess, because we did ioctl TIOCSCTTY. */ - #define DONT_REOPEN_PTY /* Tell that garbage collector that setjmp is known to save all - registers relevant for conservative garbage collection in the - jmp_buf. */ - + registers relevant for conservative garbage collection in the jmp_buf. */ #define GC_SETJMP_WORKS 1 /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method. */ - #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS /* arch-tag: e80f364a-04e9-4faf-93cb-f36a0fe95c81 === modified file 'src/s/sol2-10.h' --- src/s/sol2-10.h 2008-12-19 20:58:37 +0000 +++ src/s/sol2-10.h 2010-05-12 06:53:03 +0000 @@ -4,20 +4,18 @@ #define SYSTEM_MALLOC -/* - * Use the Solaris dldump() function, called from unexsol.c, to dump - * emacs, instead of the generic ELF dump code found in unexelf.c. - * The resulting binary has a complete symbol table, and is better - * for debugging and other observabilty tools (debuggers, pstack, etc). - * - * If you encounter a problem using dldump(), please consider sending - * a message to the OpenSolaris tools-linking mailing list: - * http://mail.opensolaris.org/mailman/listinfo/tools-linking - * - * It is likely that dldump() works with older Solaris too, - * but this has not been tested, and so, this change is for - * Solaris 10 and newer only at this time. - */ +/* Use the Solaris dldump() function, called from unexsol.c, to dump + emacs, instead of the generic ELF dump code found in unexelf.c. + The resulting binary has a complete symbol table, and is better + for debugging and other observabilty tools (debuggers, pstack, etc). + + If you encounter a problem using dldump(), please consider sending + a message to the OpenSolaris tools-linking mailing list: + http://mail.opensolaris.org/mailman/listinfo/tools-linking + + It is likely that dldump() works with older Solaris too, + but this has not been tested, and so, this change is for + Solaris 10 and newer only at this time. */ #undef UNEXEC #define UNEXEC unexsol.o === modified file 'src/s/template.h' --- src/s/template.h 2010-05-10 00:07:47 +0000 +++ src/s/template.h 2010-05-12 06:53:03 +0000 @@ -21,10 +21,8 @@ along with GNU Emacs. If not, see . */ -/* - * Define symbols to identify the version of Unix this is. - * Define all the symbols that apply correctly. - */ +/* Define symbols to identify the version of Unix this is. + Define all the symbols that apply correctly. */ /* #define USG5 */ /* #define USG */ @@ -34,7 +32,7 @@ /* #define BSD_SYSTEM */ /* SYSTEM_TYPE should indicate the kind of system you are using. - It sets the Lisp variable system-type. */ + It sets the Lisp variable system-type. */ #define SYSTEM_TYPE "berkeley-unix" @@ -58,55 +56,46 @@ Another method of doing input is planned but not implemented. It would have Emacs fork off a separate process to read the input and send it to the true Emacs process - through a pipe. */ - + through a pipe. */ #define INTERRUPT_INPUT /* Letter to use in finding device name of first pty, - if system supports pty's. 'a' means it is /dev/ptya0 */ - + if system supports pty's. 'a' means it is /dev/ptya0. */ #define FIRST_PTY_LETTER 'a' -/* - * Define HAVE_TERMIOS if the system provides POSIX-style - * functions and macros for terminal control. - * - * Define HAVE_TERMIO if the system provides sysV-style ioctls - * for terminal control. - * - * Do not define both. HAVE_TERMIOS is preferred, if it is - * supported on your system. - */ +/* Define HAVE_TERMIOS if the system provides POSIX-style + functions and macros for terminal control. + + Define HAVE_TERMIO if the system provides sysV-style ioctls + for terminal control. + + Do not define both. HAVE_TERMIOS is preferred, if it is + supported on your system. */ #define HAVE_TERMIOS /* #define HAVE_TERMIO */ -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - +/* Define HAVE_PTYS if the system supports pty devices. */ #define HAVE_PTYS -/* Define this symbol if your system has the functions bcopy, etc. */ - +/* Define this symbol if your system has the functions bcopy, etc. */ #define BSTRING /* subprocesses should be undefined if you do NOT want to have code for asynchronous subprocesses (as used in M-x compile and M-x shell). - Currently only MSDOS does not support this. */ + Currently only MSDOS does not support this. */ /* #undef subprocesses */ /* If your system uses COFF (Common Object File Format) then define the - preprocessor symbol "COFF". */ + preprocessor symbol "COFF". */ /* #define COFF */ /* Define CLASH_DETECTION if you want lock files to be written so that Emacs can tell instantly when you try to modify a file that someone else has modified in his Emacs. */ - #define CLASH_DETECTION /* Define this if your operating system declares signal handlers to @@ -127,12 +116,11 @@ /* ============================================================ */ -/* Here, add any special hacks needed - to make Emacs work on this system. For example, - you might define certain system call names that don't - exist on your system, or that do different things on - your system and must be used only through an encapsulation - (Which you should place, by convention, in sysdep.c). */ +/* Here, add any special hacks needed to make Emacs work on this + system. For example, you might define certain system call names + that don't exist on your system, or that do different things on + your system and must be used only through an encapsulation (which + you should place, by convention, in sysdep.c). */ /* If the system's imake configuration file defines `NeedWidePrototypes' as `NO', we must define NARROWPROTO manually. Such a define is === modified file 'src/s/unixware.h' --- src/s/unixware.h 2010-05-10 02:16:09 +0000 +++ src/s/unixware.h 2010-05-12 06:53:03 +0000 @@ -35,8 +35,7 @@ /* This sets the name of the slave side of the PTY. On SysVr4, grantpt(3) forks a subprocess, so keep sigchld_handler() from intercepting that death. If any child but grantpt's should die - within, it should be caught after sigrelse(2). */ - + within, it should be caught after sigrelse(2). */ #define PTY_TTY_NAME_SPRINTF \ { \ char *ptsname(), *ptyname; \ @@ -54,12 +53,10 @@ } /* Data type of load average, as read out of kmem. */ - #define LOAD_AVE_TYPE long /* Convert that into an integer that is 100 for a load average of 1.0 */ /* This is totally uncalibrated. */ - #define LOAD_AVE_CVT(x) ((int) (((double) (x)) * 100.0 / FSCALE)) #define FSCALE 256.0 === modified file 'src/s/usg5-4.h' --- src/s/usg5-4.h 2010-05-08 02:05:24 +0000 +++ src/s/usg5-4.h 2010-05-12 06:53:03 +0000 @@ -3,6 +3,9 @@ Copyright (C) 1987, 1990, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +Written by James Van Artsdalen of Dell Computer Corp. james@bigtex.cactus.org. +Subsequently improved for Dell 2.2 by Eric S. Raymond . + This file is part of GNU Emacs. GNU Emacs is free software: you can redistribute it and/or modify @@ -18,57 +21,36 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ -/* This file written by James Van Artsdalen of Dell Computer Corporation. - * james@bigtex.cactus.org. Subsequently improved for Dell 2.2 by Eric - * S. Raymond . - */ - -/* Use the SysVr3 file for at least base configuration. */ - +/* Use the SysVr3 file for at least base configuration. */ #define USG /* System III, System V, etc */ #define USG5 #define USG5_4 /* SYSTEM_TYPE should indicate the kind of system you are using. - It sets the Lisp variable system-type. */ - + It sets the Lisp variable system-type. */ #define SYSTEM_TYPE "usg-unix-v" -/* - * Define HAVE_TERMIO if the system provides sysV-style ioctls - * for terminal control. - */ - +/* Define HAVE_TERMIO if the system provides sysV-style ioctls + for terminal control. */ #define HAVE_TERMIO -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -/* - * Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir - * library functions. Almost, but not quite the same as - * the 4.2 functions - */ +/* Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir library + functions. Almost, but not quite the same as the 4.2 functions. */ #define SYSV_SYSTEM_DIR /* The file containing the kernel's symbol table is called /unix. */ - #define KERNEL_FILE "/unix" -/* The symbol in the kernel where the load average is found - is named avenrun. */ - +/* The kernel symbol where the load average is found is named avenrun. */ #define LDAV_SYMBOL "avenrun" /* setjmp and longjmp can safely replace _setjmp and _longjmp, but they will run slower. */ - #define _setjmp setjmp #define _longjmp longjmp -/* On USG systems these have different names */ +/* On USG systems these have different names. */ #ifndef HAVE_INDEX #define index strchr #endif /* ! defined (HAVE_INDEX) */ @@ -76,35 +58,27 @@ #define rindex strrchr #endif /* ! defined (HAVE_RINDEX) */ - -/* The docs for system V/386 suggest v.3 has sigpause, - so let's give it a try. */ +/* The docs for system V/386 suggest v.3 has sigpause, so let's try it. */ #define HAVE_SYSV_SIGPAUSE - -/* If we're using the System V X port, BSD bstring functions will be handy */ - +/* If we're using the System V X port, BSD bstring functions will be handy. */ #ifdef HAVE_X_WINDOWS #define BSTRING #endif /* HAVE_X_WINDOWS */ -/* On USG systems signal handlers return void */ - +/* On USG systems signal handlers return void. */ #define SIGTYPE void #define ORDINARY_LINK -/* Undump with ELF */ - +/* Undump with ELF. */ #undef COFF #define UNEXEC unexelf.o -/* Get FIONREAD from . Get to get struct - * tchars. But get first to make sure ttold.h doesn't - * interfere. And don't try to use SIGIO yet. - */ - +/* Get FIONREAD from . Get to get struct tchars. + But get first to make sure ttold.h doesn't interfere. + And don't try to use SIGIO yet. */ #ifndef NOT_C_CODE #include #endif @@ -121,15 +95,14 @@ #endif /* Some SVr4s don't define NSIG in sys/signal.h for ANSI environments; - * instead, there's a system variable _sys_nsig. Unfortunately, we need the - * constant to dimension an array. So wire in the appropriate value here. - */ + instead, there's a system variable _sys_nsig. Unfortunately, we need the + constant to dimension an array. So wire in the appropriate value here. */ #define NSIG_MINIMUM 32 -/* We can support this */ - +/* We can support this. */ #define CLASH_DETECTION +/* Define HAVE_PTYS if the system supports pty devices. */ #define HAVE_PTYS #define HAVE_TERMIOS @@ -137,7 +110,6 @@ waiting, because a previous waitsys(2) cleaned up the carcass of child without clearing the SIGCHLD pending info. So, use a non-blocking wait3 instead, which maps to waitpid(2) in SysVr4. */ - #define wait3(status, options, rusage) \ waitpid ((pid_t) -1, (status), (options)) #define WRETCODE(w) (w >> 8) @@ -145,20 +117,16 @@ /* TIOCGPGRP is broken in SysVr4, so we can't send signals to PTY subprocesses the usual way. But TIOCSIGNAL does work for PTYs, and this is all we need. */ - #define TIOCSIGSEND TIOCSIGNAL /* This change means that we don't loop through allocate_pty too many - times in the (rare) event of a failure. */ - + times in the (rare) event of a failure. */ #define FIRST_PTY_LETTER 'z' -/* This sets the name of the master side of the PTY. */ - +/* This sets the name of the master side of the PTY. */ #define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptmx"); -/* Push various streams modules onto a PTY channel. */ - +/* Push various streams modules onto a PTY channel. */ #define SETUP_SLAVE_PTY \ if (ioctl (xforkin, I_PUSH, "ptem") == -1) \ fatal ("ioctl I_PUSH ptem", errno); \ @@ -167,8 +135,7 @@ if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) \ fatal ("ioctl I_PUSH ttcompat", errno); -/* This definition was suggested for next release. - So give it a try. */ +/* This definition was suggested for next release. So give it a try. */ #define HAVE_SOCKETS /* arch-tag: 1a0ed909-5faa-434b-b7c3-9d86c63d53a6 ------------------------------------------------------------ revno: 100241 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-05-11 20:44:36 -0700 message: Simplify linker-related logic in src/Makefile.in. * src/Makefile.in (YMF_PASS_LDFLAGS, LD, LINKER): Simplify the logic. (LINKER_WAS_SPECIFIED): Remove. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-05-12 03:01:16 +0000 +++ src/ChangeLog 2010-05-12 03:44:36 +0000 @@ -1,5 +1,8 @@ 2010-05-12 Glenn Morris + * Makefile.in (YMF_PASS_LDFLAGS, LD, LINKER): Simplify the logic. + (LINKER_WAS_SPECIFIED): Remove. + * Makefile.in (LIB_GCC): Set using configure, not cpp. (GNULIB_VAR) [!ORDINARY_LINK]: Always set to $LIB_GCC. * m/arm.h (LIB_GCC) [GNU_LINUX]: === modified file 'src/Makefile.in' --- src/Makefile.in 2010-05-12 03:01:16 +0000 +++ src/Makefile.in 2010-05-12 03:44:36 +0000 @@ -1,7 +1,7 @@ # Makefile for GNU Emacs. # Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -260,16 +260,22 @@ LIBX_OTHER=@LIBX_OTHER@ #endif /* not HAVE_X_WINDOWS */ -#ifndef ORDINARY_LINK + +/* A macro which other sections of Makefile can redefine to munge the + flags before they are passed to LD. This is helpful if you have + redefined LD to something odd, like "gcc". + (The YMF prefix is a holdover from the old name "ymakefile".) */ +#define YMF_PASS_LDFLAGS(flags) flags + + +#ifdef ORDINARY_LINK +LD = $(CC) + +#else /* not ORDINARY_LINK */ GNULIB_VAR = $(LIB_GCC) /* Fix linking if compiled with GCC. */ -#ifdef __GNUC__ - -#ifdef LINKER -#define LINKER_WAS_SPECIFIED -#endif - +#if defined (__GNUC__) && ! defined (LINKER) /* Versions of GCC >= 2.0 put their library, libgcc.a, in obscure places that are difficult to figure out at make time. Fortunately, these same versions allow you to pass arbitrary flags on to the @@ -278,42 +284,23 @@ Well, it is not quite perfect. The "-nostdlib" keeps GCC from searching for libraries in its internal directories, so we have to ask GCC explicitly where to find libgcc.a. */ - -#ifndef LINKER #define LINKER $(CC) -nostdlib -#endif - -#ifndef LINKER_WAS_SPECIFIED -/* GCC passes any argument prefixed with -Xlinker directly to the - linker. See prefix-args.c for an explanation of why we do not do - this with the shell''s ``for'' construct. - Note that some people do not have '.' in their paths, so we must - use ./prefix-args. */ +/* GCC passes any argument prefixed with -Xlinker directly to the linker. + See prefix-args.c for an explanation of why we do not do this with the + shell''s ``for'' construct. Note that sane people do not have '.' in + their paths, so we must use ./prefix-args. */ +#undef YMF_PASS_LDFLAGS #define YMF_PASS_LDFLAGS(flags) `./prefix-args -Xlinker flags` -#else -#define YMF_PASS_LDFLAGS(flags) flags -#endif - -#endif /* not ORDINARY_LINK */ - -#ifdef ORDINARY_LINK -LD = $(CC) -#else +#endif /* defined (__GNUC__) && ! defined (LINKER) */ + #ifdef LINKER LD=LINKER #else /* not LINKER */ LD=ld #endif /* not LINKER */ + #endif /* not ORDINARY_LINK */ -/* A macro which other sections of Makefile can redefine to munge the - flags before they are passed to LD. This is helpful if you have - redefined LD to something odd, like "gcc". - (The YMF prefix is a holdover from the old name "ymakefile".) - */ -#ifndef YMF_PASS_LDFLAGS -#define YMF_PASS_LDFLAGS(flags) flags -#endif #ifdef MSDOS #ifdef HAVE_X_WINDOWS ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.