33 files changed, 16 insertions, 102 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 8ffc797a681..e6b6b4c2ef7 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,12 +1,3 @@
-2003-08-25  Takaaki Ota  <Takaaki.Ota@am.sony.com>  (tiny change)
-
-	* etags.c (consider_token): check C++ `operator' only when the
-	token len is long enough.
-
-2003-08-20  Dave Love  <fx@gnu.org>
-
-	* Makefile.in: Remove obsolete references to alloca.
-
 2003-07-29  Ken Brush  <ken@wirex.com>
 
 	* emacsclient.c (main)
@@ -5443,5 +5434,3 @@ Tue Jul  1 01:09:07 1997  Geoff Voelker  <voelker@cs.washington.edu>
 	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: 2d979296-954c-448e-95c1-b46d134513dc
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 7868364148a..1554b347113 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -27,6 +27,7 @@ SHELL = /bin/sh
 
 CC=@CC@
 CFLAGS=@CFLAGS@
+ALLOCA=@ALLOCA@
 version=@version@
 configuration=@configuration@
 EXEEXT=@EXEEXT@
@@ -144,6 +145,12 @@ MOVE_FLAGS=
 #define NOT_C_CODE
 #include "../src/config.h"
 
+/* We won't really call alloca;
+   don't let the file name alloca.c get messed up.  */
+#ifdef alloca
+#undef alloca
+#endif
+
 /* Some machines don\'t find the standard C libraries in the usual place.  */
 #ifndef ORDINARY_LINK
 #ifndef LIB_STANDARD_LIBSRC
@@ -382,12 +389,14 @@ test-distrib${EXEEXT}: ${srcdir}/test-distrib.c
 	$(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c
 	./test-distrib ${srcdir}/testfile
 
-GETOPTOBJS = getopt.o getopt1.o
+GETOPTOBJS = getopt.o getopt1.o $(ALLOCA)
 GETOPTDEPS = $(GETOPTOBJS) ${srcdir}/getopt.h
 getopt.o: ${srcdir}/getopt.c ${srcdir}/getopt.h
 	${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt.c
 getopt1.o: ${srcdir}/getopt1.c ${srcdir}/getopt.h
 	${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt1.c
+alloca.o: ${srcdir}/alloca.c
+	${CC} -Demacs -c ${BASE_CFLAGS} ${srcdir}/alloca.c
 
 #ifdef REGEXP_IN_LIBC
 REGEXPOBJ =
@@ -420,8 +429,8 @@ make-docfile${EXEEXT}: ${srcdir}/make-docfile.c ../src/config.h
 digest-doc${EXEEXT}: ${srcdir}/digest-doc.c
 	$(CC) ${ALL_CFLAGS} ${srcdir}/digest-doc.c $(LOADLIBES) -o digest-doc
 
-sorted-doc${EXEEXT}: ${srcdir}/sorted-doc.c
-	$(CC) ${ALL_CFLAGS} ${srcdir}/sorted-doc.c $(LOADLIBES) -o sorted-doc
+sorted-doc${EXEEXT}: ${srcdir}/sorted-doc.c ${ALLOCA}
+	$(CC) ${ALL_CFLAGS} ${srcdir}/sorted-doc.c ${ALLOCA} $(LOADLIBES) -o sorted-doc
 
 b2m${EXEEXT}: ${srcdir}/b2m.c ../src/config.h $(GETOPTDEPS)
 	$(CC) ${ALL_CFLAGS} ${srcdir}/b2m.c  -DVERSION="\"${version}\"" \
@@ -478,6 +487,3 @@ xveterm${EXEEXT}: ${srcdir}/emacstool.c
 	$(CC) -o xveterm -DXVIEW -DTTERM ${ALL_CFLAGS} ${srcdir}/emacstool.c \
 	  -lxview -lolgx -lX  -I$(OPENWINHOME)/include -L$(OPENWINHOME)/lib \
 	  $(LOADLIBES)
-
-/* arch-tag: cc40144d-fbd2-436b-9a22-dcb5b5b6a2af
-   (do not change this comment) */
diff --git a/lib-src/b2m.c b/lib-src/b2m.c
index 5a1f9e85473..05caa1424e0 100644
--- a/lib-src/b2m.c
+++ b/lib-src/b2m.c
@@ -301,5 +301,3 @@ fatal (message)
   exit (BAD);
 }
 
-/* arch-tag: 5a3ad2af-a802-408f-83cc-e7cf5e98653e
-   (do not change this comment) */
diff --git a/lib-src/b2m.pl b/lib-src/b2m.pl
index 38eb96e076f..86f9b948b32 100644
--- a/lib-src/b2m.pl
+++ b/lib-src/b2m.pl
@@ -30,7 +30,7 @@ use Mail::Address;
 use Date::Parse;
 
 my($whoami) = basename $0;
-my($version) = '$Revision: 1.5 $';
+my($version) = '$Revision: 1.4 $';
 my($usage) = "Usage: $whoami [--help] [--version] [--[no]full-headers] [Babyl-file]
 \tBy default, full headers are printed.\n";
 
@@ -152,5 +152,3 @@ while (<>) {
 }
 
 close(STDOUT) || die "$whoami: Error closing stdout: $!\n";
-
-# arch-tag: 8c7c8ab0-721c-46d7-ba3e-139801240aa8
diff --git a/lib-src/cvtmail.c b/lib-src/cvtmail.c
index 28a4ae4c703..5a4d3c70952 100644
--- a/lib-src/cvtmail.c
+++ b/lib-src/cvtmail.c
@@ -180,6 +180,3 @@ xrealloc (ptr, size)
     fatal ("virtual memory exhausted", 0);
   return result;
 }
-
-/* arch-tag: b93c25a9-9012-44f1-b78b-9cc7aed44a7a
-   (do not change this comment) */
diff --git a/lib-src/digest-doc.c b/lib-src/digest-doc.c
index 09878543d44..24d1348b0ee 100644
--- a/lib-src/digest-doc.c
+++ b/lib-src/digest-doc.c
@@ -65,6 +65,3 @@ main ()
     }
   return 0;
 }
-
-/* arch-tag: 2ba2c9b0-4157-4eba-bd9f-967e3677e35f
-   (do not change this comment) */
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index eeeb0eb3efd..611c0f74c7d 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -3975,6 +3975,3 @@ main (argc, argv)
 
 
 /* ebrowse.c ends here.  */
-
-/* arch-tag: fc03b4bc-91a9-4c3d-b3b9-12a77fa86dd8
-   (do not change this comment) */
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 2a53b162693..fc85ba67448 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -519,6 +519,3 @@ strerror (errnum)
 }
 
 #endif /* ! HAVE_STRERROR */
-
-/* arch-tag: f39bb9c4-73eb-477e-896d-50832e2ca9a7
-   (do not change this comment) */
diff --git a/lib-src/emacstool.c b/lib-src/emacstool.c
index f9185c21c08..dcbc20feeed 100644
--- a/lib-src/emacstool.c
+++ b/lib-src/emacstool.c
@@ -498,6 +498,3 @@ int interpose_on_window (argc, argv)
 	(tty_view, input_event_filter_function, NOTIFY_SAFE);
 }
 #endif XVIEW
-
-/* arch-tag: 7a2e7105-c059-418a-b3d9-5b5de96abb4e
-   (do not change this comment) */
diff --git a/lib-src/etags.c b/lib-src/etags.c
index e9fab1be3ee..9633cf37ad2 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -3116,7 +3116,7 @@ consider_token (str, len, c, c_extp, cblev, parlev, is_func_or_var)
 	      fvdef = vignore;
 	      return FALSE;
 	    }
-	  if (len >= 10 && strneq (str+len-10, "::operator", 10))
+	  if (strneq (str+len-10, "::operator", 10))
 	    {
 	      if (*c_extp & C_AUTO) /* automatic detection of C++ */
 		*c_extp = (*c_extp | C_PLPL) & ~C_AUTO;
@@ -6785,6 +6785,3 @@ xrealloc (ptr, size)
  * c-font-lock-extra-types: ("FILE" "bool" "language" "linebuffer" "fdesc" "node" "regexp")
  * End:
  */
-
-/* arch-tag: 8a9b748d-390c-4922-99db-2eeefa921051
-   (do not change this comment) */
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index 944a728a28c..a4ac44cf96a 100644
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -750,6 +750,3 @@ main (argc, argv)
 
 #endif /* not MSDOS */
 #endif /* not BSD 4.2 (or newer) */
-
-/* arch-tag: acb0afa6-315a-4c5b-b9e3-def5725c8783
-   (do not change this comment) */
diff --git a/lib-src/getopt.c b/lib-src/getopt.c
index a4b0a65147d..c17aecaefd2 100644
--- a/lib-src/getopt.c
+++ b/lib-src/getopt.c
@@ -1283,6 +1283,3 @@ main (argc, argv)
 }
 
 #endif /* TEST */
-
-/* arch-tag: 0e6da124-7269-4785-a9de-094c263d20dc
-   (do not change this comment) */
diff --git a/lib-src/getopt.h b/lib-src/getopt.h
index 0d4c40c52d0..4d6adeea0d6 100644
--- a/lib-src/getopt.h
+++ b/lib-src/getopt.h
@@ -178,6 +178,3 @@ extern int _getopt_internal ();
 #undef __need_getopt
 
 #endif /* getopt.h */
-
-/* arch-tag: 9adb7828-e6a6-40cd-8512-0cdf1f20ddd4
-   (do not change this comment) */
diff --git a/lib-src/getopt1.c b/lib-src/getopt1.c
index f08cd72638a..60baeb85283 100644
--- a/lib-src/getopt1.c
+++ b/lib-src/getopt1.c
@@ -194,5 +194,3 @@ main (argc, argv)
 
 #endif /* TEST */
 
-/* arch-tag: 28a5c558-b0c0-4bff-b5bc-e2e20291d4b6
-   (do not change this comment) */
diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog
index 9baf0213db7..82a14efb383 100755
--- a/lib-src/grep-changelog
+++ b/lib-src/grep-changelog
@@ -241,5 +241,4 @@ while (defined (my $log = shift @ARGV)) {
 }
 
 
-# arch-tag: 9e4f6749-e053-4bb7-b3ad-11947318418e
 # grep-changelog ends here.
diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index 0cfb88445b3..cbab66a2a17 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -279,6 +279,3 @@ usage ()
   fprintf (stderr, "usage: %s [-de] [-iso]\n", progname);
   exit (1);
 }
-
-/* arch-tag: 20e04fb7-926e-4e48-be86-64fe869ecdaa
-   (do not change this comment) */
diff --git a/lib-src/leditcfns.c b/lib-src/leditcfns.c
index 239db1cd1fa..b8a7a6bfe1f 100644
--- a/lib-src/leditcfns.c
+++ b/lib-src/leditcfns.c
@@ -16,6 +16,3 @@ set_proc_str(ptr) char *ptr; {
     else
 	printf("string too long for set-proc-str: %s\n", ptr);
     }
-
-/* arch-tag: eb7ae804-0d6e-4077-ab42-7173821410c3
-   (do not change this comment) */
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 7330b821768..ed6dde3a0bf 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1185,6 +1185,3 @@ scan_lisp_file (filename, mode)
   fclose (infile);
   return 0;
 }
-
-/* arch-tag: f7203aaf-991a-4238-acb5-601db56f2894
-   (do not change this comment) */
diff --git a/lib-src/makefile.nt b/lib-src/makefile.nt
index 29282eea45d..d9553216337 100644
--- a/lib-src/makefile.nt
+++ b/lib-src/makefile.nt
@@ -413,5 +413,3 @@ $(BLD)\timer.obj : \
 $(BLD)\yow.obj : \
 	$(SRC)\yow.c \
 	$(EMACS_ROOT)\lib-src\..\src\paths.h
-
-# arch-tag: 59e1b54b-4cc2-4086-bb0b-ecfad4b683e9
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 6f92bd76ee8..faab36e087b 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -422,5 +422,3 @@ $(BLD)/timer.$(O) : \
 $(BLD)/yow.$(O) : \
 	$(SRC)/yow.c \
 	$(EMACS_ROOT)/lib-src/../src/paths.h
-
-# arch-tag: c051bc02-a6de-474b-889a-27f7b2fbbcea
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 2d0cd9043fd..89714a07423 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -954,6 +954,3 @@ strerror (errnum)
 }
 
 #endif /* ! HAVE_STRERROR */
-
-/* arch-tag: 1c323112-41fe-4fe5-8de9-494de631f73f
-   (do not change this comment) */
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index 261a6b41614..31bf758197d 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -208,6 +208,3 @@ sys_chdir (const char * path)
 {
   return _chdir (path);
 }
-
-/* arch-tag: 7b63fb83-70ee-4124-8822-54e53e5d0773
-   (do not change this comment) */
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index 523e3d6fd49..e6bce58074e 100644
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -114,6 +114,3 @@ int fchown (int fd, int uid, int gid);
 #undef _WINSOCK_H
 
 /* end of ntlib.h */
-
-/* arch-tag: 93444f66-7b98-4aa5-a5cd-01444094af28
-   (do not change this comment) */
diff --git a/lib-src/pop.c b/lib-src/pop.c
index adf80c544b6..b51e82c82bf 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1607,6 +1607,3 @@ find_crlf (in_string, len)
 }
 
 #endif /* MAIL_USE_POP */
-
-/* arch-tag: ceb37041-b7ad-49a8-a63d-286618b8367d
-   (do not change this comment) */
diff --git a/lib-src/pop.h b/lib-src/pop.h
index 8954e1d5369..cfd333ccafc 100644
--- a/lib-src/pop.h
+++ b/lib-src/pop.h
@@ -81,6 +81,3 @@ extern int pop_quit _ARGS((popserver server));
 extern void pop_close _ARGS((popserver));
 
 #undef _ARGS
-
-/* arch-tag: 76cc5f58-8e86-48fa-bc72-a7c6cb1c4f1c
-   (do not change this comment) */
diff --git a/lib-src/profile.c b/lib-src/profile.c
index ec77936f74d..9c43c16e776 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -102,6 +102,3 @@ main ()
     }
   exit (1);
 }
-
-/* arch-tag: 8db68f7e-2322-4944-a315-dba349bdbf39
-   (do not change this comment) */
diff --git a/lib-src/rcs-checkin b/lib-src/rcs-checkin
index 365050e9584..75616c3564e 100755
--- a/lib-src/rcs-checkin
+++ b/lib-src/rcs-checkin
@@ -115,4 +115,3 @@ $file"
 	ci -d -q -u $owner -m"entered into RCS" "$file" || exit
 done
 
-# arch-tag: 89c86949-ef04-4380-838b-bc1444dcb074
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 86a3f6722cd..a304df9adbd 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -29,7 +29,7 @@ Options:
 
 Report bugs to <bug-gnu-emacs@gnu.org>.'
 
-Id='$Id: rcs2log,v 1.50 2002/02/03 17:31:31 eggert Exp $'
+Id='$Id: rcs2log,v 1.49 2001/11/28 23:55:08 eggert Exp eggert $'
 
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002
 #  Free Software Foundation, Inc.
@@ -729,5 +729,3 @@ exec rm -fr $logdir
 # Local Variables:
 # tab-width:4
 # End:
-
-# arch-tag: cea067bd-a552-4254-ba17-078208933073
diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c
index 05a3e69cc92..185295a9294 100644
--- a/lib-src/sorted-doc.c
+++ b/lib-src/sorted-doc.c
@@ -281,6 +281,3 @@ main ()
 
   return 0;
 }
-
-/* arch-tag: ce28f204-1e70-4b34-8210-3d54a5662071
-   (do not change this comment) */
diff --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c
index f7b3a8b8004..973d1104393 100644
--- a/lib-src/test-distrib.c
+++ b/lib-src/test-distrib.c
@@ -105,6 +105,3 @@ have been corrupted in the files of Emacs, and it will not work.\n",
 #endif
   return (0);
 }
-
-/* arch-tag: 3a89005d-df98-4c32-aa9f-33570e16a26a
-   (do not change this comment) */
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index 74fa2b06920..af691d394a6 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -528,6 +528,3 @@ unlock_file (filename, state)
   errno = saved_errno;
   return ret;
 }
-
-/* arch-tag: 2bf5c52e-4beb-463a-954e-c58b9c64736b
-   (do not change this comment) */
diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index 32c4e5ba89e..5fdc345eb98 100755
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -23,7 +23,7 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 #
-#	$Id: vcdiff,v 1.7 2001/02/20 12:36:28 gerd Exp $
+#	$Id: vcdiff,v 1.6 1997/01/01 05:33:42 eggert Exp $
 #
 
 DIFF="diff"
@@ -111,5 +111,3 @@ do
 	then status=$s
 	fi
 done
-
-# arch-tag: 4344ba3a-bcbe-4f77-971c-f43c1606953a
diff --git a/lib-src/yow.c b/lib-src/yow.c
index 10f0fad1ce7..02bcc6642eb 100644
--- a/lib-src/yow.c
+++ b/lib-src/yow.c
@@ -178,5 +178,3 @@ yow (fp)
   printf("%s\n", buf);
 }
 
-/* arch-tag: e40fc0df-bafb-4001-af24-5c883d1c685e
-   (do not change this comment) */