Commits

Anonymous committed 0535fd6

[xemacs-21-4-hg @ 2005-01-31 02:54:46 by vins]
-- Fix: Fix typos in the tutorial.
-- Fix: Another parallel build fix.
-- Fix: Make XEmacs build on VC++ 7.

  • Participants
  • Parent commits ef23e11

Comments (0)

Files changed (109)

+2005-01-29  Ben Wing  <ben@xemacs.org>
+
+	* configure.in (AC_INIT_NOTICE):
+	* configure.in (XE_COMPUTE_RUNPATH):
+	Copy LDAP fixes from 21.5.
+
+	Port Marcus Crestani's patches of 2004-11-12:
+
+	* Makefile.in.in (install-arch-dep): Fix installation for Cygwin.
+	* configure:
+	* configure.in: Make pdump default for Cygwin.
+
+2005-01-30  Malcolm Purvis  <malcolmp@xemacs.org>
+
+	* Makefile.in.in (dump-elc): Depend on ${PROGNAME} to fix parallel
+	builds.
+
+2004-11-22  Adrian Aichner  <adrian@xemacs.org>
+
+	* etc/TUTORIAL: Typo fixes, courtesy of Andreas Eder
+	<Andreas.Eder@gmx.net>.
+
 2004-05-20  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* configure.in (HAVE_GPM): Die if GPM requested but not found.
 		-l update-elc-2.el -f batch-update-elc-2 lisp
 
 ## Sub-target for all-elc.
-dump-elc dump-elcs: ${GENERATED_HEADERS} FRC.dump-elcs
+dump-elc dump-elcs: ${PROGNAME} ${GENERATED_HEADERS} FRC.dump-elcs
 	cd ./src && $(MAKE) $(RECURSIVE_MAKE_ARGS) dump-elcs
 
 autoloads: lib-src lwlib src lisp/auto-autoloads.el lisp/custom-load.el
 	${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}
 	-chmod 0755 ${bindir}/${PROGNAME}
 #else
+# ifdef CYGWIN
+	${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}.exe
+	-chmod 0755 ${bindir}/${PROGNAME}-${version}.exe
+	cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME}
+# else
 	${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}
 	-chmod 0755 ${bindir}/${PROGNAME}-${version}
-# ifdef CYGWIN
-	cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME}
-# else
 	cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME}
 # endif /* CYGWIN */
 #endif /* WIN32_NATIVE */
 #### Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 #### Copyright (C) 1993-1995 Board of Trustees, University of Illinois.
 #### Copyright (C) 1996, 1997 Sun Microsystems, Inc.
-#### Copyright (C) 1995, 1996 Ben Wing.
+#### Copyright (C) 1995, 1996, 2005 Ben Wing.
 #### Copyright (C) 2000, 2001 Martin Buchholz.
 #### Copyright (C) 1998, 1999 J. Kean Johnston.
 
   case "$opsys" in
     linux* )  pdump=yes ;;    dnl glibc 2.3.1 seems to hose unexec
     darwin )  pdump=yes ;;    dnl No "native" working dumper available
+    cygwin* ) pdump=yes ;;    dnl unexec is broken
     *)        pdump=no ;;
   esac
 fi
 test -z "$with_ldap" && { AC_CHECK_HEADER(ldap.h, ,with_ldap=no) }
 test -z "$with_ldap" && { AC_CHECK_HEADER(lber.h, ,with_ldap=no) }
 if test "$with_ldap" != "no"; then
-  AC_CHECK_LIB(ldap, ldap_search, with_ldap_nolber=yes, with_ldap_nolber=no)
-  test "$with_ldap_nolber" = "no" && { AC_CHECK_LIB(ldap, ldap_open, with_ldap_lber=yes, with_ldap_lber=no, -llber) }
-  test "$with_ldap_nolber" = "no" -a "$with_ldap_lber" = "no" && { AC_CHECK_LIB(ldap, ldap_open, with_ldap_krb=yes, with_ldap_krb=no, -llber -lkrb) }
-  test "$with_ldap_nolber" = "no" -a "$with_ldap_lber" = "no" -a "$with_ldap_krb" = "no" && { AC_CHECK_LIB(ldap, ldap_open, with_ldap_krbdes=yes, with_ldap_krbdes=no, -llber -lkrb -ldes) }
-  test -z "$with_ldap" -a \( "$with_ldap_lber" = "yes" -o "$with_ldap_nolber" = "yes" -o "$with_ldap_krb" = "yes" -o "$with_ldap_krbdes" = "yes" \) && with_ldap=yes
+  AC_CHECK_LIB(ldap, ldap_search, with_ldap=yes)
+  dnl Check for other libraries we need to link with to get the main routines.
+  test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes], , -llber) }
+  test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes], , -llber -lkrb) }
+  test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes with_ldap_des=yes], , -llber -lkrb -ldes) }
+  dnl Recently, we need -lber even though the main routines are elsewhere,
+  dnl because otherwise be get link errors w.r.t. ber_pvt_opt_on.  So just
+  dnl check for that (it's a variable not a fun but that doesn't seem to
+  dnl matter in these checks)  and stick in -lber if so.  Can't hurt (even to
+  dnl stick it in always shouldn't hurt, I don't think) ... #### Someone who
+  dnl #### understands LDAP needs to fix this properly.
+  test "$with_ldap_lber" != "yes" && { AC_CHECK_LIB(lber, ber_pvt_opt_on, with_ldap_lber=yes) }
 fi
 if test "$with_ldap" = "yes"; then
   AC_DEFINE(HAVE_LDAP)
   XE_ADD_OBJS(eldap.o)
-  if test "$with_ldap_nolber" = "yes" ; then
-    XE_PREPEND(-lldap, LIBS)
-  else
-    if test "$with_ldap_krb" = "yes" ; then
-      XE_PREPEND(-lkrb, LIBS)
-    fi
-    if test "$with_ldap_krbdes" = "yes" ; then
-      XE_PREPEND(-ldes, LIBS)
-      XE_PREPEND(-lkrb, LIBS)
-    fi
+  if test "$with_ldap_des" = "yes" ; then
+    XE_PREPEND(-ldes, LIBS)
+  fi
+  if test "$with_ldap_krb" = "yes" ; then
+    XE_PREPEND(-lkrb, LIBS)
+  fi
+  if test "$with_ldap_lber" = "yes" ; then
     XE_PREPEND(-llber, LIBS)
-    XE_PREPEND(-lldap, LIBS)
   fi
+  XE_PREPEND(-lldap, LIBS)
   AC_CHECK_FUNCS(ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result)
 fi
 
 >> Move into the line with C-f's and then up with C-p's.
    See what C-p does when the cursor is in the middle of the line.
 
-Each of text line ends with a Newline character, which serves to
+Each line of text ends with a Newline character, which serves to
 separate it from the following line.  The last line in your file ought
 to have a Newline at the end (but Emacs does not require it to have
 one).
 
 Emacs stores each file's text inside an object called a "buffer."
 Finding a file makes a new buffer inside Emacs.  To see a list of the
-buffers that current exist in your Emacs job, type
+buffers that currently exist in your Emacs job, type
 
 	C-x C-b   List buffers
 
 
 If the computer crashes, you can recover your auto-saved editing by
 finding the file normally (the file you were editing, not the auto
-save file) and then typing M-x recover file<return>.  When it asks for
+save file) and then typing M-x recover-file<return>.  When it asks for
 confirmation, type yes<return> to go ahead and recover the auto-save
 data.
 
+2005-01-29  Ben Wing  <ben@xemacs.org>
+
+	* shadow.el (find-emacs-lisp-shadows):
+	Add custom-defines to list of ignored files.
+
 2005-01-17  Adrian Aichner  <adrian@xemacs.org>
 
 	* simple.el (shifted-motion-keys-select-region): Fix statement
 			      '("subdirs"
 				"auto-autoloads"
 				"custom-load"
+				"custom-defines"
 				"dumped-lisp"
 				"_pkg"
 				"lpath")))
+2005-01-29  Ben Wing  <ben@xemacs.org>
+
+	* xemacs.mak:
+	* xemacs.mak (USE_PORTABLE_DUMPER):
+	Enable portable dumper just in case it's not specified in config.inc.
+	
+	* xemacs.mak:
+	* xemacs.mak (INCLUDES):
+	Put our own directories first in case of conflict (e.g. config.h
+	in compface).
+	
+	* xemacs.mak ($(BLDLIB_SRC)/minitar.exe):
+	* xemacs.mak (LIB_SRC_TOOLS):
+	Use MSVCRT to avoid link problems.
+
+	* xemacs.mak ({$(MANDIR)}.texi{$(INFODIR)}.info):
+	Use filename only when calling makeinfo, or it chokes on index
+	generation.
+	
 2005-01-28  Ben Wing  <ben@xemacs.org>
 
 	* config.inc.samp:
 	* config.inc.samp (PNG_DIR):
 	* config.inc.samp (MAKEINFO):
 	Update directory locations to correspond to current optional-libs.exe
