17 files changed, 0 insertions, 111 deletions

diff --git a/lib-src/.gitignore b/lib-src/.gitignore
index c111257cc9a..e1693b13c5e 100644
--- a/lib-src/.gitignore
+++ b/lib-src/.gitignore
@@ -6,5 +6,3 @@ echolisp.tmp
 
 oo/
 oo-spd/
-
-# arch-tag: bcd85c02-f779-4fe6-bd45-97a21150aadc
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index fdcd2c028e3..ab0057d6273 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1802,7 +1802,5 @@ strerror (errnum)
 
 #endif /* ! HAVE_STRERROR */
 
-/* arch-tag: f39bb9c4-73eb-477e-896d-50832e2ca9a7
-   (do not change this comment) */
 
 /* emacsclient.c ends here */
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index bf828b4660c..c426a1ff25c 100644
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -736,7 +736,5 @@ main (int argc, char **argv)
 #endif /* not MSDOS */
 #endif /* not BSD 4.2 (or newer) */
 
-/* arch-tag: acb0afa6-315a-4c5b-b9e3-def5725c8783
-   (do not change this comment) */
 
 /* fakemail.c ends here */
diff --git a/lib-src/gettext.h b/lib-src/gettext.h
deleted file mode 100644
index 4a5941f86dc..00000000000
--- a/lib-src/gettext.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2004,
-                 2005, 2006, 2007 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
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifndef _LIBGETTEXT_H
-#define _LIBGETTEXT_H 1
-
-/* NLS can be disabled through the configure --disable-nls option.  */
-#if ENABLE_NLS
-
-/* Get declarations of GNU message catalog functions.  */
-# include <libintl.h>
-
-#else
-
-/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
-   chokes if dcgettext is defined as a macro.  So include it now, to make
-   later inclusions of <locale.h> a NOP.  We don't include <libintl.h>
-   as well because people using "gettext.h" will not include <libintl.h>,
-   and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
-   is OK.  */
-#if defined(__sun)
-# include <locale.h>
-#endif
-
-/* Many header files from the libstdc++ coming with g++ 3.3 or newer include
-   <libintl.h>, which chokes if dcgettext is defined as a macro.  So include
-   it now, to make later inclusions of <libintl.h> a NOP.  */
-#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
-# include <cstdlib>
-# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H
-#  include <libintl.h>
-# endif
-#endif
-
-/* Disabled NLS.
-   The casts to 'const char *' serve the purpose of producing warnings
-   for invalid uses of the value returned from these functions.
-   On pre-ANSI systems without 'const', the config.h file is supposed to
-   contain "#define const".  */
-# define gettext(Msgid) ((const char *) (Msgid))
-# define dgettext(Domainname, Msgid) ((const char *) (Msgid))
-# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
-# define ngettext(Msgid1, Msgid2, N) \
-    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-# define dngettext(Domainname, Msgid1, Msgid2, N) \
-    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
-    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-# define textdomain(Domainname) ((const char *) (Domainname))
-# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
-# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))
-
-#endif
-
-/* A pseudo function call that serves as a marker for the automated
-   extraction of messages, but does not call gettext().  The run-time
-   translation is done at a different place in the code.
-   The argument, String, should be a literal string.  Concatenated strings
-   and other string expressions won't work.
-   The macro's expansion is not parenthesized, so that it is suitable as
-   initializer for static 'char[]' or 'const char[]' variables.  */
-#define gettext_noop(String) String
-
-#endif /* _LIBGETTEXT_H */
-
-/* arch-tag: 3d01bb8e-82e3-4674-9812-de4c4224f7d1
-   (do not change this comment) */
diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog
index e3e73768435..1518bc61502 100755
--- a/lib-src/grep-changelog
+++ b/lib-src/grep-changelog
@@ -263,5 +263,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 ce83428fb43..aa5b370aade 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -282,7 +282,5 @@ usage (void)
   exit (EXIT_FAILURE);
 }
 
-/* arch-tag: 20e04fb7-926e-4e48-be86-64fe869ecdaa
-   (do not change this comment) */
 
 /* hexl.c ends here */
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 3a3cc490afe..4260e4c08f6 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1199,7 +1199,5 @@ scan_lisp_file (const char *filename, const char *mode)
   return 0;
 }
 
-/* arch-tag: f7203aaf-991a-4238-acb5-601db56f2894
-   (do not change this comment) */
 
 /* make-docfile.c ends here */
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 16584a89bd3..b127c85951d 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -931,7 +931,5 @@ strerror (errnum)
 
 #endif /* ! HAVE_STRERROR */
 
-/* arch-tag: 1c323112-41fe-4fe5-8de9-494de631f73f
-   (do not change this comment) */
 
 /* movemail.c ends here */
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index 811080eb9db..7af503f0832 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -374,5 +374,3 @@ stat (const char * path, struct stat * buf)
   return 0;
 }
 
-/* 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 f2e5a12daf3..6b0e28ea0c3 100644
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -106,5 +106,3 @@ int fchown (int fd, unsigned uid, unsigned gid);
 
 /* 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 4ac55192fd6..8888d3af29c 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1625,5 +1625,3 @@ find_crlf (char *in_string, int 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 6915dc8d729..917aadee5cd 100644
--- a/lib-src/pop.h
+++ b/lib-src/pop.h
@@ -75,5 +75,3 @@ extern int pop_reset (popserver server);
 extern int pop_quit (popserver server);
 extern void pop_close (popserver);
 
-/* 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 e8832a3d776..a1ddf243d2b 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -102,7 +102,5 @@ main (void)
   exit (EXIT_FAILURE);
 }
 
-/* arch-tag: 8db68f7e-2322-4944-a315-dba349bdbf39
-   (do not change this comment) */
 
 /* profile.c ends here */
diff --git a/lib-src/rcs-checkin b/lib-src/rcs-checkin
index be3fa1e5b8c..3361c23bfb3 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/test-distrib.c b/lib-src/test-distrib.c
index a58d5ee1fe6..1f031d74ce8 100644
--- a/lib-src/test-distrib.c
+++ b/lib-src/test-distrib.c
@@ -85,7 +85,5 @@ have been corrupted in the files of Emacs, and it will not work.\n",
   return EXIT_SUCCESS;
 }
 
-/* arch-tag: 3a89005d-df98-4c32-aa9f-33570e16a26a
-   (do not change this comment) */
 
 /* test-distrib.c ends here */
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index 6156de672bd..0e74182a75f 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -496,7 +496,5 @@ unlock_file (const char *filename, void *state)
   return ret;
 }
 
-/* arch-tag: 2bf5c52e-4beb-463a-954e-c58b9c64736b
-   (do not change this comment) */
 
 /* update-game-score.c ends here */
diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index 4bf751b0450..57812295276 100755
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -112,4 +112,3 @@ do
         fi
 done
 
-# arch-tag: 4344ba3a-bcbe-4f77-971c-f43c1606953a