Sync to HEAD

18 files changed, 93 insertions, 3 deletions

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 04085168558..2950be8843d 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,35 @@
+2003-09-22  Eli Zaretskii  <eliz@gnu.org>
+
+	* mainmake.v2 (man lispref lispintro): Specify an explicit target
+	`info', like Makefile.in does.
+
+2003-08-31  Eli Zaretskii  <eliz@gnu.org>
+
+	* sed3v2.inp (srcdir): Use "command.com /c cd" to produce an
+	absolute file name of the current working directory.  This avoids
+	the warning from Make about circular dependencies.
+
+2003-08-30  Eli Zaretskii  <eliz@gnu.org>
+
+	* sedlisp.inp: Set FNCASE=y for all targets in the lisp directory,
+	so that CVS etc. file names are filtered out of the list of
+	subdirectories.
+
+2003-08-28  Eli Zaretskii  <eliz@gnu.org>
+
+	* sed6.inp (elisp.dvi, index.texi): Replace Unix shell commands
+	with equivalent COMMAND.COM commands.
+
+2003-08-24  Eli Zaretskii  <eliz@gnu.org>
+
+	* sed3v2.inp (EXEEXT): Define to an empty string.
+
+	* sed1v2.inp (EXEEXT): Define to an empty string.
+	Remove src/emacs after producing b-emacs.exe.
+
+	* sed2v2.inp (HAVE_DIFFTIME, HAVE_MEMCMP, HAVE_MEMMOVE)
+	(HAVE_SIZE_T): Define.
+
 2002-04-16  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* sed2v2.inp: New file.
@@ -530,3 +562,5 @@
 	Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
+
+;;; arch-tag: b602fbb5-3776-4053-8de2-03da33c29d44
diff --git a/msdos/is_exec.c b/msdos/is_exec.c
index 899c574af0d..4da0ec35c56 100644
--- a/msdos/is_exec.c
+++ b/msdos/is_exec.c
@@ -220,3 +220,6 @@ _is_executable(const char *filename, int fhandle, const char *extension)
 
   return 0;
 }
+
+/* arch-tag: b0965811-8c3e-4bc4-8d81-4447a3594785
+   (do not change this comment) */
diff --git a/msdos/mainmake b/msdos/mainmake
index 1111cdc5066..da45817e1a0 100644
--- a/msdos/mainmake
+++ b/msdos/mainmake
@@ -93,3 +93,5 @@ clean:
 	cd oldxmenu
 	-$(MAKE) clean
 	cd ..
+
+# arch-tag: d5a489bc-818e-4c3c-8040-b5205ed0602f
diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2
index 348e32f8814..0952380a202 100644
--- a/msdos/mainmake.v2
+++ b/msdos/mainmake.v2
@@ -93,7 +93,7 @@ src: FRC
 
 man lispref lispintro:	FRC
 	cd $@
-	$(MAKE) top_srcdir=${top_srcdir}
+	$(MAKE) top_srcdir=${top_srcdir} info
 	cd ..
 
 install: all
@@ -176,3 +176,5 @@ bootstrap-clean-before: FRC
 
 bootstrap-clean-after:
 	cd src; $(MAKE) $(MFLAGS) mostlyclean; cd ..
+
+# arch-tag: 6fee5130-4c53-46c6-93d3-d0ea852298b9
diff --git a/msdos/sed1.inp b/msdos/sed1.inp
index edc52b0e9c3..67257d9c9fe 100644
--- a/msdos/sed1.inp
+++ b/msdos/sed1.inp
@@ -53,3 +53,5 @@ ${libsrc}make-doc.exe:\
 /^temacs:/s/prefix-args//
 /^temacs:/s/stamp-oldxmenu//
 /^	#/d
+
+# arch-tag: 246725c1-79de-4d03-a080-8f19329fa35e
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 94c4ef83341..dc316819a5d 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -36,6 +36,7 @@ s/\.h\.in/.h-in/
 /^LIBOBJS *=/s/@[^@\n]*@/getloadavg.o/
 /^GETLOADAVG_LIBS *=/s/@[^@\n]*@//
 /^LIBSOUND *=/s/@LIBSOUND@//
+/^EXEEXT *=/s/@EXEEXT@//
 /^LN_S *=/s/@[^@\n]*@/ln -s/
 /^M_FILE *=/s!@[^@\n]*@!m/intel386.h!
 /^S_FILE *=/s!@[^@\n]*@!s/msdos.h!
@@ -60,5 +61,7 @@ s/bootstrap-doc/b-doc/
 /^	mv -f emacs/a\
 	stubify b-emacs\
 	stubedit b-emacs.exe minstack=1024k\
-	rm -f emacs.exe temacs.exe
+	rm -f emacs.exe temacs.exe emacs
 /^	rm -f/s/\\#/#/
+
+# arch-tag: c7e3aacb-4162-460e-99f9-4252bca68d2c
diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp
index dd9825de081..2a7ce82d528 100644
--- a/msdos/sed1x.inp
+++ b/msdos/sed1x.inp
@@ -6,3 +6,5 @@ s!^	@true *$!	@rem!
 s/DOC/DOC-X/g
 #/^LIBXMENU *=/s!= *!= ../oldxmenu/!
 /^temacs *:/s!OLDXMENU!LIBXMENU!
+
+# arch-tag: 3e8a78f2-3dec-44f3-81f6-3785a562da19
diff --git a/msdos/sed2.inp b/msdos/sed2.inp
index 9c3b8cbb3c3..4580f0e623e 100644
--- a/msdos/sed2.inp
+++ b/msdos/sed2.inp
@@ -52,3 +52,5 @@ s!^#undef config_opsysfile *$!#define config_opsysfile "s/msdos.h"!
 s!^#undef config_machfile *$!#define config_machfile "m/intel386.h"!
 s/^#undef PROTOTYPES *$/#define PROTOTYPES 1/
 s/^#undef POINTER_TYPE *$/#define POINTER_TYPE void/
+
+# arch-tag: 31840234-109a-41ab-a675-7a3844978299
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index adf2b6150fe..91df8a21225 100644
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -37,12 +37,16 @@
 /^#undef HAVE_FMOD *$/s/^.*$/#define HAVE_FMOD 1/
 /^#undef HAVE_RINT *$/s/^.*$/#define HAVE_RINT 1/
 /^#undef HAVE_CBRT *$/s/^.*$/#define HAVE_CBRT 1/
+/^#undef HAVE_DIFFTIME *$/s/^.*$/#define HAVE_DIFFTIME 1/
 /^#undef HAVE_FPATHCONF *$/s/^.*$/#define HAVE_FPATHCONF 1/
+/^#undef HAVE_MEMCMP *$/s/^.*$/#define HAVE_MEMCMP 1/
+/^#undef HAVE_MEMMOVE *$/s/^.*$/#define HAVE_MEMMOVE 1/
 /^#undef HAVE_SETRLIMIT *$/s/^.*$/#define HAVE_SETRLIMIT 1/
 /^#undef HAVE_TM_GMTOFF *$/s/^.*$/#define HAVE_TM_GMTOFF 1/
 /^#undef HAVE_MBLEN *$/s/^.*$/#define HAVE_MBLEN 1/
 /^#undef HAVE_STRUCT_TIMEZONE *$/s/^.*$/#define HAVE_STRUCT_TIMEZONE 1/
 /^#undef HAVE_INDEX *$/s/^.*$/#define HAVE_INDEX 1/
+/^#undef HAVE_SIZE_T *$/s/^.*$/#define HAVE_SIZE_T 1/
 /^#undef HAVE_RINDEX *$/s/^.*$/#define HAVE_RINDEX 1/
 /^#undef HAVE_MKSTEMP *$/s/^.*$/#define HAVE_MKSTEMP 1/
 /^#undef HAVE_STRUCT_TM_TM_ZONE *$/s/^.*$/#define HAVE_STRUCT_TM_TM_ZONE 1/
@@ -84,3 +88,5 @@ s/^#undef POINTER_TYPE *$/#define POINTER_TYPE void/
 # might be defined in sys/config.h we include at the top of config.h.
 /^#undef BSTRING/s|#undef|# undef|
 /^#undef .*$/s|^.*$|/* & */|
+
+# arch-tag: 2acb5571-ff53-4822-9175-95b864b59f7c
diff --git a/msdos/sed2x.inp b/msdos/sed2x.inp
index b702c0084ef..a1af086077f 100644
--- a/msdos/sed2x.inp
+++ b/msdos/sed2x.inp
@@ -22,3 +22,5 @@
 /^#undef HAVE_XSCREENNUMBEROFSCREEN *$/s/undef/define/
 /^#undef HAVE_XSETWMPROTOCOLS *$/s/undef/define/
 /^#undef HAVE_SELECT *$/s/undef/define/
+
+# arch-tag: 4a41c3ea-eb6c-4e17-8432-307516498e5a
diff --git a/msdos/sed3.inp b/msdos/sed3.inp
index a162e797bd0..6ae9c54eeaf 100644
--- a/msdos/sed3.inp
+++ b/msdos/sed3.inp
@@ -42,3 +42,5 @@ s!^	\./!	go32 ./!
 s!^	go32 ./test-distrib!	go32 ./test-dis!
 /-o make-docfile/a\
 	coff2exe make-docfile
+
+# arch-tag: cac6f5c7-3dbf-4e84-9d0c-44f0126f0ea8
diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp
index 77f51378301..657c2d4e5ff 100644
--- a/msdos/sed3v2.inp
+++ b/msdos/sed3v2.inp
@@ -24,15 +24,18 @@
 /^archlibdir *=/s!=.*$!=/emacs/bin!
 /^bindir *=/s!=.*$!=/emacs/bin!
 /^libdir *=/s!=.*$!=/emacs/bin!
-/^srcdir *=/s!=.*$!=.!
+/^srcdir=/s!srcdir=@srcdir@!srcdir := $(subst \\,/,$(shell command.com /c cd))!
 /^VPATH *=/s!=.*$!=.!
 /^CFLAGS *=/s!=.*$!=-O2 -g!
 /^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS!
 /^LOADLIBES *=/s!=.*$!=!
 /^ALLOCA *=/s!@ALLOCA@!!
+/^EXEEXT *=/s!@EXEEXT@!!
 /^INSTALLABLES/s/emacsclient *//
 s!^	\./!	!
 /^UTILITIES=/s/ wakeup//
 /^UTILITIES=/s/ movemail//
 /^UTILITIES=/s/ emacsserver//
 /^UTILITIES=/s/ timer//
+
+# arch-tag: 16f3be18-a45b-496c-b19c-e43840359de8
diff --git a/msdos/sed4.inp b/msdos/sed4.inp
index 6f239277ded..22588115382 100644
--- a/msdos/sed4.inp
+++ b/msdos/sed4.inp
@@ -20,3 +20,5 @@
 /^#define *PATH_DATA/s/".*"/rootrelativepath ("etc")/
 /^#define *PATH_DOC/s/".*"/rootrelativepath ("etc")/
 /^#define *PATH_INFO/s/".*"/rootrelativepath ("info")/
+
+# arch-tag: c84fa640-e434-4408-9e89-16d9e4ebe74e
diff --git a/msdos/sed5x.inp b/msdos/sed5x.inp
index 595017aaa80..6f05df8a26a 100644
--- a/msdos/sed5x.inp
+++ b/msdos/sed5x.inp
@@ -24,3 +24,5 @@
 /^CFLAGS *=/s/@[^@\n]*@/-O2 -g/
 /^LN_S *=/s/@[^@\n]*@/ln -s/
 s/|| true//
+
+# arch-tag: 612a79be-2a02-4cb0-8dec-779aac0a2f4f
diff --git a/msdos/sed6.inp b/msdos/sed6.inp
index eb82598bf5e..686d3aa92ae 100644
--- a/msdos/sed6.inp
+++ b/msdos/sed6.inp
@@ -27,3 +27,17 @@ export MAKEINFO := $(MAKEINFO) -I$(srcdir)
 texinputdir =\
 export texinputdir := $(srcdir)";"$(TEXINPUTS)
 /^SHELL *=/s/^/# /
+/^elisp.dvi:/,/^$/ {
+  /^	 *if \[ *\a${permuted_index}/,/^	 *fi *$/c\
+	command.com /c 'if not a${permuted_index}==a sh ./permute-index' \
+	command.com /c 'if not a${permuted_index}==a mv permuted.fns elisp.fns' \
+	command.com /c 'if not a${permuted_index}==a texindex elisp.tp' \
+	command.com /c 'if a${permuted_index}==a texindex elisp.??'
+}
+/^index.texi:/,/^$/ {
+  /^	 *if \[ *\a${permuted_index}/,/^	 *fi *$/c\
+	command.com /c 'if not a${permuted_index}==a cp -p ./index.perm index.texi' \
+	command.com /c 'if a${permuted_index}==a cp -p ./index.unperm index.texi'
+}
+
+# arch-tag: defe1001-f35a-47f7-9635-3f5d33ee5e97
diff --git a/msdos/sedleim.inp b/msdos/sedleim.inp
index af9cf9f3eda..ff9c6b73337 100644
--- a/msdos/sedleim.inp
+++ b/msdos/sedleim.inp
@@ -52,3 +52,5 @@ RUN-EMACS = ${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte
 install: all\
 
 /^	if test -f/d
+
+# arch-tag: 33c5eed1-78bc-4a6e-9d11-cbc7c541b763
diff --git a/msdos/sedlisp.inp b/msdos/sedlisp.inp
index e2d2b755613..26ce2082399 100644
--- a/msdos/sedlisp.inp
+++ b/msdos/sedlisp.inp
@@ -17,8 +17,13 @@
 #
 # ----------------------------------------------------------------------
 
+/^SHELL *=/i\
+export FNCASE=y
+
 /^lisp=/s|@srcdir@|.|
 /^VPATH=/s|@srcdir@|.|
 /^srcdir=/s|@srcdir@|.|
 /^bootstrap-clean:/a\
 	command.com /c dtou .../*.el
+
+# arch-tag: da7a3cff-4839-4ad7-bbe3-e2b61c84c38e
diff --git a/msdos/sigaction.c b/msdos/sigaction.c
index 5b3ae790813..0f4f09b2a99 100644
--- a/msdos/sigaction.c
+++ b/msdos/sigaction.c
@@ -36,3 +36,5 @@ sigaction(int _sig, const struct sigaction *_act, struct sigaction *_oact)
 
 
 
+/* arch-tag: 39526405-3d3a-44fe-af28-82a515e0c8e8
+   (do not change this comment) */