-	and Cygwin makeinfo.
+	and Cygwin makeinfo.  Update GTK comment.  Enable TIFF and COMPFACE
+	since we can now compile with them.
 
 2004-12-05  Vin Shelton <acs@xemacs.org>
 
-(String) "Emacs.modeline*attributeForeground:	Black",
-(String) "Emacs.modeline*attributeBackground:	Gray75",
-(String) "Emacs.text-cursor*attributeBackground:	Red3",
-(String) "*menubar*Foreground:			Gray30",
-(String) "*menubar*Background:			Gray75",
-(String) "*menubar*buttonForeground:		Blue",
-(String) "*XlwMenu*selectColor:			ForestGreen",
-(String) "*XmToggleButton*selectColor:		ForestGreen",
-(String) "*popup*Foreground:			Black",
-(String) "*popup*Background:			Gray75",
-(String) "*dialog*Foreground:			Black",
-(String) "*dialog*Background:			#A5C0C1",
-(String) "*dialog*XmTextField*Background:		WhiteSmoke",
-(String) "*dialog*XmText*Background:		WhiteSmoke",
-(String) "*dialog*XmList*Background:		WhiteSmoke",
-(String) "*dialog*Command*Background:		WhiteSmoke",
-(String) "*XlwScrollBar*Foreground:		Gray30",
-(String) "*XlwScrollBar*Background:		Gray75",
-(String) "*XmScrollBar*Foreground:		Gray30",
-(String) "*XmScrollBar*Background:		Gray75",
-(String) "*topToolBarShadowColor:			Gray90",
-(String) "*bottomToolBarShadowColor:		Gray40",
-(String) "*backgroundToolBarColor:		Gray75",
-(String) "*toolBarShadowThickness:		2",
-(String) "*menubar*Font: 			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*",
-(String) "*popup*Font:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*",
-(String) "*XmDialogShell*FontList:	-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*",
-(String) "*XmTextField*FontList:		-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*",
-(String) "*XmText*FontList:		-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*",
-(String) "*XmList*FontList:		-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*",
-(String) "*Dialog*Font:			-*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*",
-(String) "*dialog*button1.accelerators:#override\
-<KeyPress>Return: ArmAndActivate()\\n\
-<KeyPress>KP_Enter: ArmAndActivate()\\n\
-Ctrl<KeyPress>m: ArmAndActivate()\\n",
-(String) "*XmTextField*translations: #override\\n\
-	!<Key>osfBackSpace:	delete-previous-character()\\n\
-	!<Key>osfDelete:	delete-previous-character()\\n\
-	!Ctrl<Key>h: 		delete-previous-character()\\n\
-	!Ctrl<Key>d: 		delete-next-character()\\n\
-	!Meta<Key>osfDelete:	delete-previous-word()\\n\
-	!Meta<Key>osfBackSpace:	delete-previous-word()\\n\
-	!Meta<Key>d:		delete-next-word()\\n\
-	!Ctrl<Key>k:		delete-to-end-of-line()\\n\
-	!Ctrl<Key>g:		process-cancel()\\n\
-	!Ctrl<Key>b:		backward-character()\\n\
-	!<Key>osfLeft:		backward-character()\\n\
-	!Ctrl<Key>f:		forward-character()\\n\
-	!<Key>osfRight:		forward-character()\\n\
-	!Meta<Key>b:		backward-word()\\n\
-	!Meta<Key>osfLeft:	backward-word()\\n\
-	!Meta<Key>f:		forward-word()\\n\
-	!Meta<Key>osfRight:	forward-word()\\n\
-	!Ctrl<Key>e:		end-of-line()\\n\
-	!Ctrl<Key>a:		beginning-of-line()\\n\
-	!Ctrl<Key>w:		cut-clipboard()\\n\
-	!Meta<Key>w:		copy-clipboard()\\n\
-	<Btn2Up>:		copy-primary()\\n",
-(String) "*dialog*XmPushButton*translations:#override\\n\
-    <Btn1Down>:         Arm()\\n\
-    <Btn1Down>,<Btn1Up>: Activate()\
-			Disarm()\\n\
-    <Btn1Down>(2+):     MultiArm()\\n\
-    <Btn1Up>(2+):       MultiActivate()\\n\
-    <Btn1Up>:           Activate()\
-		        Disarm()\\n\
-    <Key>osfSelect:  	ArmAndActivate()\\n\
-    <Key>osfActivate:   ArmAndActivate()\\n\
-    <Key>osfHelp:	Help()\\n\
-    ~Shift ~Meta ~Alt <Key>Return:	ArmAndActivate()\\n\
-    <EnterWindow>:      Enter()\\n\
-    <LeaveWindow>:      Leave()\\n",
-(String) "*ximStyles: XIMPreeditPosition|XIMStatusArea\
-            XIMPreeditPosition|XIMStatusNothing\
-            XIMPreeditPosition|XIMStatusNone\
-            XIMPreeditNothing|XIMStatusArea\
-            XIMPreeditNothing|XIMStatusNothing\
-            XIMPreeditNothing|XIMStatusNone\
-            XIMPreeditNone|XIMStatusArea\
-            XIMPreeditNone|XIMStatusNothing\
-            XIMPreeditNone|XIMStatusNone",
-(String) "*EmacsFrame.ximForeground: black",
-(String) "*EmacsFrame.ximBackground: white",
+(String) "Emacs.modeline*attributeForeground:	Black",
+(String) "Emacs.modeline*attributeBackground:	Gray75",
+(String) "Emacs.text-cursor*attributeBackground:	Red3",
+(String) "*menubar*Foreground:			Gray30",
+(String) "*menubar*Background:			Gray75",
+(String) "*menubar*buttonForeground:		Blue",
+(String) "*XlwMenu*selectColor:			ForestGreen",
+(String) "*XmToggleButton*selectColor:		ForestGreen",
+(String) "*popup*Foreground:			Black",
+(String) "*popup*Background:			Gray75",
+(String) "*dialog*Foreground:			Black",
+(String) "*dialog*Background:			#A5C0C1",
+(String) "*dialog*XmTextField*Background:		WhiteSmoke",
+(String) "*dialog*XmText*Background:		WhiteSmoke",
+(String) "*dialog*XmList*Background:		WhiteSmoke",
+(String) "*dialog*Command*Background:		WhiteSmoke",
+(String) "*XlwScrollBar*Foreground:		Gray30",
+(String) "*XlwScrollBar*Background:		Gray75",
+(String) "*XmScrollBar*Foreground:		Gray30",
+(String) "*XmScrollBar*Background:		Gray75",
+(String) "*topToolBarShadowColor:			Gray90",
+(String) "*bottomToolBarShadowColor:		Gray40",
+(String) "*backgroundToolBarColor:		Gray75",
+(String) "*toolBarShadowThickness:		2",
+(String) "*menubar*Font: 			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*",
+(String) "*popup*Font:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*",
+(String) "*XmDialogShell*FontList:	-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*",
+(String) "*XmTextField*FontList:		-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*",
+(String) "*XmText*FontList:		-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*",
+(String) "*XmList*FontList:		-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*",
+(String) "*Dialog*Font:			-*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*",
+(String) "*dialog*button1.accelerators:#override\
+<KeyPress>Return: ArmAndActivate()\\n\
+<KeyPress>KP_Enter: ArmAndActivate()\\n\
+Ctrl<KeyPress>m: ArmAndActivate()\\n",
+(String) "*XmTextField*translations: #override\\n\
+	!<Key>osfBackSpace:	delete-previous-character()\\n\
+	!<Key>osfDelete:	delete-previous-character()\\n\
+	!Ctrl<Key>h: 		delete-previous-character()\\n\
+	!Ctrl<Key>d: 		delete-next-character()\\n\
+	!Meta<Key>osfDelete:	delete-previous-word()\\n\
+	!Meta<Key>osfBackSpace:	delete-previous-word()\\n\
+	!Meta<Key>d:		delete-next-word()\\n\
+	!Ctrl<Key>k:		delete-to-end-of-line()\\n\
+	!Ctrl<Key>g:		process-cancel()\\n\
+	!Ctrl<Key>b:		backward-character()\\n\
+	!<Key>osfLeft:		backward-character()\\n\
+	!Ctrl<Key>f:		forward-character()\\n\
+	!<Key>osfRight:		forward-character()\\n\
+	!Meta<Key>b:		backward-word()\\n\
+	!Meta<Key>osfLeft:	backward-word()\\n\
+	!Meta<Key>f:		forward-word()\\n\
+	!Meta<Key>osfRight:	forward-word()\\n\
+	!Ctrl<Key>e:		end-of-line()\\n\
+	!Ctrl<Key>a:		beginning-of-line()\\n\
+	!Ctrl<Key>w:		cut-clipboard()\\n\
+	!Meta<Key>w:		copy-clipboard()\\n\
+	<Btn2Up>:		copy-primary()\\n",
+(String) "*dialog*XmPushButton*translations:#override\\n\
+    <Btn1Down>:         Arm()\\n\
+    <Btn1Down>,<Btn1Up>: Activate()\
+			Disarm()\\n\
+    <Btn1Down>(2+):     MultiArm()\\n\
+    <Btn1Up>(2+):       MultiActivate()\\n\
+    <Btn1Up>:           Activate()\
+		        Disarm()\\n\
+    <Key>osfSelect:  	ArmAndActivate()\\n\
+    <Key>osfActivate:   ArmAndActivate()\\n\
+    <Key>osfHelp:	Help()\\n\
+    ~Shift ~Meta ~Alt <Key>Return:	ArmAndActivate()\\n\
+    <EnterWindow>:      Enter()\\n\
+    <LeaveWindow>:      Leave()\\n",
+(String) "*ximStyles: XIMPreeditPosition|XIMStatusArea\
+            XIMPreeditPosition|XIMStatusNothing\
+            XIMPreeditPosition|XIMStatusNone\
+            XIMPreeditNothing|XIMStatusArea\
+            XIMPreeditNothing|XIMStatusNothing\
+            XIMPreeditNothing|XIMStatusNone\
+            XIMPreeditNone|XIMStatusArea\
+            XIMPreeditNone|XIMStatusNothing\
+            XIMPreeditNone|XIMStatusNone",
+(String) "*EmacsFrame.ximForeground: black",
+(String) "*EmacsFrame.ximBackground: white",

