Sync to HEAD

20 files changed, 97 insertions, 34 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 5671c872ff0..cca47783b62 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,25 @@
+2003-10-01  Miles Bader  <miles@gnu.org>
+
+        * quick-install-emacs: Don't use "function" keyword when defining
+        shell functions.
+
+2003-09-27  Miles Bader  <miles@gnu.ai.mit.edu>
+
+        * quick-install-emacs: Remove fns-* pruning, since that file no
+        longer seems to be generated.
+        (AVOID): Quote literal periods.  Quote braces in a way acceptable
+        to all parties (gawk gets bitchy about using `\').
+
+2003-08-19  Miles Bader  <miles@gnu.org>
+
+        * quick-install-emacs: Add arch-specific ignored files to
+        quick-install-emacs.  Use quoting for periods that's acceptable
+        to recent versions of gawk.
+
+2003-08-11  Markus Rost  <rost@math.ohio-state.edu>
+
+        * cus-test.el: Remove obsolete workaround.
+
 2003-04-22  Andrew Innes  <andrewi@gnu.org>
 
         * nt/makedist.bat: Fix multi-file .zip distribution, by splitting
@@ -136,3 +158,5 @@
     Copyright (C) 2001 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: 97728c77-77c0-4156-b669-0e8c07d94e5a
diff --git a/admin/README b/admin/README
index 439d7874a5b..6f09464e0a3 100644
--- a/admin/README
+++ b/admin/README
@@ -22,3 +22,5 @@ Brief description of sub-directories:
 
 charsets                scripts for generating charset map files
                         in ../etc/charsets
+
+# arch-tag: 812b9461-bc0a-46a7-925e-24bd41118463
diff --git a/admin/admin.el b/admin/admin.el
index e16b26eb6a8..8048ccc78e0 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -89,4 +89,5 @@ Root must be the root of an Emacs source tree."
                        (rx (and "EMACSVER" (1+ space)
                                 (submatch (1+ (in "0-9.")))))))
 
+;;; arch-tag: 4ea83636-2293-408b-884e-ad64f22a3bf5
 ;; admin.el ends here.
diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index 4be2038ef1c..0aacb687232 100644
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -111,3 +111,6 @@ main (int argc, char **argv)
   XCloseDisplay (dpy);
   return 0;
 }
+
+/* arch-tag: f1be90ac-5b70-43c2-835e-5a6432a25145
+   (do not change this comment) */
diff --git a/admin/build-configs b/admin/build-configs
index 06ea9cb2875..1a21b90c171 100755
--- a/admin/build-configs
+++ b/admin/build-configs
@@ -97,3 +97,5 @@ foreach $config (@configs)
 # Local Variables:
 # mode: cperl
 # End:
+
+# arch-tag: 20a4452d-610a-4e54-9abc-ffe79f5c0d30
diff --git a/admin/check-doc-strings b/admin/check-doc-strings
index f5f750925eb..ce2166fce81 100755
--- a/admin/check-doc-strings
+++ b/admin/check-doc-strings
@@ -298,3 +298,4 @@ foreach my $fun (sort keys %texi_funtype) {
   }
 }
 
+# arch-tag: e75331f5-5d1b-4393-ad5b-b0f87b5d47b0
diff --git a/admin/cus-test.el b/admin/cus-test.el
index bebf89cdeb5..cf00bf214fb 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -150,18 +150,6 @@
 ;; This avoids a hang of `cus-test-apropos' in 21.2.
 ;; (add-to-list 'cus-test-skip-list 'sh-alias-alist)
 
-;; Don't create a file `filesets-menu-cache-file'.
-(setq filesets-menu-cache-file "")
-;; Disable filesets hooks.
-(add-hook
- 'cus-test-after-load-libs-hook
- (lambda nil
-   (remove-hook 'menu-bar-update-hook 'filesets-build-menu-maybe)
-   (remove-hook 'kill-emacs-hook 'filesets-exit)
-   (remove-hook 'kill-buffer-hook 'filesets-remove-from-ubl)
-   (remove-hook 'first-change-hook 'filesets-reset-filename-on-change)
-   ))
-
 ;; Loading dunnet in batch mode leads to a Dead end.
 (let (noninteractive) (load "dunnet"))
 (add-to-list 'cus-test-libs-noloads "dunnet")
@@ -538,4 +526,5 @@ in the Emacs source directory."
 
 (provide 'cus-test)
 
+;;; arch-tag: a4991a31-548d-48fb-8ba1-1ebbe68eb2e7
 ;;; cus-test.el ends here
diff --git a/admin/diff-tar-files b/admin/diff-tar-files
index 6536a5e109f..d827de3ec3e 100755
--- a/admin/diff-tar-files
+++ b/admin/diff-tar-files
@@ -42,3 +42,4 @@ diff -u $old_tmp $new_tmp
 rm -f $new_tmp $old_tmp
 
 
+# arch-tag: ef2c96e2-ea67-4668-925c-d9a6f3d205cf
diff --git a/admin/emacs-pretesters b/admin/emacs-pretesters
index 10ab3fd0da6..169c7ee466d 100644
--- a/admin/emacs-pretesters
+++ b/admin/emacs-pretesters
@@ -438,3 +438,5 @@ args[0]).
 Local Variables:
 mode: text
 End:
+
+# arch-tag: caf47b2c-b56b-44f7-a760-b5bfbed15fd3
diff --git a/admin/make-announcement b/admin/make-announcement
index 9f69889e17b..cc9d68726a1 100755
--- a/admin/make-announcement
+++ b/admin/make-announcement
@@ -64,3 +64,5 @@ EOF
 make-changelog-diff $oldtag $newtag
 
 echo " announcement created in $outfile" >&2
+
+# arch-tag: 605e00c7-7330-4c45-81e1-2ed53a13c39f
diff --git a/admin/make-changelog-diff b/admin/make-changelog-diff
index 45a77986835..7d98d22ddf9 100755
--- a/admin/make-changelog-diff
+++ b/admin/make-changelog-diff
@@ -24,3 +24,5 @@ cvs -q diff -b -r $1 -r $2 $(find -name ChangeLog|sort) |
                x
                s/^\n//
                p"
+
+# arch-tag: 7604a259-40b4-4f97-86b2-496a9c546f0a
diff --git a/admin/make-emacs b/admin/make-emacs
index fa7310ce94d..faa5dc2a39f 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -185,3 +185,5 @@ exit system "$make CC=\"$cc\" CFLAGS=\"$opts\" @ARGV";
 # Local Variables:
 # mode: cperl
 # End:
+
+# arch-tag: 5c3f9713-9ece-4a12-b3f8-deaff15974ba
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index a9753f3fc49..3af7cb81da3 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -1,5 +1,6 @@
 Instructions to create pretest or release tarballs.
--- originally written by Eli Zaretskii, amended by Francesco Potort́
+-- originally written by Gerd Moellmann, amended by Francesco Potort́
+   with the initial help of Eli Zaretskii
 
 For each step, check for possible errors.
 
@@ -9,24 +10,30 @@ For each step, check for possible errors.
     make sure that the later tagged version will bootstrap, should it be
     necessary to check it out.
 
-3.  Set the version number (M-x load-file RET admin/admin.el RET, then
+3.  Regenerate Emacs' AUTHORS file (M-x load-file RET
+    lisp/emacs-lisp/authors.el RET, then M-x authors RET, then save
+    the *Authors* buffer).  This may require fixing syntactically
+    incorrect ChangeLog entries beforehand.
+
+4.  Set the version number (M-x load-file RET admin/admin.el RET, then
     M-x set-version RET).  For a release, add released change log
     entries (M-x add-release-logs RET).
 
-4.  rm configure; make bootstrap
+5.  rm configure; make bootstrap
 
-5.  Commit configure, README, lisp/loaddefs.el, lisp/cus-load.el,
-    lisp/finder-inf.el, lisp/version.el, man/emacs.texi.  For a release,
-    also commit the ChangeLog files in all directories.
+6.  Commit configure, README, AUTHORS, lisp/loaddefs.el,
+    lisp/cus-load.el, lisp/finder-inf.el, lisp/version.el,
+    man/emacs.texi.  For a release, also commit the ChangeLog files in
+    all directories.
 
-6.  make-dist --snapshot.  Check the contents of the new tar with
+7.  make-dist --snapshot.  Check the contents of the new tar with
     admin/diff-tar-files against an older tar file.  Some old pretest
     tarballs are kept under fencepost.gnu.org:~pot/emacs-pretest/, while
     old emacs tarballs are at <ftp://ftp.gnu.org/pub/gnu/emacs/>.
 
-7.  xdelta delta emacs-OLD.tar.gz emacs-NEW.tar.gz emacs-OLD-NEW.xdelta
+8.  xdelta delta emacs-OLD.tar.gz emacs-NEW.tar.gz emacs-OLD-NEW.xdelta
 
-8.  tar -zxf emacs-NEW.tar.gz; cd emacs-NEW
+9.  tar -zxf emacs-NEW.tar.gz; cd emacs-NEW
     configure && make && make -n install
     Use `script' or M-x compile to save the compilation log in
     compile-NEW.log and compare it against an old one.  The easiest way
@@ -34,28 +41,36 @@ For each step, check for possible errors.
     number of the old Emacs to __, do the same with the new log and do
     M-x ediff. Especially check that Info files aren't built.
 
-9.  cd EMACS_ROOT_DIR; cvs tag TAG
+10. cd EMACS_ROOT_DIR; cvs tag TAG
     TAG is EMACS_PRETEST_XX_YY_ZZZ for a pretest, EMACS_XX_YY for a
     release.
 
-10. admin/make-announcement OLD NEW
+11. admin/make-announcement OLD NEW
     This creates an announcement for pretests.  OLD is the version used
     to make deltas with respect to NEW.  Anouncements for pretests need
     to be crafted by hand.  Use an older announcement to start with.
 
-11. For a pretest, do:
+12. For the moment, put the tarballs on a public site and send a GPG
+    signed email to <maintainers@gnu.org> with the URLs of the tarballs
+    and their md5sum signatures.  As of 2003-10, the GNU maintainers are
+    working on a better procedure.  For reference, here are the previous
+    instructions, which are no more valid after the break-in of 2003-08:
+     ====
+    For a pretest, do:
     rsync -aP emacs-NEW.tar.gz emacs-OLD-NEW.xdelta compile-NEW.log \
     emacs-NEW.announce alpha.gnu.org:/home/alpha/gnu/emacs/pretest/.
     For a release, do:
     rsync -aP emacs-NEW.tar.gz emacs-OLD-NEW.xdelta \
     alpha.gnu.org:/home/ftp/gnu/emacs/.
 
-12. Verify that the files are visible at
+13. Verify that the files are visible at
     ftp://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, at
     ftp://ftp.gnu.org/gnu/emacs/ for a release.
 
-13. For a pretest, let Richard Stallman know about the new pretest and
+14. For a pretest, let Richard Stallman know about the new pretest and
     tell him to announce it using the announcement you prepared.  Remind
     him to set a Reply-to header to <emacs-pretest-bug@gnu.org>.
     For a release, Richard should prepare the announcement himself,
     possibly starting from a previous announcment.
+
+# arch-tag: c23c771f-ca26-4584-8a04-50ecf0989390
diff --git a/admin/notes/cpp b/admin/notes/cpp
index 6815b88cccb..4f61a595f5e 100644
--- a/admin/notes/cpp
+++ b/admin/notes/cpp
@@ -16,3 +16,5 @@ this should not be defined for normal .c file compilation.
 
 there has been discussion on eliminating this use of cpp and relying
 solely on autoconf processing.  rms says to leave it be.
+
+;;; arch-tag: d654291e-9fc8-41b7-ab0c-d3cde842a8e0
diff --git a/admin/notes/iftc b/admin/notes/iftc
index 294464a8605..e8dcdd3a6d6 100644
--- a/admin/notes/iftc
+++ b/admin/notes/iftc
@@ -23,3 +23,5 @@ The comment /* iftc */ is used to mark this type of casting to differentiate
 it from other casting.  We commit the changes and can now go about modifying
 LOW and HIGH separately.  When HIGH is ready to handle the type change, the
 cast can be removed.
+
+;;; arch-tag: 3309cc41-5d59-421b-b7be-c94b04083bb5
diff --git a/admin/notes/trailing-whitespace b/admin/notes/trailing-whitespace
index bbf5c05f173..e29456b3a2f 100644
--- a/admin/notes/trailing-whitespace
+++ b/admin/notes/trailing-whitespace
@@ -4,3 +4,5 @@ apparently there was a big discussion on emacs-devel wrt trailing whitespace.
 there was a mass-change to remove such from various branches in cvs.  probably
 it's a good idea to avoid adding trailing whitespace in new code/docs and in
 changes.
+
+;;; arch-tag: de441379-c345-4826-a784-352b5413a698
diff --git a/admin/nt/dump.bat b/admin/nt/dump.bat
index 34f24d3a910..b332e7471f6 100755
--- a/admin/nt/dump.bat
+++ b/admin/nt/dump.bat
@@ -19,3 +19,7 @@ copy ..\etc\DOC* obj\etc
 copy temacs.exe obj\i386

 obj\i386\temacs -batch -l loadup dump

 copy obj\i386\emacs.exe .

+
+goto skipArchTag
+   arch-tag: 0ca3036d-3a1e-47ea-87c6-9c0845253496
+:skipArchTag
diff --git a/admin/nt/makedist.bat b/admin/nt/makedist.bat
index f34e7e532fe..feb6799080f 100755
--- a/admin/nt/makedist.bat
+++ b/admin/nt/makedist.bat
@@ -122,3 +122,7 @@ echo   (e.g., %0 19.34 emacs-19.34.5 d:\andrewi\distfiles)
 echo Or: %0 emacs-version dist-basename distfiles "zipfiles" short-version

 echo   (e.g., %0 20.6 emacs-20.6 d:\andrewi\distfiles zipfiles 206)

 :end

+
+goto skipArchTag
+   arch-tag: 6e2ddd92-c1c9-4992-b6b5-207aaab72f68
+:skipArchTag
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index ba39f7962f3..16cd936a783 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -8,7 +8,7 @@
 PUBLIC_LIBSRC_BINARIES='b2m emacsclient etags ctags ebrowse'
 PUBLIC_LIBSRC_SCRIPTS='grep-changelog rcs-checkin'
 
-AVOID="CVS -DIC README COPYING ChangeLog ~ \.orig$ \.rej$ Makefile makefile stamp-subdir .cvsignore \.[cho]$ make-docfile testfile test-distrib"
+AVOID="CVS -DIC README COPYING ChangeLog ~ [.]orig$ [.]rej$ Makefile makefile stamp-subdir [.]cvsignore [.]arch-ids [{]arch[}] [.][cho]$ make-docfile testfile test-distrib"
 
 # Prune old binaries lying around in the source tree
 PRUNE=no
@@ -133,7 +133,8 @@ elif test ! -r "$BUILD/config.status"; then
 fi
 
 CONFIG_STATUS="$BUILD/config.status"
-function get_config_var () {
+get_config_var ()
+{
   if ! sed -n "s/^s\(.\)@$1@\1\(.*\)\1.*$/\2/p" $CONFIG_STATUS | sed q | grep ''
   then
     echo 1>&2 "$me: $1: Configuration variable not found in $CONFIG_STATUS"
@@ -153,7 +154,8 @@ DST_BIN="$prefix/bin"
 DST_LIBEXEC="$prefix/libexec/emacs/$VERSION/$ARCH"
 DST_INFO="$prefix/info"
 
-function maybe_mkdir () {
+maybe_mkdir ()
+{
   if ! test -d "$1"; then
     $MKDIR "$1" 2>&1 | sed "s/^mkdir:/$me:/" 1>&2
   fi
@@ -177,15 +179,12 @@ if test x"$PRUNE" != xno; then
     echo $REMOVE_CMD $D
     PRUNED="$PRUNED $D"
   done
-  for D in `ls -1t $BUILD/lib-src/fns-* | sed 1d`; do
-    echo $REMOVE_CMD $D
-    PRUNED="$PRUNED $D"
-  done
 fi
 
 test x"$PRUNE" = xonly && exit 0
 
-function maybe_emit_copy () {
+maybe_emit_copy ()
+{
   if test "$FORCE" = yes || ! cmp -s $1 $2; then
     echo $LINK_CMD $1 $2
   fi
@@ -338,3 +337,5 @@ END {
 done
 
 ) | eval $EXEC
+
+# arch-tag: 9322b572-9755-4cf7-a67a-21e6505f1477
diff --git a/admin/revdiff b/admin/revdiff
index 416c572d196..5c9d2251c8c 100755
--- a/admin/revdiff
+++ b/admin/revdiff
@@ -133,3 +133,5 @@ while (@ARGV)
 # Local Variables:
 # mode: cperl
 # End:
+
+# arch-tag: 2798b20d-c7f2-4c78-8378-7bb529c36a09