Sync to HEAD

34 files changed, 402 insertions, 126 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index e6b6b4c2ef7..75b3be839e1 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,103 @@
+2004-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * make-docfile.c (xmalloc): Fix return type.
+        (put_filename): New fun.
+        (scan_file): Use it.
+
+2004-03-09  Juanma Barranquero  <lektu@terra.es>
+
+        * grep-changelog: Changes to support ChangeLog.10+.
+        (main): Tidy up usage string.  Fix "Use of uninitialized value"
+        warning.  Set version to 0.2.  Parse the directory listing to get
+        any ChangeLog.n file, not just 1..9.
+        (header_match_p, entry_match_p, print_log, parse_changelog):
+        Remove Perl prototypes (their purpose is to help the parser, which
+        isn't needed here, not declare arguments).
+        (parse_changelog): Make --reverse faster on big batches by not
+        modifying the entries list.
+
+2004-03-01  Juanma Barranquero  <lektu@terra.es>
+
+        * makefile.w32-in (obj): Add fringe.c.
+
+2004-02-14  Paul Eggert  <eggert@twinsun.com>
+
+        * rcs2log: Work correctly if CVSROOT specifies :fork: or
+        :local: methods, or omits the colon between the hostname
+        and the path.  Allow :/ in repository path, since CVS does.
+        Fix typo: "pository" should be set from $CVSROOT, not $repository.
+        This fixes a bug reported by Wolfgang Scherer in
+        <http://mail.gnu.org/archive/html/bug-gnu-emacs/2004-02/msg00085.html>,
+        along with some related bugs I discovered by inspecting how
+        CVS itself parses $CVSROOT.
+
+2004-02-04  J,bi(Br,bt(Bme Marant  <jmarant@nerim.net>  (tiny change)
+
+        * emacsclient.c (decode_options): Fix handling of alternate editor.
+
+2004-01-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacsclient.c (main): Don't use the hostname in the socket name.
+        Look for relative socket names in the /tmp dir rather than in cwd.
+
+2004-01-24  Richard M. Stallman  <rms@gnu.org>
+
+        * emacsclient.c (main): Restore errno from saved_errno,
+        so the error message comes from socket_status.
+
+2004-01-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacsclient.c (main): Stop if socket name too long.
+        Only try su-fallback if the socket name was not explicit.
+        Check socket name length in su-fallback case as well.
+
+2004-01-08  Andreas Schwab  <schwab@suse.de>
+
+        * emacsclient.c (main): Save errno from socket_status.
+
+2004-01-04  Andreas Schwab  <schwab@suse.de>
+
+        * emacsclient.c (main): Fix socket name when using another user.
+
+2003-12-27  Paul Eggert  <eggert@twinsun.com>
+
+        * rcs2log (rlog_options): Append -rbranchtag if CVS/Tag indicates
+        a tag, and if the user has not specified an rlog option.
+        Adapted from a suggestion by Martin Stjernholm in
+        <http://mail.gnu.org/archive/html/bug-gnu-emacs/2003-07/msg00066.html>.
+        (Copyright): Update to 2003.
+
+2003-12-24  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * make-docfile.c (main): For return code, no longer special-case VMS.
+        Instead, use `EXIT_SUCCESS' and `EXIT_FAILURE' from stdlib.h.
+
+2003-09-28  Andreas B,A|(Bsching  <crunchy@tzi.de>  (tiny change)
+
+        * emacsclient.c (quote_file_name): Print the result instead of
+        returning it.  Fix the return type accordingly.
+        (main): With --eval, if no file name, read from stdin.
+        Quote file names.
+
+2003-09-10  Richard M. Stallman  <rms@gnu.org>
+
+        * emacsclient.c (main): Use socket_name.
+
+2003-09-10  Andreas B,A|(Bsching  <crunchy@tzi.de>  (tiny change)
+
+        * emacsclient.c (socket_name): New variable.
+        (longopts, decode_options, print_help_and_exit):
+        Handle --socket-name argument.
+
+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)
@@ -1554,7 +1654,7 @@
         Now used as element of a linked list.
         (patterns, num_patterns): Global variables deleted.
         (p_head): New global variable.
-        (forced_lang):  New global variable (replaces lang_func).
+        (forced_lang): New global variable (replaces lang_func).
         (get_language_from_name, get_language_from_interpreter)
         (get_language_from_suffix): Semantics changed.  All callers changed.
         (last_node): New global variable.
@@ -2818,7 +2918,7 @@ Tue Jul  1 01:09:07 1997  Geoff Voelker  <voelker@cs.washington.edu>
 
         * etags.c (lowcase): Use the standard tolower function.
         (substitute): Remove some wrong and some useless code related with
-        escape `\` character in regexp replacement string.
+        escape '\' character in regexp replacement string.
         (TEX_defenv): Added part, appendix, entry, index.  Removed typeout.
         (lang_suffixes): New suffixes: .hpp for C++; .f90 for Fortran;
         .bib, .ltx, .TeX for TeX (.bbl, .dtx removed); .ml for Lisp;
@@ -3839,7 +3939,7 @@ Tue Jul  1 01:09:07 1997  Geoff Voelker  <voelker@cs.washington.edu>
 
 1994-02-17  Francesco Potorti`  (pot@cnuce.cnr.it)
 
-        * etags.c (--absolute-pathnames):  option removed.
+        * etags.c (--absolute-pathnames): Option removed.
 
 1994-02-16  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
 
@@ -4300,8 +4400,8 @@ Tue Jul  1 01:09:07 1997  Geoff Voelker  <voelker@cs.washington.edu>
 
 1993-05-30  Jim Blandy  (jimb@wookumz.gnu.ai.mit.edu)
 
-        * Makefile.in: (${archlibdir}): Use `(cd foo && pwd)` instead of
-        `(cd foo ; pwd)` to get the canonical name of a directory; cd
+        * Makefile.in: (${archlibdir}): Use `(cd foo && pwd)' instead of
+        `(cd foo ; pwd)' to get the canonical name of a directory; cd
         might fail, and have pwd print out the current directory.
 
         * movemail.c [MAIL_USE_POP] (main): Don't use non-portable
@@ -4986,7 +5086,7 @@ Tue Jul  1 01:09:07 1997  Geoff Voelker  <voelker@cs.washington.edu>
         * etags.c (C_entries): Process token before handling end of line.
         When inner loops reach end of line, just back up.
         Let the real end of line processing happen in just one place.
-        (consider_token):  Likewise.
+        (consider_token): Likewise.
 
 1991-04-11  Jim Blandy  (jimb@geech.gnu.ai.mit.edu)
 
@@ -5099,7 +5199,7 @@ Tue Jul  1 01:09:07 1997  Geoff Voelker  <voelker@cs.washington.edu>
 
 1990-03-14  Joseph Arceneaux  (jla@churchy.ai.mit.edu)
 
-        * etags.c (getit):  Recognize '$' as beginning identifiers.
+        * etags.c (getit): Recognize '$' as beginning identifiers.
 
 1990-02-22  David Lawrence  (tale@pogo.ai.mit.edu)
 
@@ -5430,7 +5530,10 @@ Tue Jul  1 01:09:07 1997  Geoff Voelker  <voelker@cs.washington.edu>
 ;; coding: iso-2022-7bit
 ;; End:
 
-    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002
+    Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
+        1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004
         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 1554b347113..7868364148a 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -27,7 +27,6 @@ SHELL = /bin/sh
 
 CC=@CC@
 CFLAGS=@CFLAGS@
-ALLOCA=@ALLOCA@
 version=@version@
 configuration=@configuration@
 EXEEXT=@EXEEXT@
@@ -145,12 +144,6 @@ 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
@@ -389,14 +382,12 @@ 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 $(ALLOCA)
+GETOPTOBJS = getopt.o getopt1.o
 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 =
@@ -429,8 +420,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 ${ALLOCA}
-        $(CC) ${ALL_CFLAGS} ${srcdir}/sorted-doc.c ${ALLOCA} $(LOADLIBES) -o sorted-doc
+sorted-doc${EXEEXT}: ${srcdir}/sorted-doc.c
+        $(CC) ${ALL_CFLAGS} ${srcdir}/sorted-doc.c $(LOADLIBES) -o sorted-doc
 
 b2m${EXEEXT}: ${srcdir}/b2m.c ../src/config.h $(GETOPTDEPS)
         $(CC) ${ALL_CFLAGS} ${srcdir}/b2m.c  -DVERSION="\"${version}\"" \
@@ -487,3 +478,6 @@ 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/README b/lib-src/README
index fa3074e518b..4d29931a6e9 100644
--- a/lib-src/README
+++ b/lib-src/README
@@ -1,3 +1,3 @@
 This directory contains the source code for the architecture-dependent
-files that go in ../arch-lib.  At present, these are mostly utility
+files that go in ${archlibdir}.  At present, these are mostly utility
 programs used by Emacs.
diff --git a/lib-src/b2m.c b/lib-src/b2m.c
index 05caa1424e0..5a1f9e85473 100644
--- a/lib-src/b2m.c
+++ b/lib-src/b2m.c
@@ -301,3 +301,5 @@ 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 86f9b948b32..38eb96e076f 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.4 $';
+my($version) = '$Revision: 1.5 $';
 my($usage) = "Usage: $whoami [--help] [--version] [--[no]full-headers] [Babyl-file]
 \tBy default, full headers are printed.\n";
 
@@ -152,3 +152,5 @@ 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 5a4d3c70952..28a4ae4c703 100644
--- a/lib-src/cvtmail.c
+++ b/lib-src/cvtmail.c
@@ -180,3 +180,6 @@ 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 24d1348b0ee..09878543d44 100644
--- a/lib-src/digest-doc.c
+++ b/lib-src/digest-doc.c
@@ -65,3 +65,6 @@ 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 611c0f74c7d..eeeb0eb3efd 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -3975,3 +3975,6 @@ 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 fc85ba67448..c8b2596198f 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1,5 +1,5 @@
 /* Client process that communicates with GNU Emacs acting as server.
-   Copyright (C) 1986, 1987, 1994, 1999, 2000, 2001, 2003
+   Copyright (C) 1986, 1987, 1994, 1999, 2000, 2001, 2003, 2004
    Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -67,6 +67,9 @@ char *display = NULL;
    is not running.  --alternate-editor.   */
 const char * alternate_editor = NULL;
 
+/* If non-NULL, the filename of the UNIX socket.  */
+char *socket_name = NULL;
+
 void print_help_and_exit ();
 
 struct option longopts[] =
@@ -76,6 +79,7 @@ struct option longopts[] =
   { "help",     no_argument,       NULL, 'H' },
   { "version",  no_argument,       NULL, 'V' },
   { "alternate-editor", required_argument, NULL, 'a' },
+  { "socket-name",      required_argument, NULL, 's' },
   { "display",  required_argument, NULL, 'd' },
   { 0, 0, 0, 0 }
 };
@@ -88,16 +92,16 @@ decode_options (argc, argv)
      int argc;
      char **argv;
 {
+  alternate_editor = getenv ("ALTERNATE_EDITOR");
+
   while (1)
     {
       int opt = getopt_long (argc, argv,
-                             "VHnea:d:", longopts, 0);
+                             "VHnea:s:d:", longopts, 0);
 
       if (opt == EOF)
         break;
 
-      alternate_editor = getenv ("ALTERNATE_EDITOR");
-
       switch (opt)
         {
         case 0:
@@ -109,6 +113,10 @@ decode_options (argc, argv)
           alternate_editor = optarg;
           break;
 
+        case 's':
+          socket_name = optarg;
+          break;
+
         case 'd':
           display = optarg;
           break;
@@ -152,6 +160,8 @@ The following OPTIONS are accepted:\n\
 -n, --no-wait           Don't wait for the server to return\n\
 -e, --eval              Evaluate the FILE arguments as ELisp expressions\n\
 -d, --display=DISPLAY   Visit the file in the given display\n\
+-s, --socket-name=FILENAME\n\
+                        Set the filename of the UNIX socket for communication\n\
 -a, --alternate-editor=EDITOR\n\
                         Editor to fallback to if the server is not running\n\
 \n\
@@ -159,14 +169,14 @@ Report bugs to bug-gnu-emacs@gnu.org.\n", progname);
   exit (0);
 }
 
-/* Return a copy of NAME, inserting a &
-   before each &, each space, each newline, and any initial -.
-   Change spaces to underscores, too, so that the
+/* In NAME, insert a & before each &, each space, each newline, and
+   any initial -.  Change spaces to underscores, too, so that the
    return value never contains a space.  */
 
-char *
-quote_file_name (name)
+void
+quote_file_name (name, stream)
      char *name;
+     FILE *stream;
 {
   char *copy = (char *) malloc (strlen (name) * 2 + 1);
   char *p, *q;
@@ -196,7 +206,9 @@ quote_file_name (name)
     }
   *q++ = 0;
 
-  return copy;
+  fprintf (stream, copy);
+
+  free (copy);
 }
 
 /* Like malloc but get fatal error if memory is exhausted.  */
@@ -287,8 +299,6 @@ main (argc, argv)
      int argc;
      char **argv;
 {
-  char *system_name;
-  int system_name_length;
   int s, i, needlf = 0;
   FILE *out, *in;
   struct sockaddr_un server;
@@ -300,7 +310,7 @@ main (argc, argv)
   /* Process options.  */
   decode_options (argc, argv);
 
-  if (argc - optind < 1)
+  if ((argc - optind < 1) && !eval)
     {
       fprintf (stderr, "%s: file name or argument required\n", progname);
       fprintf (stderr, "Try `%s --help' for more information\n", progname);
@@ -321,37 +331,38 @@ main (argc, argv)
   server.sun_family = AF_UNIX;
 
   {
-    char *dot;
-    system_name_length = 32;
+    int sock_status = 0;
+    int default_sock = !socket_name;
+    int saved_errno;
+    char *server_name = "server";
+
+    if (socket_name && !index (socket_name, '/') && !index (socket_name, '\\'))
+      { /* socket_name is a file name component.  */
+        server_name = socket_name;
+        socket_name = NULL;
+        default_sock = 1;       /* Try both UIDs.  */
+      }
 
-    while (1)
+    if (default_sock)
       {
-        system_name = (char *) xmalloc (system_name_length + 1);
-
-        /* system_name must be null-terminated string.  */
-        system_name[system_name_length] = '\0';
-
-        if (gethostname (system_name, system_name_length) == 0)
-          break;
-
-        free (system_name);
-        system_name_length *= 2;
+        socket_name = alloca (100 + strlen (server_name));
+        sprintf (socket_name, "/tmp/emacs%d/%s",
+                 (int) geteuid (), server_name);
       }
 
-    /* We always use the non-dotted host name, for simplicity.  */
-    dot = index (system_name, '.');
-    if (dot)
-      *dot = '\0';
-  }
-
-  {
-    int sock_status = 0;
-
-    sprintf (server.sun_path, "/tmp/emacs%d-%s/server", (int) geteuid (), system_name);
+    if (strlen (socket_name) < sizeof (server.sun_path))
+      strcpy (server.sun_path, socket_name);
+    else
+      {
+        fprintf (stderr, "%s: socket-name %s too long",
+                 argv[0], socket_name);
+        exit (1);
+      }
 
     /* See if the socket exists, and if it's owned by us. */
     sock_status = socket_status (server.sun_path);
-    if (sock_status)
+    saved_errno = errno;
+    if (sock_status && default_sock)
       {
         /* Failing that, see if LOGNAME or USER exist and differ from
            our euid.  If so, look for a socket based on the UID
@@ -359,19 +370,35 @@ main (argc, argv)
            that init_editfns uses to set the global Vuser_full_name.  */
 
         char *user_name = (char *) getenv ("LOGNAME");
+
         if (!user_name)
           user_name = (char *) getenv ("USER");
 
         if (user_name)
           {
             struct passwd *pw = getpwnam (user_name);
+
             if (pw && (pw->pw_uid != geteuid ()))
               {
                 /* We're running under su, apparently. */
-                sprintf (server.sun_path, "/tmp/esrv%d-%s",
-                         (int) pw->pw_uid, system_name);
+                socket_name = alloca (100 + strlen (server_name));
+                sprintf (socket_name, "/tmp/emacs%d/%s",
+                         (int) pw->pw_uid, server_name);
+
+                if (strlen (socket_name) < sizeof (server.sun_path))
+                  strcpy (server.sun_path, socket_name);
+                else
+                  {
+                    fprintf (stderr, "%s: socket-name %s too long",
+                             argv[0], socket_name);
+                    exit (1);
+                  }
+
                 sock_status = socket_status (server.sun_path);
+                saved_errno = errno;
               }
+            else
+              errno = saved_errno;
           }
       }
 
@@ -389,14 +416,14 @@ main (argc, argv)
 
        case 2:
          /* `stat' failed */
-         if (errno == ENOENT)
+         if (saved_errno == ENOENT)
            fprintf (stderr,
                     "%s: can't find socket; have you started the server?\n\
 To start the server in Emacs, type \"M-x server-start\".\n",
                     argv[0]);
          else
            fprintf (stderr, "%s: can't stat %s: %s\n",
-                    argv[0], server.sun_path, strerror (errno));
+                    argv[0], server.sun_path, strerror (saved_errno));
          fail (argc, argv);
          break;
        }
@@ -455,24 +482,47 @@ To start the server in Emacs, type \"M-x server-start\".\n",
     fprintf (out, "-eval ");
 
   if (display)
-    fprintf (out, "-display %s ", quote_file_name (display));
+    {
+      fprintf (out, "-display ");
+      quote_file_name (display, out);
+      fprintf (out, " ");
+    }
 
-  for (i = optind; i < argc; i++)
+  if ((argc - optind > 0))
     {
-      if (eval)
-        ; /* Don't prepend any cwd or anything like that.  */
-      else if (*argv[i] == '+')
+      for (i = optind; i < argc; i++)
         {
-          char *p = argv[i] + 1;
-          while (isdigit ((unsigned char) *p) || *p == ':') p++;
-          if (*p != 0)
-            fprintf (out, "%s/", quote_file_name (cwd));
+          if (eval)
+            ; /* Don't prepend any cwd or anything like that.  */
+          else if (*argv[i] == '+')
+            {
+              char *p = argv[i] + 1;
+              while (isdigit ((unsigned char) *p) || *p == ':') p++;
+              if (*p != 0)
+                {
+                  quote_file_name (cwd, out);
+                  fprintf (out, "/");
+                }
+            }
+          else if (*argv[i] != '/')
+            {
+              quote_file_name (cwd, out);
+              fprintf (out, "/");
+            }
+
+          quote_file_name (argv[i], out);
+          fprintf (out, " ");
         }
-      else if (*argv[i] != '/')
-        fprintf (out, "%s/", quote_file_name (cwd));
-
-      fprintf (out, "%s ", quote_file_name (argv[i]));
     }
+  else
+    {
+      while ((str = fgets (string, BUFSIZ, stdin)))
+        {
+          quote_file_name (str, out);
+        }
+      fprintf (out, " ");
+    }
+  
   fprintf (out, "\n");
   fflush (out);
 
@@ -519,3 +569,6 @@ 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 dcbc20feeed..f9185c21c08 100644
--- a/lib-src/emacstool.c
+++ b/lib-src/emacstool.c
@@ -498,3 +498,6 @@ 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 9633cf37ad2..e9fab1be3ee 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 (strneq (str+len-10, "::operator", 10))
+          if (len >= 10 && strneq (str+len-10, "::operator", 10))
             {
               if (*c_extp & C_AUTO) /* automatic detection of C++ */
                 *c_extp = (*c_extp | C_PLPL) & ~C_AUTO;
@@ -6785,3 +6785,6 @@ 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 a4ac44cf96a..944a728a28c 100644
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -750,3 +750,6 @@ 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 c17aecaefd2..a4b0a65147d 100644
--- a/lib-src/getopt.c
+++ b/lib-src/getopt.c
@@ -1283,3 +1283,6 @@ 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 4d6adeea0d6..0d4c40c52d0 100644
--- a/lib-src/getopt.h
+++ b/lib-src/getopt.h
@@ -178,3 +178,6 @@ 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 60baeb85283..f08cd72638a 100644
--- a/lib-src/getopt1.c
+++ b/lib-src/getopt1.c
@@ -194,3 +194,5 @@ 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 82a14efb383..38fce879c7a 100755
--- a/lib-src/grep-changelog
+++ b/lib-src/grep-changelog
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-# Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -56,34 +56,36 @@ $result = 0 if $to_date && $to_date !~ /^\d\d\d\d-\d\d-\d\d$/;
 
 if ($result == 0 || $help) {
     print <<USAGE;
+
 Usage: $0 [options] [CHANGELOG...]
-Print entries in ChangeLogs matching various criteria.  Valid options
-are
 
-  --author=AUTHOR         match entries whose author line matches
+Print entries in ChangeLogs matching various criteria.
+Valid options are:
+
+  --author=AUTHOR         Match entries whose author line matches
                           regular expression AUTHOR
-  --text=TEXT             match entries whose text matches regular
-                          expression TEXT.
-  --exclude=TEXT          exclude entries matching TEXT.
-  --from-date=YYYY-MM-DD  match entries not older than given date
-  --to-date=YYYY-MM-DD    match entries not younger than given date
-  --rcs-log               format output suitable for RCS log entries.
-  --with-date             print short date line in RCS log
-  --reverse               show entries in reverse (chronological) order
-  --version               print version info
-  --help                  print this help
+  --text=TEXT             Match entries whose text matches regular
+                          expression TEXT
+  --exclude=TEXT          Exclude entries matching TEXT
+  --from-date=YYYY-MM-DD  Match entries not older than given date
+  --to-date=YYYY-MM-DD    Match entries not younger than given date
+  --rcs-log               Format output suitable for RCS log entries
+  --with-date             Print short date line in RCS log
+  --reverse               Show entries in reverse (chronological) order
+  --version               Print version info
+  --help                  Print this help
 
 If no CHANGELOG is specified scan the files "ChangeLog" and
-"ChangeLog.[9-1]" in the current directory.  Old-style dates in ChangeLogs
+"ChangeLog.1+" in the current directory.  Old-style dates in ChangeLogs
 are not recognized.
 USAGE
-    exit $help ? 0 : 1;
+    exit !$help;
 }
 
 # Print version info and exit if `--version' was specified.
 
 if ($version) {
-    print "0.1\n";
+    print "0.2\n";
     exit 0;
 }
 
@@ -92,7 +94,7 @@ if ($version) {
 # options specified, i.e. it matches $author, and its date is in
 # the range $from_date <= date <= $to_date.
 
-sub header_match_p ($) {
+sub header_match_p {
     my $header = shift;
 
     return 0 unless $header;
@@ -122,7 +124,7 @@ sub header_match_p ($) {
 # command line, i.e. it matches $regexp, and it doesn't match
 # $exclude.
 
-sub entry_match_p ($) {
+sub entry_match_p {
     my $entry = shift;
 
     return 0 unless $entry;
@@ -143,7 +145,7 @@ sub entry_match_p ($) {
 # lines are not printed, and leading spaces and file names are removed
 # from ChangeLog entries.
 
-sub print_log ($$) {
+sub print_log {
     my ($header, $entry) = @_;
     my $output = '';
 
@@ -172,7 +174,7 @@ sub print_log ($$) {
 
 # Scan LOG for matching entries, and print them to standard output.
 
-sub parse_changelog ($) {
+sub parse_changelog {
     my $log = shift;
     my $entry = undef;
     my $header = undef;
@@ -219,8 +221,8 @@ sub parse_changelog ($) {
     close IN;
 
     if ($reverse) {
-        while (defined (my $entry = pop @entries)) {
-            print $entry;
+        for (my $entry = @entries; $entry; $entry--) {
+            print $entries[$entry-1];
         }
     }
 }
@@ -230,9 +232,19 @@ sub parse_changelog ($) {
 
 # If files were specified on the command line, parse those files in the
 # order supplied by the user; otherwise parse default files ChangeLog and
-# ChangeLog.9...ChangeLog.1 according to $reverse.
+# ChangeLog.1+ according to $reverse.
 unless (@ARGV > 0) {
-    @ARGV = ("ChangeLog", map {"ChangeLog.$_"} reverse 1..9);
+    @ARGV = ("ChangeLog");
+
+    push @ARGV,
+      map {"ChangeLog.$_"}
+        sort {$b <=> $a}
+          map {/\.(\d+)$/; $1}
+            do {
+                opendir D, '.';
+                grep /^ChangeLog\.\d+$/, readdir D;
+            };
+
     @ARGV = reverse @ARGV if $reverse;
 }
 
@@ -241,4 +253,5 @@ 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 cbab66a2a17..0cfb88445b3 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -279,3 +279,6 @@ 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 b8a7a6bfe1f..239db1cd1fa 100644
--- a/lib-src/leditcfns.c
+++ b/lib-src/leditcfns.c
@@ -16,3 +16,6 @@ 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 ed6dde3a0bf..ba73f5800a7 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1,5 +1,5 @@
 /* Generate doc-string file for GNU Emacs from source files.
-   Copyright (C) 1985, 86, 92, 93, 94, 97, 1999, 2000, 2001
+   Copyright (C) 1985, 86, 92, 93, 94, 97, 1999, 2000, 01, 2004
    Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -23,6 +23,7 @@ Boston, MA 02111-1307, USA.  */
  of GNU Emacs.  .elc and .el and .c files are allowed.
  A .o file can also be specified; the .c file it was made from is used.
  This helps the makefile pass the correct list of files.
+ Option -d DIR means change to DIR before looking for files.
 
  The results, which go to standard output or to a file
  specified with -a or -o (-a to append, -o to start from nothing),
@@ -104,11 +105,11 @@ fatal (s1, s2)
 
 /* Like malloc but get fatal error if memory is exhausted.  */
 
-long *
+void *
 xmalloc (size)
      unsigned int size;
 {
-  long *result = (long *) malloc (size);
+  void *result = (void *) malloc (size);
   if (result == NULL)
     fatal ("virtual memory exhausted", 0);
   return result;
@@ -174,10 +175,23 @@ main (argc, argv)
       if (j == i)
         err_count += scan_file (argv[i]);
     }
-#ifndef VMS
-  exit (err_count > 0);
-#endif /* VMS */
-  return err_count > 0;
+  return (err_count > 0 ? EXIT_FAILURE : EXIT_SUCCESS);
+}
+
+/* Add a source file name boundary marker in the output file.  */
+void
+put_filename (filename)
+     char *filename;
+{
+  char *tmp = filename;
+  int len;
+  
+  while ((tmp = index (filename, '/')))
+    filename = tmp + 1;
+
+  putc (037, outfile);
+  putc ('S', outfile);
+  fprintf (outfile, "%s\n", filename);
 }
 
 /* Read file FILENAME and output its doc strings to outfile.  */
@@ -188,6 +202,8 @@ scan_file (filename)
      char *filename;
 {
   int len = strlen (filename);
+
+  put_filename (filename);
   if (len > 4 && !strcmp (filename + len - 4, ".elc"))
     return scan_lisp_file (filename, READ_BINARY);
   else if (len > 3 && !strcmp (filename + len - 3, ".el"))
@@ -1185,3 +1201,6 @@ 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 d9553216337..29282eea45d 100644
--- a/lib-src/makefile.nt
+++ b/lib-src/makefile.nt
@@ -413,3 +413,5 @@ $(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 faab36e087b..20cf4727362 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -126,7 +126,7 @@ $(BLD)/ctags.$(O): ctags.c
 #
 # From ..\src\makefile.nt.
 #
-obj = abbrev.c alloc.c alloca.c buffer.c bytecode.c callint.c callproc.c casefiddle.c casetab.c category.c ccl.c charset.c cm.c cmds.c coding.c data.c dired.c dispnew.c doc.c doprnt.c editfns.c emacs.c eval.c fileio.c filelock.c filemode.c floatfns.c fns.c fontset.c frame.c gmalloc.c indent.c insdel.c intervals.c keyboard.c keymap.c lastfile.c lread.c macros.c marker.c minibuf.c print.c process.c ralloc.c regex.c region-cache.c scroll.c search.c sound.c strftime.c syntax.c sysdep.c term.c termcap.c textprop.c tparam.c undo.c unexw32.c vm-limit.c w32.c w32console.c w32fns.c w32heap.c w32inevt.c w32menu.c w32proc.c w32reg.c w32select.c w32term.c w32xfns.c window.c xdisp.c xfaces.c xfaces.c
+obj = abbrev.c alloc.c alloca.c buffer.c bytecode.c callint.c callproc.c casefiddle.c casetab.c category.c ccl.c charset.c cm.c cmds.c coding.c data.c dired.c dispnew.c doc.c doprnt.c editfns.c emacs.c eval.c fileio.c filelock.c filemode.c floatfns.c fns.c fontset.c frame.c fringe.c gmalloc.c indent.c insdel.c intervals.c keyboard.c keymap.c lastfile.c lread.c macros.c marker.c minibuf.c print.c process.c ralloc.c regex.c region-cache.c scroll.c search.c sound.c strftime.c syntax.c sysdep.c term.c termcap.c textprop.c tparam.c undo.c unexw32.c vm-limit.c w32.c w32console.c w32fns.c w32heap.c w32inevt.c w32menu.c w32proc.c w32reg.c w32select.c w32term.c w32xfns.c window.c xdisp.c xfaces.c xfaces.c
 #
 # These are the lisp files that are loaded up in loadup.el
 #
@@ -422,3 +422,5 @@ $(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 89714a07423..2d0cd9043fd 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -954,3 +954,6 @@ 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 31bf758197d..261a6b41614 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -208,3 +208,6 @@ 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 e6bce58074e..523e3d6fd49 100644
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -114,3 +114,6 @@ 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 b51e82c82bf..adf80c544b6 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1607,3 +1607,6 @@ 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 cfd333ccafc..8954e1d5369 100644
--- a/lib-src/pop.h
+++ b/lib-src/pop.h
@@ -81,3 +81,6 @@ 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 9c43c16e776..ec77936f74d 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -102,3 +102,6 @@ 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 75616c3564e..365050e9584 100755
--- a/lib-src/rcs-checkin
+++ b/lib-src/rcs-checkin
@@ -115,3 +115,4 @@ $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 a304df9adbd..b7466b6c134 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -29,10 +29,10 @@ Options:
 
 Report bugs to <bug-gnu-emacs@gnu.org>.'
 
-Id='$Id: rcs2log,v 1.49 2001/11/28 23:55:08 eggert Exp eggert $'
+Id='$Id: rcs2log,v 1.52 2003/12/27 08:18:08 uid65632 Exp $'
 
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002
-#  Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,
+# 2004 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -49,7 +49,7 @@ Id='$Id: rcs2log,v 1.49 2001/11/28 23:55:08 eggert Exp eggert $'
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-Copyright='Copyright (C) 2002 Free Software Foundation, Inc.
+Copyright='Copyright (C) 2004 Free Software Foundation, Inc.
 This program comes with NO WARRANTY, to the extent permitted by law.
 You may redistribute copies of this program
 under the terms of the GNU General Public License.
@@ -195,8 +195,9 @@ case $rlogfile in
 
         # If no rlog options are given,
         # log the revisions checked in since the first ChangeLog entry.
-        # Since ChangeLog is only by date, some of these revisions may be duplicates of
-        # what's already in ChangeLog; it's the user's responsibility to remove them.
+        # Since ChangeLog is only by date, some of these revisions may be
+        # duplicates of what's already in ChangeLog; it's the user's
+        # responsibility to remove them.
         case $rlog_options in
         '')
                 if test -s "$changelog"
@@ -250,18 +251,24 @@ case $rlogfile in
                 rlog='cvs -q log'
                 repository=`sed 1q <CVS/Repository` || exit
                 test ! -f CVS/Root || CVSROOT=`cat <CVS/Root` || exit
+                pository=
                 case $CVSROOT in
-                *:/*:/*)
-                        echo >&2 "$0: $CVSROOT: CVSROOT has multiple ':/'s"
-                        exit 1;;
-                *:/*)
+                /* | :fork:* | :local:*) ;;
+                */*)
                         # remote repository
-                        pository=`expr "X$repository" : '.*:\(/.*\)'`;;
-                *)
+                        pository=`expr "X$CVSROOT" : '[^/]*\(.*\)'`;;
+                esac
+                case $pository in
+                '')
                         # local repository
                         case $repository in
                         /*) ;;
-                        *) repository=${CVSROOT?}/$repository;;
+                        *)
+                                repository=${CVSROOT?}/$repository
+                                case $repository in
+                                :fork:* | :local:*)
+                                        repository=`expr "$repository" : ':[^:]*:\(.*\)'`;;
+                                esac;;
                         esac
                         if test ! -d "$repository"
                         then
@@ -281,6 +288,21 @@ case $rlogfile in
                         esac
                 done
 
+                # If no rlog options are given, and if we are in a tagged CVS branch,
+                # log only the changes in that branch.
+                case $rlog_options in
+                '')
+                        if test -f CVS/Tag
+                        then
+                                CVSTAG=`cat <CVS/Tag` || exit
+                                case $CVSTAG in
+                                T?*)
+                                        rlog_options=-r`expr "$CVSTAG" : 'T\(.*\)'`;;
+                                *)
+                                        echo >&2 "$0: invalid CVS/Tag"; exit 1;;
+                                esac
+                        fi;;
+                esac
         fi
 
         # Use $rlog's -zLT option, if $rlog supports it.
@@ -729,3 +751,5 @@ 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 185295a9294..05a3e69cc92 100644
--- a/lib-src/sorted-doc.c
+++ b/lib-src/sorted-doc.c
@@ -281,3 +281,6 @@ 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 973d1104393..f7b3a8b8004 100644
--- a/lib-src/test-distrib.c
+++ b/lib-src/test-distrib.c
@@ -105,3 +105,6 @@ 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 af691d394a6..74fa2b06920 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -528,3 +528,6 @@ 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 5fdc345eb98..9c513ac8200 100755
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -3,7 +3,7 @@
 # Enhanced sccs diff utility for use with vc mode.
 # This version is more compatible with rcsdiff(1).
 #
-# Copyright (C) 1992, 1993, 1995, 1997, 2001
+# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2004
 #   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
@@ -23,8 +23,6 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 #
-#       $Id: vcdiff,v 1.6 1997/01/01 05:33:42 eggert Exp $
-#
 
 DIFF="diff"
 usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
@@ -111,3 +109,5 @@ 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 02bcc6642eb..10f0fad1ce7 100644
--- a/lib-src/yow.c
+++ b/lib-src/yow.c
@@ -178,3 +178,5 @@ yow (fp)
   printf("%s\n", buf);
 }
 
+/* arch-tag: e40fc0df-bafb-4001-af24-5c883d1c685e
+   (do not change this comment) */