nt/config.inc.samp

 HAVE_X_WINDOWS=0
 X11_DIR=
 
-# GTK support. Do NOT set this to 1; as of xemacs-21.2-b44
-# gtk-xemacs is not supported on MSWindows (mingw or msvc).
-# Yes, we know that gtk has been ported to native MSWindows
-# but XEmacs is not yet ready to use that port.
+# GTK support. Do NOT set this to 1; gtk-xemacs is not supported on
+# MSWindows (mingw or msvc).  Yes, we know that gtk has been ported to
+# native MSWindows but XEmacs is not yet ready to use that port.
 HAVE_GTK=0
 GTK_DIR=
 
 # Set this to enable TIFF support (not very important), and specify the
 # directory containing tiff.  Get the latest version from
 # ftp://ftp.uu.net/graphics/tiff/.
-HAVE_TIFF=0
+HAVE_TIFF=1
 TIFF_DIR=$(OPTIONAL_LIBRARY_DIR)\tiff-v3.5.7
 
 # Set this to enable XFace support (not very important), and specify the
 # directory containing compface.  Get the library from
-# http://ftp.xemacs.org/aux/compface-1.5.tar.gz.
-HAVE_XFACE=0
+# http://ftp.xemacs.org/aux/compface-1.5-1.tar.gz.
+HAVE_XFACE=1
 COMPFACE_DIR=$(OPTIONAL_LIBRARY_DIR)\compface-1.5.1
 
 ############################################################################
 #   Makefile for Microsoft NMAKE
 #   Copyright (C) 1995 Board of Trustees, University of Illinois.
-#   Copyright (C) 1995, 1996, 2000 Ben Wing.
+#   Copyright (C) 1995, 1996, 2000, 2005 Ben Wing.
 #   Copyright (C) 1995 Sun Microsystems, Inc.
 #   Copyright (C) 1998 Free Software Foundation, Inc.
 #
 USE_MINITAR=$(HAVE_ZLIB)
 !endif
 !if !defined(USE_PORTABLE_DUMPER)
-USE_PORTABLE_DUMPER=0
+USE_PORTABLE_DUMPER=1
 !endif
 
 # A little bit of adhockery. Default to use system malloc and
 # DLL version of the C runtime library when using portable
 # dumping. These are the optimal settings.
+#
+# NOTE: The various graphics libraries are generally compiled to use
+# MSVCRT.DLL (the same that we use in USE_CRTDLL, more or less), so using
+# this is a good thing.
+
 !if !defined(USE_SYSTEM_MALLOC)
 USE_SYSTEM_MALLOC=$(USE_PORTABLE_DUMPER)
 !endif
 
 # Generic variables
 
-INCLUDES=$(X_INCLUDES) $(MSW_INCLUDES) -I$(NT)\inc -I$(SRC) -I$(LWLIB_SRCDIR)
+INCLUDES=$(X_INCLUDES) -I$(NT)\inc -I$(SRC) $(MSW_INCLUDES) -I$(LWLIB_SRCDIR)
 
 DEFINES=$(X_DEFINES) $(MSW_DEFINES) $(MULE_DEFINES) $(UNION_DEFINES) \
 	$(DUMPER_DEFINES) $(MALLOC_DEFINES) $(QUICK_DEFINES) \
 	cd $(NT)
 
 $(LIB_SRC)/minitar.exe : $(NT)/minitar.c
-	$(CCV) $(CFLAGS_NO_LIB) -I"$(ZLIB_DIR)" $(LIB_SRC_DEFINES) -Fe$@ $** $(ZLIB_DIR)\zlib.lib -link -incremental:no
+	$(CCV) $(CFLAGS_NO_LIB) -I"$(ZLIB_DIR)" $(LIB_SRC_DEFINES) -MD -Fe$@ $** $(ZLIB_DIR)\zlib.lib -link -incremental:no
 
 LIB_SRC_TOOLS = \
 	$(LIB_SRC)/etags.exe		\
 
 {$(MANDIR)}.texi{$(INFODIR)}.info:
 	cd $(MANDIR)
-	$(MAKEINFO) $**
+	$(MAKEINFO) $(**F)
 
 XEMACS_SRCS = \
 	$(MANDIR)\xemacs\abbrevs.texi \
