Merge from mainline.

35 files changed, 49 insertions, 46 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 0346bb2e620..7febc93bb33 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -382,4 +382,3 @@ wait
 write
 xfree
 
-# arch-tag: bc80061a-1168-4911-9766-46aaf2640250
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 5b714193ab1..ca310c1b8f1 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,4 +1,4 @@
-2011-01-14  Paul Eggert  <eggert@cs.ucla.edu>
+2011-01-17  Paul Eggert  <eggert@cs.ucla.edu>
 
         Update copyright notes to match recent gnulib-related changes.
         * notes/copyright: Add aclocal.m4, m4/*.m4, lib/Makefile.in,
@@ -9,6 +9,13 @@
         subsumed by m4/*.m4 rule).  config.guess, config.sub, and
         doc/man/texinfo.tex are now copied in from gnulib.
 
+2011-01-15  Glenn Morris  <rgm@gnu.org>
+
+        * charsets/cp51932.awk, charsets/eucjp-ms.awk: No longer print arch-tag.
+
+        * bzrmerge.el (bzrmerge-missing): Add another skip indicator.
+        (bzrmerge-resolve): Also ignore cl-loaddefs.el.
+
 2011-01-14  Glenn Morris  <rgm@gnu.org>
 
         * admin.el (set-copyright): Also handle \year in refcards/*.tex.
diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index 432e4f5cf9f..1d988a25626 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -216,4 +216,3 @@ src/xrdb.c
 src/xselect.c
 src/xterm.c
 
-;;; arch-tag: 869126d4-4851-41b2-8470-14dd492a3c98
diff --git a/admin/README b/admin/README
index 17232f5f3a5..f47ce7964cc 100644
--- a/admin/README
+++ b/admin/README
@@ -90,4 +90,3 @@ mode: outline
 paragraph-separate: "[  ]*$"
 end:
 
-# arch-tag: 812b9461-bc0a-46a7-925e-24bd41118463
diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index 38312604248..27aa175fd46 100644
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -112,5 +112,3 @@ main (int argc, char **argv)
   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 759750f8475..edabf47fe1f 100755
--- a/admin/build-configs
+++ b/admin/build-configs
@@ -97,4 +97,3 @@ foreach $config (@configs)
 # mode: cperl
 # End:
 
-# arch-tag: 20a4452d-610a-4e54-9abc-ffe79f5c0d30
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index ca10d2a87a2..6764cbf853a 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -115,7 +115,7 @@ are both lists of revnos, in oldest-first order."
               (re-search-forward "^message:\n")
               (while (and (not skip)
                           (re-search-forward
-                           "back[- ]?port\\|merge\\|re-?generate\\|bump version" nil t))
+                           "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version" nil t))
                 (let ((str (buffer-substring (line-beginning-position)
                                              (line-end-position))))
                   (when (string-match "\\` *" str)
@@ -173,7 +173,8 @@ are both lists of revnos, in oldest-first order."
             ))
           ;; Try to resolve the conflicts.
           (cond
-           ((member file '("configure" "lisp/ldefs-boot.el"))
+           ((member file '("configure" "lisp/ldefs-boot.el"
+                           "lisp/emacs-lisp/cl-loaddefs.el"))
             (call-process "bzr" nil t nil "revert" file)
             (revert-buffer nil 'noconfirm))
            (t
diff --git a/admin/charsets/Makefile b/admin/charsets/Makefile
index a041f7f14ab..b16e7ccd748 100644
--- a/admin/charsets/Makefile
+++ b/admin/charsets/Makefile
@@ -307,4 +307,3 @@ install:
 clean:
         rm -f ${CHARSETS} ${TRANS_TABLE}
 
-# arch-tag: 90b3bf30-1fef-45bf-b30c-665c30c22310
diff --git a/admin/charsets/big5.awk b/admin/charsets/big5.awk
index 7cae450ba53..7482d11a2d1 100644
--- a/admin/charsets/big5.awk
+++ b/admin/charsets/big5.awk
@@ -70,4 +70,3 @@ function decode_big5(big5) {
 }
 
 
-# arch-tag: 36f08d21-0d24-4b67-852d-a9a51299586d
diff --git a/admin/charsets/compact.awk b/admin/charsets/compact.awk
index 83b5a7f0e34..b7d1fd19d8e 100644
--- a/admin/charsets/compact.awk
+++ b/admin/charsets/compact.awk
@@ -120,4 +120,3 @@ END {
     }
 }
 
-# arch-tag: 7e6f57c3-8e62-4af3-8916-ca67bca3a0ce
diff --git a/admin/charsets/cp51932.awk b/admin/charsets/cp51932.awk
index 6cf2f37dbd3..39ccc1c7dc1 100644
--- a/admin/charsets/cp51932.awk
+++ b/admin/charsets/cp51932.awk
@@ -52,8 +52,4 @@ END {
   print "             (setcar x (cdr x)) (setcdr x tmp)))";
   print "       map)";
   print "  (define-translation-table 'cp51932-encode map))";
-  print "";
-  print ";; arch-tag: d21c06e5-a548-4dda-8802-c2922ff19da3";
 }
-
-# arch-tag: bbae996b-2d1c-4e85-bb55-ac30146d7504
diff --git a/admin/charsets/cp932.awk b/admin/charsets/cp932.awk
index d6f1966894e..acba0333371 100644
--- a/admin/charsets/cp932.awk
+++ b/admin/charsets/cp932.awk
@@ -114,4 +114,3 @@ END {
     }
 }
 
-# arch-tag: 998dc444-759d-43ef-87e3-2ab205011394
diff --git a/admin/charsets/eucjp-ms.awk b/admin/charsets/eucjp-ms.awk
index 15803525997..18c19f5fb55 100644
--- a/admin/charsets/eucjp-ms.awk
+++ b/admin/charsets/eucjp-ms.awk
@@ -106,8 +106,5 @@ END {
   print "             (setcar x (cdr x)) (setcdr x tmp)))";
   print "       map)";
   print "  (define-translation-table 'eucjp-ms-encode map))";
-  print "";
-  print ";; arch-tag: c4191096-288a-4f13-9b2a-ee7a1f11eb4a";
 }
 
-# arch-tag: d9cc7af7-2d6e-48cd-8eed-a6d25226de7c
diff --git a/admin/charsets/gb180302.awk b/admin/charsets/gb180302.awk
index 7b89c903beb..6cd9521ce90 100644
--- a/admin/charsets/gb180302.awk
+++ b/admin/charsets/gb180302.awk
@@ -98,4 +98,3 @@ END {
       index_to_gb(from_gb), index_to_gb(to_gb), from_unicode;
 }
 
-# arch-tag: d7dbad89-a512-41a4-8ee0-ba1a4505b8c1
diff --git a/admin/charsets/gb180304.awk b/admin/charsets/gb180304.awk
index c1b691b9a63..3c16cb556ea 100644
--- a/admin/charsets/gb180304.awk
+++ b/admin/charsets/gb180304.awk
@@ -120,4 +120,3 @@ END {
     }
 }
 
-# arch-tag: 8e5a22ae-610e-411f-ae17-d6e528b30d71
diff --git a/admin/charsets/kuten.awk b/admin/charsets/kuten.awk
index 9d43f2e0e8f..2bc58c438d0 100644
--- a/admin/charsets/kuten.awk
+++ b/admin/charsets/kuten.awk
@@ -4,4 +4,3 @@
   printf "0x%02X%02X %s\n", ku, ten, $2;
 }
 
-# arch-tag: dade6b45-b4c5-42ab-9d49-d6bf23a710b6
diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv
index deb69e2a1a9..4f7a8b96f54 100755
--- a/admin/charsets/mapconv
+++ b/admin/charsets/mapconv
@@ -143,4 +143,3 @@ else
     exit 1
 fi
 
-# arch-tag: c33acb47-7eb6-4872-b871-15e1447e8f0e
diff --git a/admin/charsets/mule-charsets.el b/admin/charsets/mule-charsets.el
index 6234471e9eb..59969c3df28 100644
--- a/admin/charsets/mule-charsets.el
+++ b/admin/charsets/mule-charsets.el
@@ -54,4 +54,3 @@
     (map-charset-chars 'func (cdr elt))
     (write-file (car elt))))
 
-;;; arch-tag: 515989d7-2e2d-41cc-9163-05ad472fede4
diff --git a/admin/check-doc-strings b/admin/check-doc-strings
index daed2926b20..ef4b203cd79 100755
--- a/admin/check-doc-strings
+++ b/admin/check-doc-strings
@@ -301,4 +301,3 @@ 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 060e100f6c4..2fc8b139406 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -525,5 +525,4 @@ 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 92198bad892..c09d95c2ec1 100755
--- a/admin/diff-tar-files
+++ b/admin/diff-tar-files
@@ -42,4 +42,3 @@ 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 2e1ee64b248..3b1270b477c 100644
--- a/admin/emacs-pretesters
+++ b/admin/emacs-pretesters
@@ -215,4 +215,3 @@ Local Variables:
 mode: text
 End:
 
-# arch-tag: caf47b2c-b56b-44f7-a760-b5bfbed15fd3
diff --git a/admin/make-announcement b/admin/make-announcement
index 180c35601b3..4e2e70a9a4b 100755
--- a/admin/make-announcement
+++ b/admin/make-announcement
@@ -86,4 +86,3 @@ 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 5ab468c8f5d..88461131a3f 100755
--- a/admin/make-changelog-diff
+++ b/admin/make-changelog-diff
@@ -27,4 +27,3 @@ cvs -q diff -b -r $1 -r $2 $(find -name ChangeLog|sort) |
                s/^\n//
                p"
 
-# arch-tag: 7604a259-40b4-4f97-86b2-496a9c546f0a
diff --git a/admin/make-emacs b/admin/make-emacs
index 9abfa731be5..9937d61d85f 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -185,4 +185,3 @@ exit system "$make CC=\"$cc\" CFLAGS=\"$opts\" @ARGV";
 # mode: cperl
 # End:
 
-# arch-tag: 5c3f9713-9ece-4a12-b3f8-deaff15974ba
diff --git a/admin/notes/bzr b/admin/notes/bzr
index c66cdd98a3c..7a668b13f1c 100644
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -38,3 +38,37 @@ Or use shelves; or rebase; or do something else.  See the thread for
 yet another fun excursion into the exciting world of version control.
 
 http://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00086.html
+
+* How to merge changes from emacs-23 to trunk
+
+The following description uses bound branches, presumably it works in
+a similar way with unbound ones.
+
+1) Get clean, up-to-date copies of the emacs-23 and trunk branches.
+Check for any uncommitted changes with bzr status.
+
+2) M-x cd /path/to/trunk
+
+3) load admin/bzrmerge.el
+
+4) M-x bzrmerge RET /path/to/emacs-23 RET
+
+It will prompt about revisions that should be skipped, based on the
+regexp in bzrmerge-missing.  If there are more revisions that you know
+need skipping, you'll have to do that by hand.
+
+5) It will stop if there are any conflicts. Resolve them.
+Using smerge-mode, there are menu items to skip to the next conflict,
+and to take either the trunk, branch, or both copies.
+
+6) After resolving all conflicts, you might need to run the command
+again if there are more revisions still to merge.
+You can commit either before you do this (eg if you had a lot of
+conflicts to resolve and don't want to get confused), or refrain from
+committing until bzrmerge has merged all revisions.
+
+Before committing, check bzr status and bzr diff output.
+
+Note that ChangeLog entries are automatically merged to the top with
+today's date, but you still might want to check them to see that too
+much is not being included.
diff --git a/admin/notes/iftc b/admin/notes/iftc
index e8dcdd3a6d6..983b1486685 100644
--- a/admin/notes/iftc
+++ b/admin/notes/iftc
@@ -24,4 +24,3 @@ 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/multi-tty b/admin/notes/multi-tty
index 1dfc56f7a10..aa0fdc772f6 100644
--- a/admin/notes/multi-tty
+++ b/admin/notes/multi-tty
@@ -1360,4 +1360,3 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; arch-tag: 8da1619e-2e79-41a8-9ac9-a0485daad17d
diff --git a/admin/notes/trailing-whitespace b/admin/notes/trailing-whitespace
index e29456b3a2f..8c85b8984d5 100644
--- a/admin/notes/trailing-whitespace
+++ b/admin/notes/trailing-whitespace
@@ -5,4 +5,3 @@ 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 c0e95426ccb..97ed396f206 100755
--- a/admin/nt/dump.bat
+++ b/admin/nt/dump.bat
@@ -18,6 +18,3 @@ 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/quick-install-emacs b/admin/quick-install-emacs
index d146fdad605..0e346cf5387 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -1,8 +1,8 @@
 #!/bin/sh
 ### quick-install-emacs --- do a halfway-decent job of installing emacs quickly
 
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-##   Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+##   2010, 2011  Free Software Foundation, Inc.
 
 ## Author: Miles Bader <miles@gnu.org>
 
diff --git a/admin/unidata/.gitignore b/admin/unidata/.gitignore
index 4f759a363db..3f2d8ca551d 100644
--- a/admin/unidata/.gitignore
+++ b/admin/unidata/.gitignore
@@ -1,4 +1,3 @@
 *.elc
 unidata.txt
 
-# arch-tag: 1b0c916f-3060-47b4-a8c9-cff5c3598adf
diff --git a/admin/unidata/bidimirror.awk b/admin/unidata/bidimirror.awk
index 7965f36ad0d..70aeb5dae59 100644
--- a/admin/unidata/bidimirror.awk
+++ b/admin/unidata/bidimirror.awk
@@ -1,6 +1,6 @@
 # Generate data for bidi_mirroring_table, see src/bidi.c:bidi_initialize.
 
-# Copyright (C) 2010, Free Software Foundation, Inc.
+# Copyright (C) 2010, 2011  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/admin/unidata/biditype.awk b/admin/unidata/biditype.awk
index 6e57884a879..865177a1fbb 100644
--- a/admin/unidata/biditype.awk
+++ b/admin/unidata/biditype.awk
@@ -1,6 +1,6 @@
 # Generate data for filling bidi_type_table, see src/bidi.c:bidi_initialize.
 
-# Copyright (C) 2010, Free Software Foundation, Inc.
+# Copyright (C) 2010, 2011  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/admin/unidata/copyright.html b/admin/unidata/copyright.html
index 57a6d3945c1..f414ca461f2 100644
--- a/admin/unidata/copyright.html
+++ b/admin/unidata/copyright.html
@@ -340,6 +340,3 @@ PERFORMANCE OF THE DATA FILES OR SOFTWARE.</p>
 
 
 </html>
-
-<!-- arch-tag: 359e3efa-6eb2-4b4e-841c-f002d7924c5e
-     (do not change this comment) -->