+2005-01-25  Ben Wing  <ben@xemacs.org>
+
+	* Makefile.in.in:
+	* Makefile.in.in (%.o):
+	Don't compile executable as Windows (-mwindows) under Cygwin.
+	Semi-recent changes to Cygwin's executable-startup handling make
+	it impossible to access the TTY this way.
+
+	Don't use special linker file under Cygwin (cygwin.sc) except
+	when non-PDUMP (even in this case it is highly questionable); you
+	get errors like
+
+      1 [main] temacs 1364 fhandler_console::fixup_after_exec: error opening input console handle after exec, errno 13, Win32 error 5
+   5820 [main] temacs 1364 fhandler_console::fixup_after_exec: error opening output console handle after exec, errno 13, Win32 error 5
+
+2005-01-29  Ben Wing  <ben@xemacs.org>
+
+	Port this: 2003-08-14  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* mule-charset.c (get_unallocated_leading_byte): Compiler quietus.
+
+2005-01-29  Ben Wing  <ben@xemacs.org>
+
+	* bytecode.c (optimize_compiled_function):
+	* print.c (FROB):
+	* print.c (long_to_string):
+	Add casts to avoid warning.
+	
+	* glyphs-eimage.c:
+	Some really nasty hacks to allow TIFF and JPEG to both be compiled.
+	#### The better solution is to move the TIFF and JPEG code to
+	different files.
+	
+	* glyphs-msw.c (mswindows_xbm_instantiate):
+	Define __STDC__ to avoid problems with compface.h.
+	
+	* EmacsFrame.c (EmacsFrameRecomputeCellSize):
+	* EmacsShell-sub.c:
+	* EmacsShell-sub.c (ABORT):
+	* EmacsShell-sub.c (SuperClassRootGeometryManager):
+	* EmacsShell-sub.c (RootGeometryManager):
+	* EmacsShell.c:
+	* EmacsShell.c (ABORT):
+	* EmacsShell.c (EmacsShellUpdateSizeHints):
+	* alloc.c (free_lcrecord):
+	* alloca.c (i00afunc):
+	* buffer.c (delete_from_buffer_alist):
+	* buffer.c (MARKED_SLOT):
+	* bytecode.c (execute_rare_opcode):
+	* bytecode.c (optimize_byte_code):
+	* bytecode.c (Ffetch_bytecode):
+	* chartab.c (char_table_type_to_symbol):
+	* chartab.c (Freset_char_table):
+	* chartab.c (decode_char_table_range):
+	* chartab.c (Fget_range_char_table):
+	* chartab.c (check_valid_char_table_value):
+	* chartab.c (map_char_table):
+	* chartab.c (slow_map_char_table_fun):
+	* chartab.c (chartab_instantiate):
+	* cm.c (cmcheckmagic):
+	* console-msw.c (DHEADER):
+	* console.c (MARKED_SLOT):
+	* data.c (finish_marking_weak_lists):
+	* data.c (encode_weak_list_type):
+	* debug.h (DASSERT):
+	* device-gtk.c (gtk_init_device):
+	* device-msw.c (mswindows_get_default_margin):
+	* device-tty.c (tty_init_device):
+	* device-x.c (get_device_from_display):
+	* device-x.c (x_get_visual_depth):
+	* doprnt.c (parse_doprnt_spec):
+	* doprnt.c (get_doprnt_args):
+	* dumper.c (pdump_get_indirect_count):
+	* dumper.c (pdump_register_sub):
+	* dumper.c (pdump_register_object):
+	* dumper.c (pdump_register_struct):
+	* dumper.c (pdump_dump_data):
+	* dumper.c (pdump_reloc_one):
+	* elhash.c (print_hash_table):
+	* elhash.c (make_standard_lisp_hash_table):
+	* elhash.c (hash_table_instantiate):
+	* emacs.c:
+	* emacs.c (Fforce_debugging_signal):
+	* emacs.c (sort_args):
+	* emacs.c (main):
+	* emacs.c (assert_failed):
+	* eval.c (throw_or_bomb_out):
+	* eval.c (signal_1):
+	* eval.c (Fsignal):
+	* event-Xt.c:
+	* event-Xt.c (emacs_Xt_mapping_action):
+	* event-Xt.c (Xt_process_to_emacs_event):
+	* event-msw.c:
+	* event-stream.c (check_event_stream_ok):
+	* event-stream.c (Fadd_timeout):
+	* event-stream.c (Fadd_async_timeout):
+	* event-stream.c (Fdiscard_input):
+	* event-stream.c (execute_internal_event):
+	* event-stream.c (Frecent_keys):
+	* event-stream.c (extract_this_command_keys_nth_mouse_event):
+	* event-stream.c (lookup_command_event):
+	* event-unixoid.c (poll_fds_for_input):
+	* events.c:
+	* events.c (mark_event):
+	* events.c (event_equal):
+	* events.c (event_hash):
+	* events.c (Fmake_event):
+	* events.c (Fdeallocate_event):
+	* events.c (event_chain_find_previous):
+	* events.c (event_to_character):
+	* events.c (format_event_object):
+	* events.c (Fevent_type):
+	* events.c (event_pixel_translation):
+	* events.c (Fevent_properties):
+	* extents.c (extent_in_region_p):
+	* extents.c (print_extent):
+	* extents.c (process_extents_for_insertion_mapper):
+	* extents.c (report_extent_modification_mapper):
+	* extents.c (glyph_layout_to_symbol):
+	* faces.c (face_validate):
+	* file-coding.c (eol_type_to_symbol):
+	* file-coding.c (subsidiary_coding_system):
+	* file-coding.c (Fcoding_system_type):
+	* file-coding.c (Fcoding_system_property):
+	* file-coding.c (mule_decode):
+	* file-coding.c (mule_encode):
+	* file-coding.c (encode_coding_ucs4):
+	* file-coding.c (encode_coding_utf8):
+	* file-coding.c (parse_iso2022_esc):
+	* file-coding.c (encode_coding_iso2022):
+	* fileio.c:
+	* fns.c (concat):
+	* fns.c (Fsubseq):
+	* fns.c (mapcar1):
+	* fns.c (Fbase64_encode_region):
+	* fns.c (Fbase64_encode_string):
+	* fns.c (Fbase64_decode_region):
+	* fns.c (Fbase64_decode_string):
+	* font-lock.c (find_context):
+	* font-lock.c (context_to_symbol):
+	* frame-gtk.c (gtk_set_frame_pointer):
+	* frame-gtk.c (gtk_update_frame_external_traits):
+	* frame-x.c (x_wm_mark_shell_size_user_specified):
+	* frame-x.c (x_wm_mark_shell_position_user_specified):
+	* frame-x.c (x_wm_set_shell_iconic_p):
+	* frame-x.c (x_wm_set_cell_size):
+	* frame-x.c (x_wm_set_variable_size):
+	* frame-x.c (x_wm_store_class_hints):
+	* frame-x.c (x_wm_maybe_store_wm_command):
+	* frame-x.c (x_initialize_frame_size):
+	* frame-x.c (x_update_frame_external_traits):
+	* frame.c:
+	* frame.c (delete_frame_internal):
+	* frame.c (mouse_pixel_position_1):
+	* frame.c (change_frame_size_1):
+	* free-hook.c (check_free):
+	* free-hook.c (check_realloc):
+	* free-hook.c (note_block_input):
+	* free-hook.c (log_gcpro):
+	* gccache-gtk.c (gc_cache_lookup):
+	* glyphs-eimage.c (tiff_memory_write):
+	* glyphs-gtk.c (gtk_finalize_image_instance):
+	* glyphs-gtk.c (init_image_instance_from_gdk_pixmap):
+	* glyphs-gtk.c (init_image_instance_from_xbm_inline):
+	* glyphs-gtk.c (gtk_xpm_instantiate):
+	* glyphs-gtk.c (gtk_unmap_subwindow):
+	* glyphs-gtk.c (gtk_map_subwindow):
+	* glyphs-gtk.c (gtk_button_redisplay):
+	* glyphs-msw.c:
+	* glyphs-msw.c (init_image_instance_from_xbm_inline):
+	* glyphs-x.c (init_image_instance_from_xbm_inline):
+	* glyphs-x.c (extract_xpm_color_names):
+	* glyphs-x.c (x_xpm_instantiate):
+	* glyphs.c (get_image_instantiator_governing_domain):
+	* glyphs.c (print_image_instance):
+	* glyphs.c (image_instance_equal):
+	* glyphs.c (image_instance_hash):
+	* glyphs.c (encode_image_instance_type):
+	* glyphs.c (make_image_instance_1):
+	* glyphs.c (inherit_instantiate):
+	* glyphs.c (image_instantiate):
+	* glyphs.c (allocate_glyph):
+	* glyphs.c (Fglyph_type):
+	* glyphs.c (redisplay_subwindow):
+	* glyphs.c (display_table_entry):
+	* gtk-glue.c (xemacs_list_to_gtklist):
+	* gtk-glue.c (xemacs_gtklist_to_list):
+	* gtk-glue.c (xemacs_list_to_array):
+	* gutter.c (SET_GUTTER_WAS_VISIBLE_FLAG):
+	* gutter.c (gutter_was_visible):
+	* gutter.c (get_gutter_coords):
+	* input-method-xlib.c (get_XIM_input):
+	* insdel.c (bufpos_to_bytind_func):
+	* insdel.c (bytind_to_bufpos_func):
+	* insdel.c (move_gap):
+	* intl.c (x_get_composed_input):
+	* keymap.c (keymap_lookup_directly):
+	* keymap.c (keymap_delete_inverse_internal):
+	* keymap.c (ensure_meta_prefix_char_keymapp):
+	* keymap.c (accessible_keymaps_mapper_1):
+	* keymap.c (where_is_recursive_mapper):
+	* lisp.h:
+	* lisp.h (ABORT):
+	* lread.c (read_atom):
+	* lstream.c (Lstream_delete):
+	* lstream.c (make_lisp_buffer_stream_1):
+	* macros.c (pop_kbd_macro_event):
+	* malloc.c (malloc):
+	* malloc.c (free):
+	* marker.c (bi_marker_position):
+	* marker.c (set_bi_marker_position):
+	* menubar-gtk.c (menu_descriptor_to_widget_1):
+	* menubar-msw.c (prune_menubar):
+	* menubar-x.c (set_frame_menubar):
+	* mule-charset.c (get_unallocated_leading_byte):
+	* mule-charset.h (CHAR_LEADING_BYTE):
+	* native-gtk-toolbar.c (SET_TOOLBAR_WAS_VISIBLE_FLAG):
+	* nt.c (init_environment):
+	* nt.c (generate_inode_val):
+	* ntproc.c (delete_child):
+	* ntproc.c (_sys_read_ahead):
+	* ntproc.c (create_child):
+	* objects.c (color_instantiate):
+	* objects.c (font_instantiate):
+	* objects.c (face_boolean_instantiate):
+	* print.c (printing_major_badness):
+	* process-nt.c (nt_send_process):
+	* process-unix.c (unix_send_process):
+	* process.c (get_process):
+	* ralloc.c (obtain):
+	* ralloc.c (relinquish):
+	* ralloc.c (relocate_blocs):
+	* ralloc.c (resize_bloc):
+	* ralloc.c (r_alloc_free):
+	* ralloc.c (r_re_alloc):
+	* ralloc.c (r_alloc_thaw):
+	* ralloc.c (init_ralloc):
+	* ralloc.c (Free_Addr_Block):
+	* ralloc.c (r_alloc):
+	* redisplay-gtk.c (gtk_output_display_block):
+	* redisplay-msw.c (mswindows_output_display_block):
+	* redisplay-output.c (get_next_display_block):
+	* redisplay-output.c (get_cursor_size_and_location):
+	* redisplay-output.c (redisplay_output_layout):
+	* redisplay-output.c (redisplay_clear_region):
+	* redisplay-tty.c (tty_output_display_block):
+	* redisplay-x.c (x_output_display_block):
+	* redisplay.c (add_propagation_runes):
+	* redisplay.c (add_glyph_rune):
+	* redisplay.c (create_text_block):
+	* redisplay.c (add_margin_runes):
+	* redisplay.c (create_left_glyph_block):
+	* redisplay.c (create_right_glyph_block):
+	* redisplay.c (create_string_text_block):
+	* redisplay.c (regenerate_window):
+	* redisplay.c (REGEN_INC_FIND_START_END):
+	* redisplay.c (redisplay_frame):
+	* redisplay.c (point_in_line_start_cache):
+	* regex.c:
+	* regex.c (ABORT):
+	* regex.c (re_compile_fastmap):
+	* regex.c (re_match_2_internal):
+	* regex.c (regerror):
+	* scrollbar-gtk.c (gtk_scrollbar_loop):
+	* scrollbar-gtk.c (scrollbar_cb):
+	* scrollbar-gtk.c (gtk_update_frame_scrollbars):
+	* scrollbar-msw.c (mswindows_handle_scrollbar_event):
+	* scrollbar-x.c (x_update_scrollbar_instance_status):
+	* scrollbar-x.c (x_scrollbar_loop):
+	* scrollbar-x.c (x_update_frame_scrollbars):
+	* search.c (search_command):
+	* search.c (Fmatch_data):
+	* select-x.c (motif_clipboard_cb):
+	* signal.c (interrupt_signal):
+	* specifier.c (specifier_add_spec):
+	* specifier.c (specifier_instance_from_inst_list):
+	* specifier.c (specifier_instance):
+	* specifier.h:
+	* specifier.h (struct specifier_methods):
+	* strftime.c (add_num_time_t):
+	* sunplay.c (init_device):
+	* symbols.c (Fsetplist):
+	* symbols.c (do_symval_forwarding):
+	* symbols.c (store_symval_forwarding):
+	* symbols.c (Fset):
+	* symbols.c (Fbuilt_in_variable_type):
+	* symbols.c (decode_magic_handler_type):
+	* symbols.c (handler_type_from_function_symbol):
+	* syntax.c (update_syntax_cache):
+	* sysdep.c (init_baud_rate):
+	* toolbar-gtk.c (SET_TOOLBAR_WAS_VISIBLE_FLAG):
+	* toolbar-msw.c (SET_TOOLBAR_WAS_VISIBLE_FLAG):
+	* toolbar-x.c (SET_TOOLBAR_WAS_VISIBLE_FLAG):
+	* toolbar.c (get_toolbar_coords):
+	* ui-gtk.c (build_gtk_boxed):
+	* ui-gtk.c (describe_gtk_arg):
+	* ui-gtk.c (gtk_type_to_lisp):
+	* ui-gtk.c (lisp_to_gtk_type):
+	* ui-gtk.c (lisp_to_gtk_ret_type):
+	* ui-gtk.c (lisp_to_flag):
+	* unexnt.c (read_in_bss):
+	* unexnt.c (map_in_heap):
+	* window.c (real_window):
+	* window.c (window_display_lines):
+	* window.c (window_display_buffer):
+	* window.c (set_window_display_buffer):
+	* window.c (window_modeline_height):
+	* window.c (unshow_buffer):
+	* window.c (window_loop):
+	* window.c (Fget_lru_window):
+	* window.c (Fsplit_window):
+	* window.c (Fset_window_configuration):
+	* window.c (saved_window_index):
+	* xgccache.c (gc_cache_lookup):
+	abort() -> ABORT().  Eliminate preprocessor games with abort()
+	since it creates huge problems in VC7, solvable only by including
+	massive amounts of files in every compile (and not worth it).
+
+	* sysdep.c:
+	* sysproc.h:
+	Inclusion of process.h does not need to be before lisp.h any more.
+	Move later and remove comment about abort().
+
 2005-01-26  Arnaud Giersch  <arnaud.giersch@free.fr>
 
 	* regex.c (re_match_2_internal):
   struct frame *f = ew->emacs_frame.frame;
 
   if (! XtIsSubclass (w, emacsFrameClass))
-    abort ();
+    ABORT ();
 
   default_face_height_and_width (make_frame (f), &ch, &cw);
   if (FRAME_X_TOP_LEVEL_FRAME_P (f))

src/EmacsShell-sub.c

 #include <X11/VendorP.h>
 #include "EmacsShellP.h"
 
+#define ABORT abort
+
 #if defined (DEFINE_TOP_LEVEL_EMACS_SHELL)
 #define EMACS_SHELL_WIDGET TopLevelEmacsShellWidget
 #define SUPERCLASS_WIDGET_CLASS topLevelShellWidgetClass
     }
 
   if (!gcer)
-    abort ();
+    ABORT ();
 
   /* call it to actually make the geometry request */
   scer = (ShellClassExtensionRec *) gcer;
   XtGeometryResult result;
 
   if (reentrant)
-    abort ();
+    ABORT ();
   reentrant++;
 
 #ifdef DEBUG_GEOMETRY_MANAGEMENT
 #include "EmacsShell.h"
 #include "ExternalShell.h"
 
+#define ABORT abort
+
 #if 0 /* Not currently used */
 
 /* The root_geometry_manager() method in Shell.c is fucked up with regard
     TopLevelEmacsShellUpdateSizeHints (gw);
 #ifdef EXTERNAL_WIDGET
   else if (XtIsSubclass (gw, externalShellWidgetClass))
-    /* do what ??? Don't abort! */;
+    /* do what ??? Don't ABORT! */;
 #endif
   else if (XtIsSubclass (gw, transientEmacsShellWidgetClass))
     TransientEmacsShellUpdateSizeHints (gw);
   else
-    abort ();
+    ABORT ();
 }

src/Makefile.in.in

 
 cppflags = $(CPPFLAGS) -Demacs -I. $(c_switch_all)
 cflags   = $(CFLAGS) $(cppflags)
-#if defined (WIN32_NATIVE) || defined (CYGWIN)
+#if defined (WIN32_NATIVE)
 ldflags  = $(LDFLAGS) -mwindows -e _mainCRTStartup $(ld_switch_all) $(ld_dynamic_link_flags)
-# if defined (CYGWIN)
-ldflags += -Wl,--script=s/cygwin.sc
-# endif
 #else
 ldflags  = $(LDFLAGS) $(ld_switch_all) $(ld_dynamic_link_flags)
 #endif
 
+#if defined (CYGWIN) && !defined (PDUMP)
+ldflags += -Wl,--script=s/cygwin.sc
+#endif
+
 #ifdef SOLARIS2
 %.o : %.c
 #else
 	      break;
 	    }
 	  else if (next == 0)
-	    abort ();
+	    ABORT ();
 	  else
 	    header = next;
 	}
      a fatal error if "trailer" is null.  */
 
   if (trailer == 0)
-    abort ();
+    ABORT ();
 
   /* Discard segments that do not contain our argument address.  */
 
       block = (long *) trailer->this_address;
       size = trailer->this_size;
       if (block == 0 || size == 0)
-	abort ();
+	ABORT ();
       trailer = (struct stk_trailer *) trailer->link;
       if ((block <= address) && (address < (block + size)))
 	break;
   do
     {
       if (trailer->this_size <= 0)
-	abort ();
+	ABORT ();
       result += trailer->this_size;
       trailer = (struct stk_trailer *) trailer->link;
     }
   Lisp_Object cons = Frassq (buf, Vbuffer_alist);
   Lisp_Object frmcons, devcons, concons;
   if (NILP (cons))
-    return; /* abort() ? */
+    return; /* ABORT() ? */
   Vbuffer_alist = delq_no_quit (cons, Vbuffer_alist);
 
   FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
   if ((XINT (buffer_local_flags.slot) != -2 &&			\
        XINT (buffer_local_flags.slot) != -3)			\
       != !(NILP (XBUFFER (Vbuffer_local_symbols)->slot)))	\
-  abort ()
+  ABORT ()
 #include "bufslots.h"
 #undef MARKED_SLOT
 
       }
 
     default:
-      abort();
+      ABORT();
       break;
     }
   return stack_ptr;
 		break;
 
 	    default:
-	      abort();
+	      ABORT();
 	      break;
 	    }
 	}
       program = alloca_array (Opbyte, 1 + 2 * XSTRING_LENGTH (f->instructions));
       optimize_byte_code (f->instructions, f->constants,
 			  program, &program_length, &varbind_count);
-      f->specpdl_depth = XINT (Flength (f->arglist)) + varbind_count;
+      f->specpdl_depth = (unsigned short) (XINT (Flength (f->arglist)) +
+                                           varbind_count);
       f->instructions =
 	make_opaque (program, program_length * sizeof (Opbyte));
     }
       f->constants    = XCDR (tem);
       return function;
     }
-  abort ();
+  ABORT ();
   return Qnil; /* not reached */
 }
 
 {
   switch (type)
   {
-  default: abort();
+  default: ABORT();
   case CHAR_TABLE_TYPE_GENERIC:  return Qgeneric;
   case CHAR_TABLE_TYPE_SYNTAX:   return Qsyntax;
   case CHAR_TABLE_TYPE_DISPLAY:  return Qdisplay;
       break;
 
     default:
-      abort ();
+      ABORT ();
     }
 
   return Qnil;
 	  check_int_range (outrange->row, 32, 127);
 	  break;
 	default:
-	  abort ();
+	  ABORT ();
 	}
     }
   else
 #endif /* not MULE */
 
     default:
-      abort ();
+      ABORT ();
     }
 
   return Qnil; /* not reached */
       break;
 
     default:
-      abort ();
+      ABORT ();
     }
 
   return 0; /* not reached */
       }
 
     default:
-      abort ();
+      ABORT ();
     }
 
   return 0;
       ranjarg = make_char (range->ch);
       break;
     default:
-      abort ();
+      ABORT ();
     }
 
   closure->retval = call2 (closure->function, ranjarg, val);
 		 Fput_char_table (make_char (i), val, chartab);
 	    }
 	  else
-	    abort ();
+	    ABORT ();
 	}
       else
 	Fput_char_table (range, val, chartab);
   if (curX == FrameCols)
     {
       if (!MagicWrap || curY >= FrameRows - 1)
-	abort ();
+	ABORT ();
       if (termscript)
 	putc ('\r', termscript);
       putchar ('\r');

src/console-msw.c

 /*
  * Random helper functions for debugging.
  * Intended for use in the MSVC "Watch" window which doesn't like
- * the aborts that the error_check_foo() functions can make.
+ * the ABORTs that the error_check_foo() functions can make.
  */
 struct lrecord_header *DHEADER (Lisp_Object obj);
 struct lrecord_header *
   if ((XINT (console_local_flags.slot) != -2 &&			\
          XINT (console_local_flags.slot) != -3)			\
       != !(NILP (XCONSOLE (Vconsole_local_symbols)->slot)))	\
-  abort ()
+  ABORT ()
 #include "conslots.h"
 #undef MARKED_SLOT
 }
 	      break;
 
 	    default:
-	      abort ();
+	      ABORT ();
 	    }
 
 	  if (need_to_mark_elem && ! marked_p (elem))
     case WEAK_LIST_VALUE_ASSOC: return Qvalue_assoc;
     case WEAK_LIST_FULL_ASSOC:  return Qfull_assoc;
     default:
-      abort ();
+      ABORT ();
     }
 
   return Qnil; /* not reached */
 	    stderr_out ("Assertion failed in %s at line %d\n",		\
 			__FILE__, __LINE__);		       		\
 	  else								\
-	    abort ();							\
+	    ABORT ();							\
 	}								\
     }									\
 } while (0)
   XSETDEVICE (device, d);
 
   /* gtk_init() and even gtk_check_init() are so brain dead that
-     getting an empty argv array causes them to abort. */
+     getting an empty argv array causes them to ABORT. */
   if (NILP (Vgtk_initial_argv_list))
     {
       signal_simple_error ("gtk-initial-argv-list must be set before creating Gtk devices", Vgtk_initial_argv_list);
   if (EQ (prop, Qright_margin)) return 1440;
   if (EQ (prop, Qtop_margin)) return 720;
   if (EQ (prop, Qbottom_margin)) return 720;
-  abort ();
+  ABORT ();
   return 0;
 }
 
     case TTY_INIT_SUCCESS:
       break;
     default:
-      abort ();
+      ABORT ();
     }
 
   init_one_device (d);
        (STRINGP (Vinvocation_name) ?
 	(char *) XSTRING_DATA (Vinvocation_name) : FALLBACK_RESOURCE_NAME),
        DisplayString (dpy) ? DisplayString (dpy) : "???");
-    abort();
+    ABORT();
   }
 
 #undef FALLBACK_RESOURCE_NAME
   vi_in.visualid = XVisualIDFromVisual (visual);
   vi_out = XGetVisualInfo (dpy, /*VisualScreenMask|*/VisualIDMask,
 			   &vi_in, &out_count);
-  if (! vi_out) abort ();
+  if (! vi_out) ABORT ();
   d = vi_out [0].depth;
   XFree ((char *) vi_out);
   return d;
 		case ' ': spec.space_flag  = 1; break;
 		case '#': spec.number_flag = 1; break;
 		case '0': spec.zero_flag   = 1; break;
-		default: abort ();
+		default: ABORT ();
 		}
 	      NEXT_ASCII_BYTE (ch);
 	    }
 	arg.d = va_arg (vargs, double);
       else if (strchr (string_converters, ch))
 	arg.bp = va_arg (vargs, Bufbyte *);
-      else abort ();
+      else ABORT ();
 
       Dynarr_add (args, arg);
     }
       stderr_out ("Unsupported count type : %d (line = %d, code=%ld)\n",
 		  idesc[line].type, line, (long)code);
       pdump_backtrace ();
-      abort ();
+      ABORT ();
     }
   count += delta;
   return count;
 	default:
 	  stderr_out ("Unsupported dump type : %d\n", desc[pos].type);
 	  pdump_backtrace ();
-	  abort ();
+	  ABORT ();
 	};
     }
 }
       if (me>65536)
 	{
 	  stderr_out ("Backtrace overflow, loop ?\n");
-	  abort ();
+	  ABORT ();
 	}
       backtrace[me].obj = objh;
       backtrace[me].position = 0;
       if (me>65536)
 	{
 	  stderr_out ("Backtrace overflow, loop ?\n");
-	  abort ();
+	  ABORT ();
 	}
       backtrace[me].obj = 0;
       backtrace[me].position = 0;
 		  }
 		default:
 		  stderr_out ("Unsupported dump type : %d\n", desc[pos].type);
-		  abort ();
+		  ABORT ();
 		}
 	    }
 	}
 	  }
 	default:
 	  stderr_out ("Unsupported dump type : %d\n", desc[pos].type);
-	  abort ();
+	  ABORT ();
 	};
     }
 }
   else if (ht->test_function == lisp_object_eql_equal)
     DO_NOTHING;
   else
-    abort ();
+    ABORT ();
 
   if (ht->count || !print_readably)
     {
       break;
 
     default:
-      abort ();
+      ABORT ();
     }
 
   return make_general_lisp_hash_table (hash_function, test_function,
       else if (EQ (key, Qdata))		    data	     = value;
       else if (EQ (key, Qtype))/*obsolete*/ weakness	     = value;
       else
-	abort ();
+	ABORT ();
     }
 
   /* Create the hash table.  */
 Cause XEmacs to enter the debugger.
 On some systems, there may be no way to do this gracefully; if so,
 nothing happens unless ABORT is non-nil, in which case XEmacs will
-abort() -- a sure-fire way to immediately get back to the debugger,
+ABORT() -- a sure-fire way to immediately get back to the debugger,
 but also a sure-fire way to kill XEmacs (and dump core on Unix
 systems)!
 */
 {
   debugging_breakpoint ();
   if (!NILP (abort_))
-    abort ();
+    ABORT ();
   return Qnil;
 }
 
 	}
 
       if (best < 0)
-	abort ();
+	ABORT ();
 
       /* Copy the highest priority remaining option, with its args, to NEW_ARGV.  */
       new_argv[to++] = argv[best];
     {
 #ifdef DOUG_LEA_MALLOC
       if (mallopt (M_MMAP_MAX, 0) != 1)
-	abort();
+	ABORT();
 #endif
       run_temacs_argc = 0;
       if (! SETJMP (run_temacs_catch))
       if (rc != 0)
 	{
 	  stderr_out ("malloc_set_state failed, rc = %d\n", rc);
-	  abort ();
+	  ABORT ();
 	}
 #if 0
       free (malloc_state_ptr);
     (defined(__GLIBC__) && __GLIBC_MINOR__ < 1 && !defined(MULE)) || \
     defined(DEBUG_DOUG_LEA_MALLOC)
       if(mallopt (M_MMAP_MAX, 0) != 1)
-	abort();
+	ABORT();
 #endif
 #ifdef REL_ALLOC
       r_alloc_reinit ();
 #undef fprintf
 #endif
 
-#undef abort	/* avoid infinite #define loop... */
-
 #if defined (WIN32_NATIVE) && defined (DEBUG_XEMACS)
 #define enter_debugger() DebugBreak ()
 #else
 
   enter_debugger ();
 #if !defined (ASSERTIONS_DONT_ABORT)
-  abort ();
+  abort (); /* The real abort(), this time */
 #endif
   inhibit_non_essential_printing_operations = 0;
   in_assert_failed = 0;
 #ifdef DEFEND_AGAINST_THROW_RECURSION
   /* die if we recurse more than is reasonable */
   if (++throw_level > 20)
-    abort();
+    ABORT();
 #endif
 
   /* If bomb_out_p is t, this is being called from Fsignal as a
       /* let's not use stderr_out() here, because that does a bunch of
 	 things that might not be safe yet. */
       fprintf (stderr, "Error before initialization is complete!\n");
-      abort ();
+      ABORT ();
     }
 
   if (gc_in_progress || in_display)
     /* This is one of many reasons why you can't run lisp code from redisplay.
        There is no sensible way to handle errors there. */
-    abort ();
+    ABORT ();
 
   conditions = Fget (sig, Qerror_conditions, Qnil);
 
 	warn_when_safe_lispobj (Vcurrent_warning_class, Qwarning,
 				Fcons (error_symbol, data));
       Fthrow (Qunbound_suspended_errors_tag, Qnil);
-      abort (); /* Better not get here! */
+      ABORT (); /* Better not get here! */
     }
   RETURN_UNGCPRO (signal_1 (error_symbol, data));
 }
     case MappingKeyboard:  x_reset_key_mapping      (d); break;
     case MappingModifier:  x_reset_modifier_mapping (d); break;
     case MappingPointer:   /* Do something here? */      break;
-    default: abort();
+    default: ABORT();
     }
 }
 
 	  return;
 	}
     }
-  abort ();
+  ABORT ();
 }
 
 static void
 
 /* JH: We use this because I think there's a possibility this
    is called before the device is properly set up, in which case
-   I don't want to abort. */
+   I don't want to ABORT. */
 extern struct device *get_device_from_display_1 (Display *dpy);
 
 static
  * Timeout event matches if interval_id is equal to that of the given event.
  * Keypress event matches if logical AND between modifiers bitmask of the
  * event in the queue and that of the given event is non-zero.
- * For all other event types, this function aborts.
+ * For all other event types, this function ABORTs.
  */
 
 Lisp_Object

src/event-stream.c

 	case EVENT_STREAM_READ:
 	  error ("Can't read events in -batch mode");
 	default:
-	  abort ();
+	  ABORT ();
 	}
     }
   else if (!event_stream)
   Lisp_Object lid;
   id = event_stream_generate_wakeup (msecs, msecs2, function, object, 0);
   lid = make_int (id);
-  if (id != XINT (lid)) abort ();
+  if (id != XINT (lid)) ABORT ();
   return lid;
 }
 
   Lisp_Object lid;
   id = event_stream_generate_wakeup (msecs, msecs2, function, object, 1);
   lid = make_int (id);
-  if (id != XINT (lid)) abort ();
+  if (id != XINT (lid)) ABORT ();
   return lid;
 }
 
     }
 
   if (!NILP (command_event_queue) || !NILP (command_event_queue_tail))
-    abort ();
+    ABORT ();
 
   /* Now tack our chain of events back on to the front of the queue.
      Actually, since the queue is now drained, we can just replace it.
 	return;
       }
     default:
-      abort ();
+      ABORT ();
     }
 }
 
     Lisp_Object e = XVECTOR_DATA (Vrecent_keys_ring)[j];
 
     if (NILP (e))
-      abort ();
+      ABORT ();
     XVECTOR_DATA (val)[i] = Fcopy_event (e, Qnil);
     if (++j >= recent_keys_ring_size)
       j = 0;
 	{
 	  if (!n)
 	    {
-	      /* must copy to avoid an abort() in next_event_internal() */
+	      /* must copy to avoid an ABORT() in next_event_internal() */
 	      if (!NILP (XEVENT_NEXT (event)))
                 return Fcopy_event (event, Qnil);
 	      else
 		 || e->event_type == button_release_event)
 	  e->event.button.modifiers |= XEMACS_MOD_META;
 	else
-	  abort ();
+	  ABORT ();
 
 	{
 	  int tckn = event_chain_count (Vthis_command_keys);

src/event-unixoid.c

 	return retval;
       if (errno != EINTR)
 	{
-	  /* Something went seriously wrong; don't abort since maybe
+	  /* Something went seriously wrong; don't ABORT since maybe
 	     the TTY just died at the wrong time. */
 	  stderr_out ("xemacs: select failed: errno = %d\n", errno);
 	  return 0;
 #include "device.h"
 #include "console-x.h"	/* for x_event_name prototype */
 #include "console-gtk.h" /* for gtk_event_name prototype */
-#include "extents.h"	/* Just for the EXTENTP abort check... */
+#include "extents.h"	/* Just for the EXTENTP ABORT check... */
 #include "events.h"
 #include "frame.h"
 #include "glyphs.h"
     case dead_event:
       break;
     default:
-      abort ();
+      ABORT ();
     }
   mark_object (event->channel);
   return event->next;
 /*  if (e1->timestamp != e2->timestamp) return 0; */
   switch (e1->event_type)
     {
-    default: abort ();
+    default: ABORT ();
 
     case process_event:
       return EQ (e1->event.process.process, e2->event.process.process);
 			  &e2->event.magic.underlying_mswindows_event,
 			  sizeof (union magic_data)));
 #endif
-	abort ();
+	ABORT ();
 	return 1; /* not reached */
       }
 
 	if (CONSOLE_MSWINDOWS_P (con))
 	  return HASH2 (hash, e->event.magic.underlying_mswindows_event);
 #endif
-	abort ();
+	ABORT ();
 	return 0;
       }
 
       return hash;
 
     default:
-      abort ();
+      ABORT ();
     }
 
   return 0; /* unreached */
 	  e->event.misc.y = coord_y;
 	  break;
 	default:
-	  abort();
+	  ABORT();
 	}
     }
 
     if (EQ (event, Vlast_command_event) ||
 	EQ (event, Vlast_input_event)   ||
 	EQ (event, Vunread_command_event))
-      abort ();
+      ABORT ();
 
     len = XVECTOR_LENGTH (Vthis_command_keys);
     for (i = 0; i < len; i++)
       if (EQ (event, XVECTOR_DATA (Vthis_command_keys) [i]))
-	abort ();
+	ABORT ();
     if (!NILP (Vrecent_keys_ring))
       {
 	int recent_ring_len = XVECTOR_LENGTH (Vrecent_keys_ring);
 	for (i = 0; i < recent_ring_len; i++)
 	  if (EQ (event, XVECTOR_DATA (Vrecent_keys_ring) [i]))
-	    abort ();
+	    ABORT ();
       }
   }
 #endif /* 0 */
 
 /* Return the last event in a chain.
    NOTE: You cannot pass nil as a value here!  The routine will
-   abort if you do. */
+   ABORT if you do. */
 
 Lisp_Object
 event_chain_tail (Lisp_Object event_chain)
   return n;
 }
 
-/* Find the event before EVENT in an event chain.  This aborts
+/* Find the event before EVENT in an event chain.  This ABORTs
    if the event is not in the chain. */
 
 Lisp_Object
       event_chain = XEVENT_NEXT (event_chain);
     }
 
-  abort ();
+  ABORT ();
   return Qnil;
 }
 
   if (CHAR_OR_CHAR_INTP (event->event.key.keysym))
     c = XCHAR_OR_CHAR_INT (event->event.key.keysym);
   else if (!SYMBOLP (event->event.key.keysym))
-    abort ();
+    ABORT ();
   else if (allow_non_ascii && !NILP (Vcharacter_set_property)
 	   /* Allow window-system-specific extensibility of
 	      keysym->code mapping */
     case empty_event:		strcpy (buf, "empty");	    return;
     case dead_event:		strcpy (buf, "DEAD-EVENT"); return;
     default:
-      abort ();
+      ABORT ();
       return;
     }
 #define modprint1(x)  do { strcpy (buf, (x)); buf += sizeof (x)-1; } while (0)
 	}
     }
   else
-    abort ();
+    ABORT ();
   if (mouse_p)
     strncpy (buf, "up", 4);
 }
       return Qempty;
 
     default:
-      abort ();
+      ABORT ();
       return Qnil;
     }
 }
 			    || TOOLBAR_BUTTONP (ret_obj1)
 #endif
      ))
-    abort ();
+    ABORT ();
   if (!NILP (ret_obj2) && !(EXTENTP (ret_obj2) || CONSP (ret_obj2)))
-    abort ();
+    ABORT ();
 
   if (char_x)
     *char_x = ret_x;
 
   switch (e->event_type)
     {
-    default: abort ();
+    default: ABORT ();
 
     case process_event:
       props = cons3 (Qprocess, e->event.process.process, props);
       case ME_ALL_EXTENTS_OPEN:        start_open = 1, end_open = 1; break;
       case ME_ALL_EXTENTS_CLOSED_OPEN: start_open = 0, end_open = 1; break;
       case ME_ALL_EXTENTS_OPEN_CLOSED: start_open = 1, end_open = 0; break;
-      default: abort(); return 0;
+      default: ABORT(); return 0;
       }
 
   start = buffer_or_string_bytind_to_startind (obj, from,
 	retval = (start <= exs && exs <= end) || (start <= exe && exe <= end);
 	break;
       default:
-	abort(); return 0;
+	ABORT(); return 0;
       }
   return flags & ME_NEGATE_IN_REGION ? !retval : retval;
 }
       Lisp_Object obj2 = Qnil;
 
       /* Destroyed extents have 't' in the object field, causing
-	 extent_object() to abort (maybe). */
+	 extent_object() to ABORT (maybe). */
       if (EXTENT_LIVE_P (XEXTENT (obj)))
 	obj2 = extent_object (XEXTENT (obj));
 
 #ifdef ERROR_CHECK_EXTENTS
   if (extent_start (extent) > indice &&
       extent_start (extent) < indice + closure->length)
-    abort ();
+    ABORT ();
   if (extent_end (extent) > indice &&
       extent_end (extent) < indice + closure->length)
-    abort ();
+    ABORT ();
 #endif
 
   /* The extent-adjustment code adjusted the extent's endpoints as if
      unbind_to (closure.speccount, Qnil).  This is because
      map_extents_bytind() unbinds before, and with a smaller
      speccount.  The additional unbind_to() in
-     report_extent_modification() would cause XEmacs to abort.  */
+     report_extent_modification() would cause XEmacs to ABORT.  */
   if (closure->speccount == -1)
     {
       closure->speccount = specpdl_depth ();
     case GL_INSIDE_MARGIN:  return Qinside_margin;
     case GL_WHITESPACE:	    return Qwhitespace;
     default:
-      abort ();
+      ABORT ();
       return Qnil; /* unreached */
     }
 }
       if (EQ (keyw, Qname))
 	name_seen = 1;
       else
-	abort ();
+	ABORT ();
     }
 
   if (!name_seen)

src/file-coding.c

 {
   switch (type)
     {
-    default: abort ();
+    default: ABORT ();
     case EOL_LF:         return Qlf;
     case EOL_CRLF:       return Qcrlf;
     case EOL_CR:         return Qcr;
     case EOL_LF:   new_coding_system = CODING_SYSTEM_EOL_LF   (cs); break;
     case EOL_CR:   new_coding_system = CODING_SYSTEM_EOL_CR   (cs); break;
     case EOL_CRLF: new_coding_system = CODING_SYSTEM_EOL_CRLF (cs); break;
-    default:       abort (); return Qnil;
+    default:       ABORT (); return Qnil;
     }
 
   return NILP (new_coding_system) ? coding_system : new_coding_system;
 {
   switch (XCODING_SYSTEM_TYPE (Fget_coding_system (coding_system)))
     {
-    default: abort ();
+    default: ABORT ();
     case CODESYS_AUTODETECT:	return Qundecided;
 #ifdef MULE
     case CODESYS_SHIFT_JIS:	return Qshift_jis;
 	    break;
 #endif /* MULE */
 	  default:
-	    abort ();
+	    ABORT ();
 	  }
       }
 
 	  unparse_charset_conversion_specs
 	    (XCODING_SYSTEM (coding_system)->iso2022.output_conv);
       else
-	abort ();
+	ABORT ();
     }
   else if (type == CODESYS_CCL)
     {
       else if (EQ (prop, Qencode))
 	return XCODING_SYSTEM_CCL_ENCODE (coding_system);
       else
-	abort ();
+	ABORT ();
     }
 #endif /* MULE */
   else
-    abort ();
+    ABORT ();
 
   return Qnil; /* not reached */
 }
       break;
 #endif /* MULE */
     default:
-      abort ();
+      ABORT ();
     }
 }
 
       break;
 #endif /* MULE */
     default:
-      abort ();
+      ABORT ();
     }
 }
 
 		    }
 		  break;
 		default:
-		  abort ();
+		  ABORT ();
 		}
 	    }
 	}
 		    }
 		  break;
 		default:
-		  abort ();
+		  ABORT ();
 		}
 	    }
 	}
 	else
 	  {
 	    /* Can this ever be reached? -slb */
-	    abort();
+	    ABORT();
 	    return 0;
 	  }
 
 		  break;
 
 		default:
-		  abort ();
+		  ABORT ();
 		}
 	    }
 	  char_boundary = 0;
 		    }
 		  break;
 		default:
-		  abort ();
+		  ABORT ();
 		}
 	    }
 	}
    and if so, tries to avoid touching lisp objects.
 
    The only time that Fdo_auto_save() is called while GC is in progress
-   is if we're going down, as a result of an abort() or a kill signal.
+   is if we're going down, as a result of an ABORT() or a kill signal.
    It's fairly important that we generate autosave files in that case!
  */
 
         break;
       default:
 	val = Qnil;
-        abort ();
+        ABORT ();
       }
   }
 
     }
   else
     {
-      abort (); /* unreachable, since Flength (sequence) did not get
+      ABORT (); /* unreachable, since Flength (sequence) did not get
                    an error */
       return Qnil;
     }
 	}
     }
   else
-    abort (); /* unreachable, since Flength (sequence) did not get an error */
+    ABORT (); /* unreachable, since Flength (sequence) did not get an error */
 
   if (vals)
     UNGCPRO;
   encoded_length = base64_encode_1 (XLSTREAM (input), encoded,
 				    NILP (no_line_break));
   if (encoded_length > allength)
-    abort ();
+    ABORT ();
   Lstream_delete (XLSTREAM (input));
 
   /* Now we have encoded the region, so we insert the new contents
   encoded_length = base64_encode_1 (XLSTREAM (input), encoded,
 				    NILP (no_line_break));
   if (encoded_length > allength)
-    abort ();
+    ABORT ();
   Lstream_delete (XLSTREAM (input));
   result = make_string (encoded, encoded_length);
   XMALLOC_UNBIND (encoded, allength, speccount);
   XMALLOC_OR_ALLOCA (decoded, length * MAX_EMCHAR_LEN, Bufbyte);
   decoded_length = base64_decode_1 (XLSTREAM (input), decoded, &cc_decoded_length);
   if (decoded_length > length * MAX_EMCHAR_LEN)
-    abort ();
+    ABORT ();
   Lstream_delete (XLSTREAM (input));
 
   /* Now we have decoded the region, so we insert the new contents
   decoded_length = base64_decode_1 (XLSTREAM (input), decoded,
 				    &cc_decoded_length);
   if (decoded_length > length * MAX_EMCHAR_LEN)
-    abort ();
+    ABORT ();
   Lstream_delete (XLSTREAM (input));
 
   result = make_string (decoded, decoded_length);
 	      context_cache.context = context_comment;
 	      context_cache.ccontext = ccontext_none;
 	      context_cache.style = SINGLE_SYNTAX_STYLE (syncode);
-	      if (context_cache.style == comment_style_none) abort ();
+	      if (context_cache.style == comment_style_none) ABORT ();
 	    }
 	  break;
 
 	{
 	  context_cache.ccontext = ccontext_start2;
 	  context_cache.style = SYNTAX_START_STYLE (prev_syncode, syncode);
-	  if (context_cache.style == comment_style_none) abort ();
+	  if (context_cache.style == comment_style_none) ABORT ();
 	}
       else if ((SYNTAX_CODE_COMMENT_BITS (syncode) &
 		SYNTAX_FIRST_CHAR_START) &&
 	   comment-end sequence. ie, '/xxx foo xxx/' or '/xxx foo x/',
 	   where 'x' = '*' -- mct */
 	{
-	  if (context_cache.style == comment_style_none) abort ();
+	  if (context_cache.style == comment_style_none) ABORT ();
 	  context_cache.ccontext = ccontext_end1;
 	}
 
       else if (context_cache.ccontext == ccontext_start1)
 	{
-	  if (context_cache.context != context_none) abort ();
+	  if (context_cache.context != context_none) ABORT ();
 	  context_cache.ccontext = ccontext_none;
 	}
       else if (context_cache.ccontext == ccontext_end1)
 	{
-	  if (context_cache.context != context_block_comment) abort ();
+	  if (context_cache.context != context_block_comment) ABORT ();
 	  context_cache.context = context_none;
 	  context_cache.ccontext = ccontext_start2;
 	}
 	  context_cache.context == context_none)
 	{
 	  context_cache.context = context_block_comment;
-	  if (context_cache.style == comment_style_none) abort ();
+	  if (context_cache.style == comment_style_none) ABORT ();
 	}
       else if (context_cache.ccontext == ccontext_none &&