summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-01-17 11:01:01 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-01-17 11:01:01 -0800
commita3e44e793796153ff1534be9c74fcab50b45de30 (patch)
tree863d5db087c8e034c96d06ea955515f4d3f3d0a3
parent7f818df9420a1320539f7e3e633003573a570413 (diff)
parent721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff)
Merge from mainline.
-rw-r--r--ChangeLog15
-rw-r--r--Makefile.in3
-rw-r--r--admin/CPP-DEFINES1
-rw-r--r--admin/ChangeLog9
-rw-r--r--admin/MAINTAINERS1
-rw-r--r--admin/README1
-rw-r--r--admin/alloc-colors.c2
-rwxr-xr-xadmin/build-configs1
-rw-r--r--admin/bzrmerge.el5
-rw-r--r--admin/charsets/Makefile1
-rw-r--r--admin/charsets/big5.awk1
-rw-r--r--admin/charsets/compact.awk1
-rw-r--r--admin/charsets/cp51932.awk4
-rw-r--r--admin/charsets/cp932.awk1
-rw-r--r--admin/charsets/eucjp-ms.awk3
-rw-r--r--admin/charsets/gb180302.awk1
-rw-r--r--admin/charsets/gb180304.awk1
-rw-r--r--admin/charsets/kuten.awk1
-rwxr-xr-xadmin/charsets/mapconv1
-rw-r--r--admin/charsets/mule-charsets.el1
-rwxr-xr-xadmin/check-doc-strings1
-rw-r--r--admin/cus-test.el1
-rwxr-xr-xadmin/diff-tar-files1
-rw-r--r--admin/emacs-pretesters1
-rwxr-xr-xadmin/make-announcement1
-rwxr-xr-xadmin/make-changelog-diff1
-rwxr-xr-xadmin/make-emacs1
-rw-r--r--admin/notes/bzr34
-rw-r--r--admin/notes/iftc1
-rw-r--r--admin/notes/multi-tty1
-rw-r--r--admin/notes/trailing-whitespace1
-rwxr-xr-xadmin/nt/dump.bat3
-rwxr-xr-xadmin/quick-install-emacs4
-rw-r--r--admin/unidata/.gitignore1
-rw-r--r--admin/unidata/bidimirror.awk2
-rw-r--r--admin/unidata/biditype.awk2
-rw-r--r--admin/unidata/copyright.html3
-rwxr-xr-xautogen.sh2
-rw-r--r--config.bat3
-rwxr-xr-xconfigure12
-rw-r--r--configure.in2
-rw-r--r--doc/emacs/ChangeLog17
-rw-r--r--doc/emacs/Makefile.in3
-rw-r--r--doc/emacs/abbrevs.texi4
-rw-r--r--doc/emacs/anti.texi4
-rw-r--r--doc/emacs/arevert-xtra.texi4
-rw-r--r--doc/emacs/buffers.texi4
-rw-r--r--doc/emacs/building.texi12
-rw-r--r--doc/emacs/cal-xtra.texi4
-rw-r--r--doc/emacs/calendar.texi4
-rw-r--r--doc/emacs/cmdargs.texi4
-rw-r--r--doc/emacs/commands.texi4
-rw-r--r--doc/emacs/custom.texi4
-rw-r--r--doc/emacs/dired-xtra.texi4
-rw-r--r--doc/emacs/dired.texi4
-rw-r--r--doc/emacs/display.texi4
-rw-r--r--doc/emacs/doclicense.texi4
-rw-r--r--doc/emacs/emacs-xtra.texi4
-rw-r--r--doc/emacs/emerge-xtra.texi4
-rw-r--r--doc/emacs/entering.texi4
-rw-r--r--doc/emacs/files.texi38
-rw-r--r--doc/emacs/fixit.texi4
-rw-r--r--doc/emacs/fortran-xtra.texi4
-rw-r--r--doc/emacs/frames.texi4
-rw-r--r--doc/emacs/glossary.texi4
-rw-r--r--doc/emacs/gnu.texi4
-rw-r--r--doc/emacs/gpl.texi4
-rw-r--r--doc/emacs/help.texi4
-rw-r--r--doc/emacs/indent.texi4
-rw-r--r--doc/emacs/killing.texi4
-rw-r--r--doc/emacs/kmacro.texi4
-rw-r--r--doc/emacs/m-x.texi4
-rw-r--r--doc/emacs/major.texi4
-rw-r--r--doc/emacs/mark.texi4
-rw-r--r--doc/emacs/mini.texi4
-rw-r--r--doc/emacs/misc.texi4
-rw-r--r--doc/emacs/msdog-xtra.texi4
-rw-r--r--doc/emacs/msdog.texi32
-rw-r--r--doc/emacs/mule.texi4
-rw-r--r--doc/emacs/picture-xtra.texi4
-rw-r--r--doc/emacs/programs.texi4
-rw-r--r--doc/emacs/regs.texi4
-rw-r--r--doc/emacs/rmail.texi4
-rw-r--r--doc/emacs/screen.texi4
-rw-r--r--doc/emacs/search.texi4
-rw-r--r--doc/emacs/sending.texi4
-rw-r--r--doc/emacs/text.texi4
-rw-r--r--doc/emacs/vc-xtra.texi4
-rw-r--r--doc/emacs/vc1-xtra.texi4
-rw-r--r--doc/emacs/windows.texi4
-rw-r--r--doc/emacs/xresources.texi4
-rw-r--r--doc/lispintro/ChangeLog4
-rw-r--r--doc/lispintro/Makefile.in3
-rw-r--r--doc/lispintro/doclicense.texi4
-rw-r--r--doc/lispref/ChangeLog10
-rw-r--r--doc/lispref/abbrevs.texi4
-rw-r--r--doc/lispref/advice.texi4
-rw-r--r--doc/lispref/anti.texi4
-rw-r--r--doc/lispref/back.texi4
-rw-r--r--doc/lispref/backups.texi4
-rw-r--r--doc/lispref/buffers.texi3
-rw-r--r--doc/lispref/commands.texi4
-rw-r--r--doc/lispref/compile.texi4
-rw-r--r--doc/lispref/control.texi4
-rw-r--r--doc/lispref/customize.texi4
-rw-r--r--doc/lispref/debugging.texi4
-rw-r--r--doc/lispref/display.texi4
-rw-r--r--doc/lispref/doclicense.texi4
-rw-r--r--doc/lispref/edebug.texi4
-rw-r--r--doc/lispref/elisp-covers.texi4
-rw-r--r--doc/lispref/errors.texi4
-rw-r--r--doc/lispref/eval.texi4
-rw-r--r--doc/lispref/files.texi55
-rw-r--r--doc/lispref/frames.texi4
-rw-r--r--doc/lispref/front-cover-1.texi4
-rw-r--r--doc/lispref/functions.texi4
-rw-r--r--doc/lispref/gpl.texi4
-rw-r--r--doc/lispref/hash.texi4
-rw-r--r--doc/lispref/help.texi3
-rw-r--r--doc/lispref/hooks.texi4
-rw-r--r--doc/lispref/internals.texi4
-rw-r--r--doc/lispref/intro.texi4
-rw-r--r--doc/lispref/keymaps.texi4
-rw-r--r--doc/lispref/lay-flat.texi4
-rw-r--r--doc/lispref/lists.texi4
-rw-r--r--doc/lispref/loading.texi4
-rw-r--r--doc/lispref/locals.texi4
-rw-r--r--doc/lispref/macros.texi4
-rw-r--r--doc/lispref/markers.texi4
-rw-r--r--doc/lispref/minibuf.texi4
-rw-r--r--doc/lispref/nonascii.texi4
-rw-r--r--doc/lispref/numbers.texi4
-rw-r--r--doc/lispref/objects.texi4
-rw-r--r--doc/lispref/os.texi4
-rw-r--r--doc/lispref/package.texi2
-rw-r--r--doc/lispref/positions.texi4
-rw-r--r--doc/lispref/processes.texi4
-rw-r--r--doc/lispref/searching.texi4
-rw-r--r--doc/lispref/sequences.texi4
-rw-r--r--doc/lispref/streams.texi4
-rw-r--r--doc/lispref/strings.texi4
-rw-r--r--doc/lispref/symbols.texi4
-rw-r--r--doc/lispref/syntax.texi4
-rwxr-xr-xdoc/lispref/tindex.pl1
-rw-r--r--doc/lispref/tips.texi4
-rw-r--r--doc/lispref/two-volume.make1
-rw-r--r--doc/lispref/two.el1
-rw-r--r--doc/lispref/variables.texi4
-rw-r--r--doc/lispref/windows.texi4
-rw-r--r--doc/man/ChangeLog1
-rw-r--r--doc/man/ctags.12
-rw-r--r--doc/man/ebrowse.11
-rw-r--r--doc/man/emacs.11
-rw-r--r--doc/man/emacsclient.11
-rw-r--r--doc/man/etags.11
-rw-r--r--doc/man/grep-changelog.11
-rw-r--r--doc/man/rcs-checkin.11
-rw-r--r--doc/misc/Makefile.in3
-rw-r--r--doc/misc/ada-mode.texi4
-rw-r--r--doc/misc/autotype.texi4
-rw-r--r--doc/misc/dbus.texi4
-rw-r--r--doc/misc/dired-x.texi4
-rw-r--r--doc/misc/ebrowse.texi4
-rw-r--r--doc/misc/ede.texi4
-rw-r--r--doc/misc/eieio.texi4
-rw-r--r--doc/misc/epa.texi4
-rw-r--r--doc/misc/erc.texi4
-rw-r--r--doc/misc/eshell.texi4
-rw-r--r--doc/misc/flymake.texi4
-rw-r--r--doc/misc/forms.texi4
-rw-r--r--doc/misc/gpl.texi4
-rw-r--r--doc/misc/idlwave.texi4
-rw-r--r--doc/misc/info.texi4
-rw-r--r--doc/misc/mairix-el.texi4
-rw-r--r--doc/misc/newsticker.texi4
-rw-r--r--doc/misc/org.texi4
-rw-r--r--doc/misc/pcl-cvs.texi4
-rw-r--r--doc/misc/rcirc.texi4
-rw-r--r--doc/misc/reftex.texi4
-rw-r--r--doc/misc/remember.texi4
-rw-r--r--doc/misc/sc.texi4
-rw-r--r--doc/misc/sem-user.texi4
-rw-r--r--doc/misc/semantic.texi4
-rw-r--r--doc/misc/ses.texi4
-rw-r--r--doc/misc/smtpmail.texi4
-rw-r--r--doc/misc/speedbar.texi4
-rw-r--r--doc/misc/url.texi4
-rw-r--r--doc/misc/vip.texi4
-rw-r--r--doc/misc/viper.texi4
-rw-r--r--doc/misc/widget.texi4
-rw-r--r--doc/misc/woman.texi4
-rw-r--r--etc/.gitignore2
-rw-r--r--etc/DEBUG1
-rw-r--r--etc/ERC-NEWS1
-rw-r--r--etc/MACHINES1
-rw-r--r--etc/MAILINGLISTS1
-rw-r--r--etc/MH-E-NEWS1
-rw-r--r--etc/MORE.STUFF1
-rw-r--r--etc/NEWS.1-171
-rw-r--r--etc/NEWS.181
-rw-r--r--etc/NEWS.191
-rw-r--r--etc/NEWS.221
-rw-r--r--etc/NEWS.235
-rw-r--r--etc/NEXTSTEP2
-rw-r--r--etc/SERVICE1
-rw-r--r--etc/TODO4
-rw-r--r--etc/edt-user.el1
-rw-r--r--etc/emacs-buffer.gdb1
-rw-r--r--etc/emacs.py1
-rw-r--r--etc/emacs2.py1
-rw-r--r--etc/emacs3.py1
-rw-r--r--etc/images/checked.xpm2
-rw-r--r--etc/images/mpc/ffwd.xpm1
-rw-r--r--etc/images/mpc/next.xpm1
-rw-r--r--etc/images/mpc/pause.xpm1
-rw-r--r--etc/images/mpc/play.xpm1
-rw-r--r--etc/images/mpc/prev.xpm1
-rw-r--r--etc/images/mpc/rewind.xpm1
-rw-r--r--etc/images/mpc/stop.xpm1
-rw-r--r--etc/images/unchecked.xpm2
-rw-r--r--etc/nxml/00000-0007F.el1
-rw-r--r--etc/nxml/00080-000FF.el1
-rw-r--r--etc/nxml/00100-0017F.el1
-rw-r--r--etc/nxml/00180-0024F.el1
-rw-r--r--etc/nxml/00250-002AF.el1
-rw-r--r--etc/nxml/002B0-002FF.el1
-rw-r--r--etc/nxml/00300-0036F.el1
-rw-r--r--etc/nxml/00370-003FF.el1
-rw-r--r--etc/nxml/00400-004FF.el1
-rw-r--r--etc/nxml/00500-0052F.el1
-rw-r--r--etc/nxml/00530-0058F.el1
-rw-r--r--etc/nxml/00590-005FF.el1
-rw-r--r--etc/nxml/00600-006FF.el1
-rw-r--r--etc/nxml/00700-0074F.el1
-rw-r--r--etc/nxml/00780-007BF.el1
-rw-r--r--etc/nxml/00900-0097F.el1
-rw-r--r--etc/nxml/00980-009FF.el1
-rw-r--r--etc/nxml/00A00-00A7F.el1
-rw-r--r--etc/nxml/00A80-00AFF.el1
-rw-r--r--etc/nxml/00B00-00B7F.el1
-rw-r--r--etc/nxml/00B80-00BFF.el1
-rw-r--r--etc/nxml/00C00-00C7F.el1
-rw-r--r--etc/nxml/00C80-00CFF.el1
-rw-r--r--etc/nxml/00D00-00D7F.el1
-rw-r--r--etc/nxml/00D80-00DFF.el1
-rw-r--r--etc/nxml/00E00-00E7F.el1
-rw-r--r--etc/nxml/00E80-00EFF.el1
-rw-r--r--etc/nxml/00F00-00FFF.el1
-rw-r--r--etc/nxml/01000-0109F.el1
-rw-r--r--etc/nxml/010A0-010FF.el1
-rw-r--r--etc/nxml/01100-011FF.el1
-rw-r--r--etc/nxml/01200-0137F.el1
-rw-r--r--etc/nxml/013A0-013FF.el1
-rw-r--r--etc/nxml/01400-0167F.el1
-rw-r--r--etc/nxml/01680-0169F.el1
-rw-r--r--etc/nxml/016A0-016FF.el1
-rw-r--r--etc/nxml/01700-0171F.el1
-rw-r--r--etc/nxml/01720-0173F.el1
-rw-r--r--etc/nxml/01740-0175F.el1
-rw-r--r--etc/nxml/01760-0177F.el1
-rw-r--r--etc/nxml/01780-017FF.el1
-rw-r--r--etc/nxml/01800-018AF.el1
-rw-r--r--etc/nxml/01E00-01EFF.el1
-rw-r--r--etc/nxml/01F00-01FFF.el1
-rw-r--r--etc/nxml/02000-0206F.el1
-rw-r--r--etc/nxml/02070-0209F.el1
-rw-r--r--etc/nxml/020A0-020CF.el1
-rw-r--r--etc/nxml/020D0-020FF.el1
-rw-r--r--etc/nxml/02100-0214F.el1
-rw-r--r--etc/nxml/02150-0218F.el1
-rw-r--r--etc/nxml/02190-021FF.el1
-rw-r--r--etc/nxml/02200-022FF.el1
-rw-r--r--etc/nxml/02300-023FF.el1
-rw-r--r--etc/nxml/02400-0243F.el1
-rw-r--r--etc/nxml/02440-0245F.el1
-rw-r--r--etc/nxml/02460-024FF.el1
-rw-r--r--etc/nxml/02500-0257F.el1
-rw-r--r--etc/nxml/02580-0259F.el1
-rw-r--r--etc/nxml/025A0-025FF.el1
-rw-r--r--etc/nxml/02600-026FF.el1
-rw-r--r--etc/nxml/02700-027BF.el1
-rw-r--r--etc/nxml/027C0-027EF.el1
-rw-r--r--etc/nxml/027F0-027FF.el1
-rw-r--r--etc/nxml/02800-028FF.el1
-rw-r--r--etc/nxml/02900-0297F.el1
-rw-r--r--etc/nxml/02980-029FF.el1
-rw-r--r--etc/nxml/02A00-02AFF.el1
-rw-r--r--etc/nxml/02E80-02EFF.el1
-rw-r--r--etc/nxml/02F00-02FDF.el1
-rw-r--r--etc/nxml/02FF0-02FFF.el1
-rw-r--r--etc/nxml/03000-0303F.el1
-rw-r--r--etc/nxml/03040-0309F.el1
-rw-r--r--etc/nxml/030A0-030FF.el1
-rw-r--r--etc/nxml/03100-0312F.el1
-rw-r--r--etc/nxml/03130-0318F.el1
-rw-r--r--etc/nxml/03190-0319F.el1
-rw-r--r--etc/nxml/031A0-031BF.el1
-rw-r--r--etc/nxml/031F0-031FF.el1
-rw-r--r--etc/nxml/03200-032FF.el1
-rw-r--r--etc/nxml/03300-033FF.el1
-rw-r--r--etc/nxml/03400-04DBF.el1
-rw-r--r--etc/nxml/0A000-0A48F.el1
-rw-r--r--etc/nxml/0A490-0A4CF.el1
-rw-r--r--etc/nxml/0FB00-0FB4F.el1
-rw-r--r--etc/nxml/0FB50-0FDFF.el1
-rw-r--r--etc/nxml/0FE00-0FE0F.el1
-rw-r--r--etc/nxml/0FE20-0FE2F.el1
-rw-r--r--etc/nxml/0FE30-0FE4F.el1
-rw-r--r--etc/nxml/0FE50-0FE6F.el1
-rw-r--r--etc/nxml/0FE70-0FEFF.el1
-rw-r--r--etc/nxml/0FF00-0FFEF.el1
-rw-r--r--etc/nxml/0FFF0-0FFFF.el1
-rw-r--r--etc/nxml/10300-1032F.el1
-rw-r--r--etc/nxml/10330-1034F.el1
-rw-r--r--etc/nxml/10400-1044F.el1
-rw-r--r--etc/nxml/1D000-1D0FF.el1
-rw-r--r--etc/nxml/1D100-1D1FF.el1
-rw-r--r--etc/nxml/1D400-1D7FF.el1
-rw-r--r--etc/nxml/E0000-E007F.el1
-rw-r--r--etc/nxml/test-invalid.xml3
-rw-r--r--etc/nxml/test-valid.xml3
-rw-r--r--etc/refcards/pdflayout.sty4
-rw-r--r--etc/schema/schemas.xml3
-rw-r--r--etc/ses-example.ses1
-rw-r--r--etc/themes/tsdh-dark-theme.el1
-rw-r--r--etc/themes/tsdh-light-theme.el1
-rw-r--r--etc/themes/wheatgrass-theme.el2
-rw-r--r--etc/tutorials/TUTORIAL1
-rw-r--r--etc/tutorials/TUTORIAL.bg1
-rw-r--r--etc/tutorials/TUTORIAL.cn1
-rw-r--r--etc/tutorials/TUTORIAL.cs1
-rw-r--r--etc/tutorials/TUTORIAL.de1
-rw-r--r--etc/tutorials/TUTORIAL.eo1
-rw-r--r--etc/tutorials/TUTORIAL.es1
-rw-r--r--etc/tutorials/TUTORIAL.fr1
-rw-r--r--etc/tutorials/TUTORIAL.he2
-rw-r--r--etc/tutorials/TUTORIAL.it1
-rw-r--r--etc/tutorials/TUTORIAL.ja1
-rw-r--r--etc/tutorials/TUTORIAL.ko1
-rw-r--r--etc/tutorials/TUTORIAL.nl1
-rw-r--r--etc/tutorials/TUTORIAL.pl1
-rw-r--r--etc/tutorials/TUTORIAL.pt_BR1
-rw-r--r--etc/tutorials/TUTORIAL.ro1
-rw-r--r--etc/tutorials/TUTORIAL.ru1
-rw-r--r--etc/tutorials/TUTORIAL.sk1
-rw-r--r--etc/tutorials/TUTORIAL.sl1
-rw-r--r--etc/tutorials/TUTORIAL.sv1
-rw-r--r--etc/tutorials/TUTORIAL.th1
-rw-r--r--etc/tutorials/TUTORIAL.translators1
-rw-r--r--etc/tutorials/TUTORIAL.zh1
-rw-r--r--info/.gitignore2
-rw-r--r--leim/.gitignore2
-rw-r--r--leim/CXTERM-DIC/4Corner.tit1
-rw-r--r--leim/CXTERM-DIC/ARRAY30.tit1
-rw-r--r--leim/CXTERM-DIC/CCDOSPY.tit1
-rw-r--r--leim/CXTERM-DIC/ECDICT.tit1
-rw-r--r--leim/CXTERM-DIC/ETZY.tit1
-rw-r--r--leim/CXTERM-DIC/PY-b5.tit1
-rw-r--r--leim/CXTERM-DIC/Punct-b5.tit1
-rw-r--r--leim/CXTERM-DIC/Punct.tit1
-rw-r--r--leim/CXTERM-DIC/QJ-b5.tit1
-rw-r--r--leim/CXTERM-DIC/QJ.tit1
-rw-r--r--leim/CXTERM-DIC/SW.tit1
-rw-r--r--leim/CXTERM-DIC/TONEPY.tit1
-rw-r--r--leim/CXTERM-DIC/ZOZY.tit1
-rw-r--r--leim/ChangeLog1
-rw-r--r--leim/MISC-DIC/CTLau-b5.html3
-rw-r--r--leim/MISC-DIC/CTLau.html3
-rw-r--r--leim/leim-ext.el1
-rw-r--r--leim/quail/.gitignore1
-rw-r--r--leim/quail/arabic.el1
-rw-r--r--leim/quail/croatian.el1
-rw-r--r--leim/quail/cyril-jis.el1
-rw-r--r--leim/quail/cyrillic.el1
-rw-r--r--leim/quail/czech.el1
-rw-r--r--leim/quail/ethiopic.el1
-rw-r--r--leim/quail/georgian.el1
-rw-r--r--leim/quail/greek.el1
-rw-r--r--leim/quail/hangul.el1
-rw-r--r--leim/quail/hanja-jis.el1
-rw-r--r--leim/quail/hanja.el1
-rw-r--r--leim/quail/hanja3.el1
-rw-r--r--leim/quail/hebrew.el1
-rw-r--r--leim/quail/indian.el1
-rw-r--r--leim/quail/ipa.el1
-rw-r--r--leim/quail/japanese.el1
-rw-r--r--leim/quail/lao.el1
-rw-r--r--leim/quail/latin-alt.el1
-rw-r--r--leim/quail/latin-ltx.el1
-rw-r--r--leim/quail/latin-post.el1
-rw-r--r--leim/quail/latin-pre.el1
-rw-r--r--leim/quail/lrt.el1
-rw-r--r--leim/quail/py-punct.el1
-rw-r--r--leim/quail/pypunct-b5.el1
-rw-r--r--leim/quail/rfc1345.el1
-rw-r--r--leim/quail/sgml-input.el1
-rw-r--r--leim/quail/sisheng.el1
-rw-r--r--leim/quail/slovak.el1
-rw-r--r--leim/quail/symbol-ksc.el1
-rw-r--r--leim/quail/thai.el1
-rw-r--r--leim/quail/tibetan.el1
-rw-r--r--leim/quail/uni-input.el1
-rw-r--r--leim/quail/viqr.el1
-rw-r--r--leim/quail/vntelex.el1
-rw-r--r--leim/quail/welsh.el1
-rw-r--r--lib-src/.gitignore2
-rw-r--r--lib-src/emacsclient.c2
-rw-r--r--lib-src/fakemail.c2
-rw-r--r--lib-src/gettext.h82
-rwxr-xr-xlib-src/grep-changelog1
-rw-r--r--lib-src/hexl.c2
-rw-r--r--lib-src/make-docfile.c2
-rw-r--r--lib-src/movemail.c2
-rw-r--r--lib-src/ntlib.c2
-rw-r--r--lib-src/ntlib.h2
-rw-r--r--lib-src/pop.c2
-rw-r--r--lib-src/pop.h2
-rw-r--r--lib-src/profile.c2
-rwxr-xr-xlib-src/rcs-checkin1
-rw-r--r--lib-src/test-distrib.c2
-rw-r--r--lib-src/update-game-score.c2
-rwxr-xr-xlib-src/vcdiff1
-rw-r--r--lisp/ChangeLog168
-rw-r--r--lisp/ChangeLog.11
-rw-r--r--lisp/ChangeLog.101
-rw-r--r--lisp/ChangeLog.111
-rw-r--r--lisp/ChangeLog.121
-rw-r--r--lisp/ChangeLog.141
-rw-r--r--lisp/ChangeLog.21
-rw-r--r--lisp/ChangeLog.31
-rw-r--r--lisp/ChangeLog.41
-rw-r--r--lisp/ChangeLog.51
-rw-r--r--lisp/ChangeLog.61
-rw-r--r--lisp/ChangeLog.71
-rw-r--r--lisp/ChangeLog.81
-rw-r--r--lisp/ChangeLog.91
-rw-r--r--lisp/abbrev.el4
-rw-r--r--lisp/abbrevlist.el1
-rw-r--r--lisp/align.el1
-rw-r--r--lisp/allout.el4
-rw-r--r--lisp/ansi-color.el1
-rw-r--r--lisp/apropos.el1
-rw-r--r--lisp/autoarg.el1
-rw-r--r--lisp/autoinsert.el1
-rw-r--r--lisp/autorevert.el1
-rw-r--r--lisp/avoid.el1
-rw-r--r--lisp/battery.el1
-rw-r--r--lisp/bindings.el1
-rw-r--r--lisp/bookmark.el5
-rw-r--r--lisp/bs.el1
-rw-r--r--lisp/buff-menu.el16
-rw-r--r--lisp/button.el1
-rw-r--r--lisp/calc/calc-aent.el5
-rw-r--r--lisp/calc/calc-alg.el1
-rw-r--r--lisp/calc/calc-arith.el1
-rw-r--r--lisp/calc/calc-bin.el1
-rw-r--r--lisp/calc/calc-comb.el1
-rw-r--r--lisp/calc/calc-cplx.el1
-rw-r--r--lisp/calc/calc-embed.el1
-rw-r--r--lisp/calc/calc-ext.el5
-rw-r--r--lisp/calc/calc-fin.el1
-rw-r--r--lisp/calc/calc-forms.el1
-rw-r--r--lisp/calc/calc-frac.el1
-rw-r--r--lisp/calc/calc-funcs.el1
-rw-r--r--lisp/calc/calc-graph.el1
-rw-r--r--lisp/calc/calc-help.el1
-rw-r--r--lisp/calc/calc-incom.el1
-rw-r--r--lisp/calc/calc-keypd.el4
-rw-r--r--lisp/calc/calc-lang.el5
-rw-r--r--lisp/calc/calc-macs.el1
-rw-r--r--lisp/calc/calc-map.el1
-rw-r--r--lisp/calc/calc-math.el1
-rw-r--r--lisp/calc/calc-menu.el1
-rw-r--r--lisp/calc/calc-misc.el1
-rw-r--r--lisp/calc/calc-mode.el1
-rw-r--r--lisp/calc/calc-mtx.el1
-rw-r--r--lisp/calc/calc-nlfit.el1
-rw-r--r--lisp/calc/calc-poly.el1
-rw-r--r--lisp/calc/calc-prog.el1
-rw-r--r--lisp/calc/calc-rewr.el1
-rw-r--r--lisp/calc/calc-rules.el1
-rw-r--r--lisp/calc/calc-sel.el1
-rw-r--r--lisp/calc/calc-stat.el1
-rw-r--r--lisp/calc/calc-store.el5
-rw-r--r--lisp/calc/calc-stuff.el1
-rw-r--r--lisp/calc/calc-trail.el1
-rw-r--r--lisp/calc/calc-undo.el1
-rw-r--r--lisp/calc/calc-units.el5
-rw-r--r--lisp/calc/calc-vec.el1
-rw-r--r--lisp/calc/calc-yank.el4
-rw-r--r--lisp/calc/calc.el1
-rw-r--r--lisp/calc/calcalg2.el1
-rw-r--r--lisp/calc/calcalg3.el1
-rw-r--r--lisp/calc/calccomp.el5
-rw-r--r--lisp/calc/calcsel2.el1
-rw-r--r--lisp/calculator.el1
-rw-r--r--lisp/calendar/cal-bahai.el1
-rw-r--r--lisp/calendar/cal-china.el1
-rw-r--r--lisp/calendar/cal-coptic.el1
-rw-r--r--lisp/calendar/cal-dst.el1
-rw-r--r--lisp/calendar/cal-french.el4
-rw-r--r--lisp/calendar/cal-html.el1
-rw-r--r--lisp/calendar/cal-islam.el1
-rw-r--r--lisp/calendar/cal-iso.el1
-rw-r--r--lisp/calendar/cal-julian.el1
-rw-r--r--lisp/calendar/cal-mayan.el1
-rw-r--r--lisp/calendar/cal-menu.el1
-rw-r--r--lisp/calendar/cal-move.el1
-rw-r--r--lisp/calendar/cal-persia.el1
-rw-r--r--lisp/calendar/cal-tex.el1
-rw-r--r--lisp/calendar/cal-x.el1
-rw-r--r--lisp/calendar/holidays.el3
-rw-r--r--lisp/calendar/icalendar.el1
-rw-r--r--lisp/calendar/lunar.el1
-rw-r--r--lisp/calendar/solar.el1
-rw-r--r--lisp/calendar/todo-mode.el1
-rw-r--r--lisp/case-table.el1
-rw-r--r--lisp/cdl.el1
-rw-r--r--lisp/cedet/cedet-cscope.el1
-rw-r--r--lisp/cedet/cedet-files.el1
-rw-r--r--lisp/cedet/cedet-global.el1
-rw-r--r--lisp/cedet/cedet-idutils.el1
-rw-r--r--lisp/cedet/cedet.el1
-rw-r--r--lisp/cedet/data-debug.el1
-rw-r--r--lisp/cedet/ede.el4
-rw-r--r--lisp/cedet/ede/autoconf-edit.el3
-rw-r--r--lisp/cedet/ede/cpp-root.el1
-rw-r--r--lisp/cedet/ede/dired.el1
-rw-r--r--lisp/cedet/ede/emacs.el1
-rw-r--r--lisp/cedet/ede/files.el1
-rw-r--r--lisp/cedet/ede/linux.el1
-rw-r--r--lisp/cedet/ede/locate.el1
-rw-r--r--lisp/cedet/ede/make.el1
-rw-r--r--lisp/cedet/ede/makefile-edit.el1
-rw-r--r--lisp/cedet/ede/pconf.el1
-rw-r--r--lisp/cedet/ede/pmake.el4
-rw-r--r--lisp/cedet/ede/proj-archive.el1
-rw-r--r--lisp/cedet/ede/proj-aux.el1
-rw-r--r--lisp/cedet/ede/proj-comp.el1
-rw-r--r--lisp/cedet/ede/proj-elisp.el4
-rw-r--r--lisp/cedet/ede/proj-info.el1
-rw-r--r--lisp/cedet/ede/proj-misc.el1
-rw-r--r--lisp/cedet/ede/proj-obj.el1
-rw-r--r--lisp/cedet/ede/proj-prog.el1
-rw-r--r--lisp/cedet/ede/proj-scheme.el1
-rw-r--r--lisp/cedet/ede/proj-shared.el1
-rw-r--r--lisp/cedet/ede/proj.el1
-rw-r--r--lisp/cedet/ede/project-am.el1
-rw-r--r--lisp/cedet/ede/shell.el1
-rw-r--r--lisp/cedet/ede/simple.el1
-rw-r--r--lisp/cedet/ede/source.el1
-rw-r--r--lisp/cedet/ede/speedbar.el4
-rw-r--r--lisp/cedet/ede/srecode.el1
-rw-r--r--lisp/cedet/ede/system.el1
-rw-r--r--lisp/cedet/ede/util.el1
-rw-r--r--lisp/cedet/inversion.el1
-rw-r--r--lisp/cedet/pulse.el1
-rw-r--r--lisp/cedet/semantic.el1
-rw-r--r--lisp/cedet/semantic/analyze.el1
-rw-r--r--lisp/cedet/semantic/analyze/complete.el1
-rw-r--r--lisp/cedet/semantic/analyze/fcn.el1
-rw-r--r--lisp/cedet/semantic/analyze/refs.el1
-rw-r--r--lisp/cedet/semantic/bovine.el1
-rw-r--r--lisp/cedet/semantic/bovine/c-by.el1
-rw-r--r--lisp/cedet/semantic/bovine/debug.el1
-rw-r--r--lisp/cedet/semantic/bovine/el.el1
-rw-r--r--lisp/cedet/semantic/bovine/gcc.el1
-rw-r--r--lisp/cedet/semantic/bovine/make-by.el1
-rw-r--r--lisp/cedet/semantic/bovine/make.el1
-rw-r--r--lisp/cedet/semantic/bovine/scm-by.el1
-rw-r--r--lisp/cedet/semantic/bovine/scm.el1
-rw-r--r--lisp/cedet/semantic/chart.el1
-rw-r--r--lisp/cedet/semantic/complete.el1
-rw-r--r--lisp/cedet/semantic/ctxt.el1
-rw-r--r--lisp/cedet/semantic/db-debug.el1
-rw-r--r--lisp/cedet/semantic/db-ebrowse.el1
-rw-r--r--lisp/cedet/semantic/db-el.el1
-rw-r--r--lisp/cedet/semantic/db-file.el1
-rw-r--r--lisp/cedet/semantic/db-find.el1
-rw-r--r--lisp/cedet/semantic/db-global.el1
-rw-r--r--lisp/cedet/semantic/db-javascript.el1
-rw-r--r--lisp/cedet/semantic/db-mode.el1
-rw-r--r--lisp/cedet/semantic/db-ref.el1
-rw-r--r--lisp/cedet/semantic/db-typecache.el1
-rw-r--r--lisp/cedet/semantic/db.el1
-rw-r--r--lisp/cedet/semantic/debug.el1
-rw-r--r--lisp/cedet/semantic/decorate.el1
-rw-r--r--lisp/cedet/semantic/decorate/include.el1
-rw-r--r--lisp/cedet/semantic/decorate/mode.el1
-rw-r--r--lisp/cedet/semantic/dep.el1
-rw-r--r--lisp/cedet/semantic/doc.el1
-rw-r--r--lisp/cedet/semantic/ede-grammar.el3
-rw-r--r--lisp/cedet/semantic/edit.el1
-rw-r--r--lisp/cedet/semantic/find.el1
-rw-r--r--lisp/cedet/semantic/format.el1
-rw-r--r--lisp/cedet/semantic/fw.el1
-rw-r--r--lisp/cedet/semantic/grammar-wy.el1
-rw-r--r--lisp/cedet/semantic/html.el1
-rw-r--r--lisp/cedet/semantic/ia-sb.el1
-rw-r--r--lisp/cedet/semantic/ia.el1
-rw-r--r--lisp/cedet/semantic/idle.el1
-rw-r--r--lisp/cedet/semantic/java.el1
-rw-r--r--lisp/cedet/semantic/lex-spp.el1
-rw-r--r--lisp/cedet/semantic/mru-bookmark.el1
-rw-r--r--lisp/cedet/semantic/sb.el1
-rw-r--r--lisp/cedet/semantic/scope.el1
-rw-r--r--lisp/cedet/semantic/senator.el1
-rw-r--r--lisp/cedet/semantic/sort.el1
-rw-r--r--lisp/cedet/semantic/symref/filter.el1
-rw-r--r--lisp/cedet/semantic/symref/global.el1
-rw-r--r--lisp/cedet/semantic/symref/grep.el1
-rw-r--r--lisp/cedet/semantic/symref/idutils.el1
-rw-r--r--lisp/cedet/semantic/tag-ls.el1
-rw-r--r--lisp/cedet/semantic/tag-write.el1
-rw-r--r--lisp/cedet/semantic/tag.el1
-rw-r--r--lisp/cedet/semantic/texi.el1
-rw-r--r--lisp/cedet/semantic/util-modes.el1
-rw-r--r--lisp/cedet/semantic/util.el1
-rw-r--r--lisp/cedet/semantic/wisent.el1
-rw-r--r--lisp/cedet/semantic/wisent/comp.el3
-rw-r--r--lisp/cedet/semantic/wisent/java-tags.el1
-rw-r--r--lisp/cedet/semantic/wisent/javascript.el1
-rw-r--r--lisp/cedet/semantic/wisent/javat-wy.el1
-rw-r--r--lisp/cedet/semantic/wisent/js-wy.el1
-rw-r--r--lisp/cedet/semantic/wisent/wisent.el1
-rw-r--r--lisp/cedet/srecode.el1
-rw-r--r--lisp/cedet/srecode/args.el1
-rw-r--r--lisp/cedet/srecode/compile.el1
-rw-r--r--lisp/cedet/srecode/cpp.el1
-rw-r--r--lisp/cedet/srecode/ctxt.el1
-rw-r--r--lisp/cedet/srecode/dictionary.el1
-rw-r--r--lisp/cedet/srecode/document.el1
-rw-r--r--lisp/cedet/srecode/el.el1
-rw-r--r--lisp/cedet/srecode/expandproto.el1
-rw-r--r--lisp/cedet/srecode/extract.el1
-rw-r--r--lisp/cedet/srecode/fields.el1
-rw-r--r--lisp/cedet/srecode/filters.el1
-rw-r--r--lisp/cedet/srecode/find.el1
-rw-r--r--lisp/cedet/srecode/getset.el1
-rw-r--r--lisp/cedet/srecode/insert.el1
-rw-r--r--lisp/cedet/srecode/java.el1
-rw-r--r--lisp/cedet/srecode/map.el1
-rw-r--r--lisp/cedet/srecode/mode.el1
-rw-r--r--lisp/cedet/srecode/semantic.el1
-rw-r--r--lisp/cedet/srecode/srt-mode.el1
-rw-r--r--lisp/cedet/srecode/srt-wy.el1
-rw-r--r--lisp/cedet/srecode/srt.el1
-rw-r--r--lisp/cedet/srecode/table.el1
-rw-r--r--lisp/cedet/srecode/template.el1
-rw-r--r--lisp/cedet/srecode/texi.el1
-rw-r--r--lisp/chistory.el1
-rw-r--r--lisp/cmuscheme.el1
-rw-r--r--lisp/color.el2
-rw-r--r--lisp/comint.el6
-rw-r--r--lisp/completion.el1
-rw-r--r--lisp/cus-dep.el1
-rw-r--r--lisp/cus-edit.el1
-rw-r--r--lisp/cus-face.el1
-rw-r--r--lisp/cus-start.el4
-rw-r--r--lisp/cus-theme.el1
-rw-r--r--lisp/custom.el1
-rw-r--r--lisp/dabbrev.el1
-rw-r--r--lisp/delim-col.el1
-rw-r--r--lisp/delsel.el1
-rw-r--r--lisp/descr-text.el1
-rw-r--r--lisp/desktop.el1
-rw-r--r--lisp/dired-aux.el3
-rw-r--r--lisp/dired-x.el1
-rw-r--r--lisp/dired.el4
-rw-r--r--lisp/disp-table.el1
-rw-r--r--lisp/dnd.el1
-rw-r--r--lisp/doc-view.el1
-rw-r--r--lisp/dos-fns.el1
-rw-r--r--lisp/dos-vars.el1
-rw-r--r--lisp/dos-w32.el1
-rw-r--r--lisp/double.el1
-rw-r--r--lisp/dynamic-setting.el1
-rw-r--r--lisp/ebuff-menu.el4
-rw-r--r--lisp/echistory.el1
-rw-r--r--lisp/edmacro.el1
-rw-r--r--lisp/ehelp.el1
-rw-r--r--lisp/electric.el1
-rw-r--r--lisp/elide-head.el1
-rw-r--r--lisp/emacs-lisp/.gitignore1
-rw-r--r--lisp/emacs-lisp/advice.el1
-rw-r--r--lisp/emacs-lisp/assoc.el1
-rw-r--r--lisp/emacs-lisp/autoload.el4
-rw-r--r--lisp/emacs-lisp/avl-tree.el1
-rw-r--r--lisp/emacs-lisp/backquote.el1
-rw-r--r--lisp/emacs-lisp/benchmark.el1
-rw-r--r--lisp/emacs-lisp/bindat.el1
-rw-r--r--lisp/emacs-lisp/byte-run.el1
-rw-r--r--lisp/emacs-lisp/bytecomp.el3
-rw-r--r--lisp/emacs-lisp/check-declare.el1
-rw-r--r--lisp/emacs-lisp/checkdoc.el4
-rw-r--r--lisp/emacs-lisp/cl-extra.el1
-rw-r--r--lisp/emacs-lisp/cl-indent.el1
-rw-r--r--lisp/emacs-lisp/cl-loaddefs.el4
-rw-r--r--lisp/emacs-lisp/cl-seq.el1
-rw-r--r--lisp/emacs-lisp/cl-specs.el1
-rw-r--r--lisp/emacs-lisp/cl.el1
-rw-r--r--lisp/emacs-lisp/copyright.el1
-rw-r--r--lisp/emacs-lisp/crm.el1
-rw-r--r--lisp/emacs-lisp/cust-print.el1
-rw-r--r--lisp/emacs-lisp/debug.el1
-rw-r--r--lisp/emacs-lisp/derived.el1
-rw-r--r--lisp/emacs-lisp/disass.el1
-rw-r--r--lisp/emacs-lisp/easymenu.el1
-rw-r--r--lisp/emacs-lisp/edebug.el6
-rw-r--r--lisp/emacs-lisp/eieio-base.el1
-rw-r--r--lisp/emacs-lisp/eieio-custom.el1
-rw-r--r--lisp/emacs-lisp/eieio-datadebug.el1
-rw-r--r--lisp/emacs-lisp/eieio-opt.el1
-rw-r--r--lisp/emacs-lisp/eieio-speedbar.el1
-rw-r--r--lisp/emacs-lisp/eieio.el1
-rw-r--r--lisp/emacs-lisp/eldoc.el1
-rw-r--r--lisp/emacs-lisp/elp.el1
-rw-r--r--lisp/emacs-lisp/ewoc.el1
-rw-r--r--lisp/emacs-lisp/find-func.el1
-rw-r--r--lisp/emacs-lisp/find-gc.el1
-rw-r--r--lisp/emacs-lisp/float-sup.el4
-rw-r--r--lisp/emacs-lisp/generic.el1
-rw-r--r--lisp/emacs-lisp/gulp.el1
-rw-r--r--lisp/emacs-lisp/helper.el1
-rw-r--r--lisp/emacs-lisp/lisp-mnt.el1
-rw-r--r--lisp/emacs-lisp/lisp.el1
-rw-r--r--lisp/emacs-lisp/macroexp.el1
-rw-r--r--lisp/emacs-lisp/map-ynp.el1
-rw-r--r--lisp/emacs-lisp/package-x.el2
-rw-r--r--lisp/emacs-lisp/package.el2
-rw-r--r--lisp/emacs-lisp/pcase.el2
-rw-r--r--lisp/emacs-lisp/pp.el1
-rw-r--r--lisp/emacs-lisp/re-builder.el1
-rw-r--r--lisp/emacs-lisp/regexp-opt.el1
-rw-r--r--lisp/emacs-lisp/regi.el1
-rw-r--r--lisp/emacs-lisp/ring.el1
-rw-r--r--lisp/emacs-lisp/syntax.el1
-rw-r--r--lisp/emacs-lisp/tcover-ses.el1
-rw-r--r--lisp/emacs-lisp/tcover-unsafep.el1
-rw-r--r--lisp/emacs-lisp/testcover.el1
-rw-r--r--lisp/emacs-lisp/tq.el1
-rw-r--r--lisp/emacs-lisp/trace.el1
-rw-r--r--lisp/emacs-lisp/unsafep.el1
-rw-r--r--lisp/emacs-lisp/warnings.el1
-rw-r--r--lisp/emacs-lock.el1
-rw-r--r--lisp/emulation/crisp.el5
-rw-r--r--lisp/emulation/cua-base.el4
-rw-r--r--lisp/emulation/cua-gmrk.el1
-rw-r--r--lisp/emulation/cua-rect.el1
-rw-r--r--lisp/emulation/edt-lk201.el1
-rw-r--r--lisp/emulation/edt-mapper.el1
-rw-r--r--lisp/emulation/edt-pc.el1
-rw-r--r--lisp/emulation/edt-vt100.el1
-rw-r--r--lisp/emulation/edt.el3
-rw-r--r--lisp/emulation/keypad.el1
-rw-r--r--lisp/emulation/pc-mode.el1
-rw-r--r--lisp/emulation/pc-select.el1
-rw-r--r--lisp/emulation/tpu-edt.el1
-rw-r--r--lisp/emulation/tpu-mapper.el1
-rw-r--r--lisp/emulation/vi.el1
-rw-r--r--lisp/emulation/vip.el1
-rw-r--r--lisp/emulation/viper-cmd.el4
-rw-r--r--lisp/emulation/viper-ex.el1
-rw-r--r--lisp/emulation/viper-init.el4
-rw-r--r--lisp/emulation/viper-keym.el1
-rw-r--r--lisp/emulation/viper-macs.el1
-rw-r--r--lisp/emulation/viper-mous.el1
-rw-r--r--lisp/emulation/viper-util.el4
-rw-r--r--lisp/emulation/viper.el1
-rw-r--r--lisp/emulation/ws-mode.el1
-rw-r--r--lisp/env.el1
-rw-r--r--lisp/epa-dired.el1
-rw-r--r--lisp/epa-file.el1
-rw-r--r--lisp/epa-hook.el1
-rw-r--r--lisp/epa-mail.el1
-rw-r--r--lisp/epa.el4
-rw-r--r--lisp/epg-config.el1
-rw-r--r--lisp/epg.el1
-rw-r--r--lisp/erc/ChangeLog1
-rw-r--r--lisp/erc/ChangeLog.011
-rw-r--r--lisp/erc/ChangeLog.021
-rw-r--r--lisp/erc/ChangeLog.031
-rw-r--r--lisp/erc/ChangeLog.041
-rw-r--r--lisp/erc/ChangeLog.051
-rw-r--r--lisp/erc/ChangeLog.061
-rw-r--r--lisp/erc/ChangeLog.071
-rw-r--r--lisp/erc/ChangeLog.081
-rw-r--r--lisp/erc/erc-autoaway.el1
-rw-r--r--lisp/erc/erc-backend.el1
-rw-r--r--lisp/erc/erc-button.el1
-rw-r--r--lisp/erc/erc-capab.el1
-rw-r--r--lisp/erc/erc-compat.el1
-rw-r--r--lisp/erc/erc-dcc.el1
-rw-r--r--lisp/erc/erc-ezbounce.el1
-rw-r--r--lisp/erc/erc-fill.el1
-rw-r--r--lisp/erc/erc-goodies.el1
-rw-r--r--lisp/erc/erc-hecomplete.el1
-rw-r--r--lisp/erc/erc-ibuffer.el1
-rw-r--r--lisp/erc/erc-identd.el1
-rw-r--r--lisp/erc/erc-imenu.el1
-rw-r--r--lisp/erc/erc-join.el1
-rw-r--r--lisp/erc/erc-lang.el3
-rw-r--r--lisp/erc/erc-list.el1
-rw-r--r--lisp/erc/erc-log.el1
-rw-r--r--lisp/erc/erc-match.el1
-rw-r--r--lisp/erc/erc-menu.el1
-rw-r--r--lisp/erc/erc-netsplit.el1
-rw-r--r--lisp/erc/erc-networks.el1
-rw-r--r--lisp/erc/erc-notify.el1
-rw-r--r--lisp/erc/erc-page.el1
-rw-r--r--lisp/erc/erc-pcomplete.el1
-rw-r--r--lisp/erc/erc-replace.el1
-rw-r--r--lisp/erc/erc-ring.el1
-rw-r--r--lisp/erc/erc-services.el1
-rw-r--r--lisp/erc/erc-sound.el1
-rw-r--r--lisp/erc/erc-speedbar.el1
-rw-r--r--lisp/erc/erc-spelling.el1
-rw-r--r--lisp/erc/erc-stamp.el1
-rw-r--r--lisp/erc/erc-track.el1
-rw-r--r--lisp/erc/erc-truncate.el1
-rw-r--r--lisp/erc/erc-xdcc.el1
-rw-r--r--lisp/erc/erc.el1
-rw-r--r--lisp/eshell/.gitignore1
-rw-r--r--lisp/eshell/em-alias.el1
-rw-r--r--lisp/eshell/em-banner.el1
-rw-r--r--lisp/eshell/em-basic.el1
-rw-r--r--lisp/eshell/em-cmpl.el1
-rw-r--r--lisp/eshell/em-dirs.el1
-rw-r--r--lisp/eshell/em-hist.el1
-rw-r--r--lisp/eshell/em-prompt.el1
-rw-r--r--lisp/eshell/em-rebind.el1
-rw-r--r--lisp/eshell/em-script.el1
-rw-r--r--lisp/eshell/em-smart.el1
-rw-r--r--lisp/eshell/em-term.el1
-rw-r--r--lisp/eshell/em-xtra.el1
-rw-r--r--lisp/eshell/esh-arg.el1
-rw-r--r--lisp/eshell/esh-cmd.el1
-rw-r--r--lisp/eshell/esh-ext.el5
-rw-r--r--lisp/eshell/esh-io.el1
-rw-r--r--lisp/eshell/esh-mode.el1
-rw-r--r--lisp/eshell/esh-module.el1
-rw-r--r--lisp/eshell/esh-proc.el5
-rw-r--r--lisp/eshell/esh-var.el5
-rw-r--r--lisp/eshell/eshell.el1
-rw-r--r--lisp/expand.el1
-rw-r--r--lisp/ezimage.el1
-rw-r--r--lisp/face-remap.el1
-rw-r--r--lisp/facemenu.el1
-rw-r--r--lisp/ffap.el1
-rw-r--r--lisp/files-x.el1
-rw-r--r--lisp/files.el12
-rw-r--r--lisp/filesets.el1
-rw-r--r--lisp/find-cmd.el1
-rw-r--r--lisp/find-dired.el1
-rw-r--r--lisp/find-file.el1
-rw-r--r--lisp/find-lisp.el1
-rw-r--r--lisp/finder.el1
-rw-r--r--lisp/flow-ctrl.el1
-rw-r--r--lisp/foldout.el1
-rw-r--r--lisp/follow.el1
-rw-r--r--lisp/font-lock.el4
-rw-r--r--lisp/format.el1
-rw-r--r--lisp/forms-d2.el1
-rw-r--r--lisp/forms-pass.el1
-rw-r--r--lisp/forms.el1
-rw-r--r--lisp/frame.el3
-rw-r--r--lisp/fringe.el1
-rw-r--r--lisp/generic-x.el1
-rw-r--r--lisp/gnus/ChangeLog8
-rw-r--r--lisp/gnus/ChangeLog.11
-rw-r--r--lisp/gnus/ChangeLog.21
-rw-r--r--lisp/gnus/ecomplete.el3
-rw-r--r--lisp/gnus/flow-fill.el4
-rw-r--r--lisp/gnus/gmm-utils.el3
-rw-r--r--lisp/gnus/gnus-bookmark.el3
-rw-r--r--lisp/gnus/gnus-dired.el4
-rw-r--r--lisp/gnus/gnus-gravatar.el2
-rw-r--r--lisp/gnus/gnus-group.el4
-rw-r--r--lisp/gnus/gnus-html.el2
-rw-r--r--lisp/gnus/gnus-msg.el4
-rw-r--r--lisp/gnus/gnus-registry.el4
-rw-r--r--lisp/gnus/gnus-sync.el2
-rw-r--r--lisp/gnus/gnus.el6
-rw-r--r--lisp/gnus/gravatar.el2
-rw-r--r--lisp/gnus/mail-source.el4
-rw-r--r--lisp/gnus/message.el8
-rw-r--r--lisp/gnus/mm-decode.el4
-rw-r--r--lisp/gnus/mm-extern.el4
-rw-r--r--lisp/gnus/nnbabyl.el3
-rw-r--r--lisp/gnus/nnmail.el3
-rw-r--r--lisp/gnus/nnregistry.el2
-rw-r--r--lisp/gnus/nntp.el6
-rw-r--r--lisp/gnus/rtree.el2
-rw-r--r--lisp/gnus/shr-color.el2
-rw-r--r--lisp/gnus/sieve-manage.el4
-rw-r--r--lisp/gnus/sieve-mode.el4
-rw-r--r--lisp/gnus/smime.el4
-rw-r--r--lisp/gnus/spam-stat.el3
-rw-r--r--lisp/gs.el1
-rw-r--r--lisp/help-at-pt.el1
-rw-r--r--lisp/help-macro.el1
-rw-r--r--lisp/help-mode.el1
-rw-r--r--lisp/help.el3
-rw-r--r--lisp/hexl.el239
-rw-r--r--lisp/hfy-cmap.el1
-rw-r--r--lisp/hi-lock.el1
-rw-r--r--lisp/hl-line.el1
-rw-r--r--lisp/htmlfontify.el5
-rw-r--r--lisp/ibuf-macs.el1
-rw-r--r--lisp/ibuffer.el1
-rw-r--r--lisp/icomplete.el1
-rw-r--r--lisp/ido.el1
-rw-r--r--lisp/ielm.el1
-rw-r--r--lisp/iimage.el3
-rw-r--r--lisp/image-dired.el1
-rw-r--r--lisp/image-file.el1
-rw-r--r--lisp/image-mode.el1
-rw-r--r--lisp/image.el5
-rw-r--r--lisp/imenu.el1
-rw-r--r--lisp/indent.el1
-rw-r--r--lisp/info-look.el1
-rw-r--r--lisp/info-xref.el632
-rw-r--r--lisp/info.el6
-rw-r--r--lisp/informat.el1
-rw-r--r--lisp/international/ccl.el1
-rw-r--r--lisp/international/characters.el1
-rw-r--r--lisp/international/cp51932.el1
-rw-r--r--lisp/international/eucjp-ms.el1
-rw-r--r--lisp/international/fontset.el1
-rw-r--r--lisp/international/isearch-x.el1
-rw-r--r--lisp/international/iso-ascii.el5
-rw-r--r--lisp/international/iso-cvt.el1
-rw-r--r--lisp/international/iso-transl.el1
-rw-r--r--lisp/international/ja-dic-cnv.el1
-rw-r--r--lisp/international/ja-dic-utl.el1
-rw-r--r--lisp/international/kinsoku.el1
-rw-r--r--lisp/international/kkc.el5
-rw-r--r--lisp/international/latexenc.el1
-rw-r--r--lisp/international/latin1-disp.el1
-rw-r--r--lisp/international/mule-cmds.el1
-rw-r--r--lisp/international/mule-conf.el1
-rw-r--r--lisp/international/mule-diag.el1
-rw-r--r--lisp/international/mule-util.el1
-rw-r--r--lisp/international/mule.el1
-rw-r--r--lisp/international/ogonek.el1
-rw-r--r--lisp/international/quail.el1
-rw-r--r--lisp/international/robin.el1
-rw-r--r--lisp/international/titdic-cnv.el1
-rw-r--r--lisp/international/ucs-normalize.el1
-rw-r--r--lisp/international/utf-7.el1
-rw-r--r--lisp/isearch.el7
-rw-r--r--lisp/isearchb.el1
-rw-r--r--lisp/iswitchb.el5
-rw-r--r--lisp/jit-lock.el1
-rw-r--r--lisp/jka-cmpr-hook.el1
-rw-r--r--lisp/jka-compr.el6
-rw-r--r--lisp/json.el1
-rw-r--r--lisp/kermit.el1
-rw-r--r--lisp/kmacro.el1
-rw-r--r--lisp/language/burmese.el1
-rw-r--r--lisp/language/cham.el1
-rw-r--r--lisp/language/china-util.el1
-rw-r--r--lisp/language/chinese.el1
-rw-r--r--lisp/language/cyril-util.el1
-rw-r--r--lisp/language/cyrillic.el1
-rw-r--r--lisp/language/czech.el1
-rw-r--r--lisp/language/english.el1
-rw-r--r--lisp/language/ethio-util.el1
-rw-r--r--lisp/language/ethiopic.el1
-rw-r--r--lisp/language/european.el1
-rw-r--r--lisp/language/georgian.el1
-rw-r--r--lisp/language/greek.el1
-rw-r--r--lisp/language/hanja-util.el1
-rw-r--r--lisp/language/hebrew.el1
-rw-r--r--lisp/language/ind-util.el1
-rw-r--r--lisp/language/indian.el1
-rw-r--r--lisp/language/japan-util.el1
-rw-r--r--lisp/language/japanese.el1
-rw-r--r--lisp/language/khmer.el1
-rw-r--r--lisp/language/korea-util.el1
-rw-r--r--lisp/language/korean.el1
-rw-r--r--lisp/language/lao-util.el1
-rw-r--r--lisp/language/lao.el1
-rw-r--r--lisp/language/misc-lang.el1
-rw-r--r--lisp/language/romanian.el1
-rw-r--r--lisp/language/sinhala.el1
-rw-r--r--lisp/language/slovak.el1
-rw-r--r--lisp/language/tai-viet.el1
-rw-r--r--lisp/language/thai-util.el1
-rw-r--r--lisp/language/thai-word.el1
-rw-r--r--lisp/language/thai.el1
-rw-r--r--lisp/language/tibet-util.el1
-rw-r--r--lisp/language/tibetan.el1
-rw-r--r--lisp/language/tv-util.el1
-rw-r--r--lisp/language/utf-8-lang.el1
-rw-r--r--lisp/language/viet-util.el1
-rw-r--r--lisp/language/vietnamese.el1
-rw-r--r--lisp/ledit.el1
-rw-r--r--lisp/linum.el1
-rw-r--r--lisp/loadhist.el1
-rw-r--r--lisp/longlines.el1
-rw-r--r--lisp/lpr.el1
-rw-r--r--lisp/ls-lisp.el4
-rw-r--r--lisp/macros.el1
-rw-r--r--lisp/mail/blessmail.el1
-rw-r--r--lisp/mail/feedmail.el1
-rw-r--r--lisp/mail/footnote.el1
-rw-r--r--lisp/mail/hashcash.el3
-rw-r--r--lisp/mail/mail-extr.el3
-rw-r--r--lisp/mail/mail-hist.el1
-rw-r--r--lisp/mail/mailabbrev.el1
-rw-r--r--lisp/mail/mailalias.el5
-rw-r--r--lisp/mail/mailclient.el1
-rw-r--r--lisp/mail/mailheader.el4
-rw-r--r--lisp/mail/mailpost.el1
-rw-r--r--lisp/mail/metamail.el1
-rw-r--r--lisp/mail/mspools.el4
-rw-r--r--lisp/mail/reporter.el1
-rw-r--r--lisp/mail/rfc822.el1
-rw-r--r--lisp/mail/rmail-spam-filter.el1
-rw-r--r--lisp/mail/rmail.el14
-rw-r--r--lisp/mail/rmailedit.el1
-rw-r--r--lisp/mail/rmailkwd.el1
-rw-r--r--lisp/mail/rmailmm.el280
-rw-r--r--lisp/mail/rmailmsc.el1
-rw-r--r--lisp/mail/rmailout.el1
-rw-r--r--lisp/mail/rmailsort.el1
-rw-r--r--lisp/mail/rmailsum.el1
-rw-r--r--lisp/mail/supercite.el1
-rw-r--r--lisp/mail/uce.el1
-rw-r--r--lisp/mail/undigest.el1
-rw-r--r--lisp/mail/unrmail.el1
-rw-r--r--lisp/makesum.el4
-rw-r--r--lisp/man.el1
-rw-r--r--lisp/master.el1
-rw-r--r--lisp/mb-depth.el1
-rw-r--r--lisp/mh-e/ChangeLog1
-rw-r--r--lisp/mh-e/ChangeLog.13
-rw-r--r--lisp/mh-e/mh-acros.el1
-rw-r--r--lisp/mh-e/mh-alias.el1
-rw-r--r--lisp/mh-e/mh-buffers.el1
-rw-r--r--lisp/mh-e/mh-comp.el1
-rw-r--r--lisp/mh-e/mh-compat.el1
-rw-r--r--lisp/mh-e/mh-e.el1
-rw-r--r--lisp/mh-e/mh-folder.el1
-rw-r--r--lisp/mh-e/mh-funcs.el1
-rw-r--r--lisp/mh-e/mh-gnus.el1
-rw-r--r--lisp/mh-e/mh-identity.el1
-rw-r--r--lisp/mh-e/mh-inc.el1
-rw-r--r--lisp/mh-e/mh-junk.el1
-rw-r--r--lisp/mh-e/mh-letter.el1
-rw-r--r--lisp/mh-e/mh-limit.el1
-rw-r--r--lisp/mh-e/mh-mime.el5
-rw-r--r--lisp/mh-e/mh-print.el1
-rw-r--r--lisp/mh-e/mh-scan.el1
-rw-r--r--lisp/mh-e/mh-search.el1
-rw-r--r--lisp/mh-e/mh-seq.el5
-rw-r--r--lisp/mh-e/mh-show.el1
-rw-r--r--lisp/mh-e/mh-speed.el1
-rw-r--r--lisp/mh-e/mh-thread.el1
-rw-r--r--lisp/mh-e/mh-tool-bar.el1
-rw-r--r--lisp/mh-e/mh-utils.el1
-rw-r--r--lisp/mh-e/mh-xface.el1
-rw-r--r--lisp/midnight.el1
-rw-r--r--lisp/minibuf-eldef.el1
-rw-r--r--lisp/minibuffer.el1
-rw-r--r--lisp/misc.el4
-rw-r--r--lisp/misearch.el1
-rw-r--r--lisp/mouse-copy.el1
-rw-r--r--lisp/mouse-drag.el4
-rw-r--r--lisp/mpc.el1
-rw-r--r--lisp/msb.el1
-rw-r--r--lisp/mwheel.el1
-rw-r--r--lisp/net/browse-url.el5
-rw-r--r--lisp/net/eudc-bob.el1
-rw-r--r--lisp/net/eudc-export.el1
-rw-r--r--lisp/net/eudc-hotlist.el1
-rw-r--r--lisp/net/eudc-vars.el5
-rw-r--r--lisp/net/eudcb-bbdb.el1
-rw-r--r--lisp/net/eudcb-ldap.el1
-rw-r--r--lisp/net/eudcb-mab.el1
-rw-r--r--lisp/net/eudcb-ph.el1
-rw-r--r--lisp/net/gnutls.el2
-rw-r--r--lisp/net/goto-addr.el1
-rw-r--r--lisp/net/imap-hash.el1
-rw-r--r--lisp/net/ldap.el3
-rw-r--r--lisp/net/mairix.el1
-rw-r--r--lisp/net/newst-backend.el1
-rw-r--r--lisp/net/newst-plainview.el1
-rw-r--r--lisp/net/newst-reader.el1
-rw-r--r--lisp/net/newst-ticker.el1
-rw-r--r--lisp/net/newst-treeview.el1
-rw-r--r--lisp/net/newsticker.el1
-rw-r--r--lisp/net/quickurl.el4
-rw-r--r--lisp/net/rcirc.el1
-rw-r--r--lisp/net/rcompile.el5
-rw-r--r--lisp/net/rlogin.el4
-rw-r--r--lisp/net/secrets.el2
-rw-r--r--lisp/net/snmp-mode.el1
-rw-r--r--lisp/net/socks.el1
-rw-r--r--lisp/net/telnet.el1
-rw-r--r--lisp/net/tramp-sh.el40
-rw-r--r--lisp/net/tramp-uu.el1
-rw-r--r--lisp/net/tramp.el11
-rw-r--r--lisp/net/webjump.el1
-rw-r--r--lisp/net/xesam.el1
-rw-r--r--lisp/net/zeroconf.el1
-rw-r--r--lisp/newcomment.el1
-rw-r--r--lisp/notifications.el2
-rw-r--r--lisp/nxml/nxml-enc.el1
-rw-r--r--lisp/nxml/nxml-glyph.el1
-rw-r--r--lisp/nxml/nxml-maint.el3
-rw-r--r--lisp/nxml/nxml-mode.el3
-rw-r--r--lisp/nxml/nxml-ns.el1
-rw-r--r--lisp/nxml/nxml-outln.el3
-rw-r--r--lisp/nxml/nxml-parse.el1
-rw-r--r--lisp/nxml/nxml-rap.el1
-rw-r--r--lisp/nxml/nxml-uchnm.el1
-rw-r--r--lisp/nxml/nxml-util.el1
-rw-r--r--lisp/nxml/rng-cmpct.el1
-rw-r--r--lisp/nxml/rng-dt.el1
-rw-r--r--lisp/nxml/rng-loc.el3
-rw-r--r--lisp/nxml/rng-maint.el1
-rw-r--r--lisp/nxml/rng-match.el1
-rw-r--r--lisp/nxml/rng-nxml.el3
-rw-r--r--lisp/nxml/rng-parse.el1
-rw-r--r--lisp/nxml/rng-pttrn.el1
-rw-r--r--lisp/nxml/rng-uri.el1
-rw-r--r--lisp/nxml/rng-util.el1
-rw-r--r--lisp/nxml/rng-valid.el3
-rw-r--r--lisp/nxml/rng-xsd.el1
-rw-r--r--lisp/nxml/xmltok.el1
-rw-r--r--lisp/nxml/xsd-regexp.el1
-rw-r--r--lisp/obsolete/awk-mode.el1
-rw-r--r--lisp/obsolete/complete.el1
-rw-r--r--lisp/obsolete/fast-lock.el1
-rw-r--r--lisp/obsolete/iso-acc.el1
-rw-r--r--lisp/obsolete/iso-insert.el1
-rw-r--r--lisp/obsolete/iso-swed.el1
-rw-r--r--lisp/obsolete/keyswap.el1
-rw-r--r--lisp/obsolete/levents.el1
-rw-r--r--lisp/obsolete/lucid.el4
-rw-r--r--lisp/obsolete/old-whitespace.el1
-rw-r--r--lisp/obsolete/options.el1
-rw-r--r--lisp/obsolete/resume.el1
-rw-r--r--lisp/obsolete/s-region.el1
-rw-r--r--lisp/obsolete/scribe.el1
-rw-r--r--lisp/obsolete/sregex.el1
-rw-r--r--lisp/obsolete/swedish.el1
-rw-r--r--lisp/obsolete/sym-comp.el1
-rw-r--r--lisp/obsolete/vc-mcvs.el1
-rw-r--r--lisp/org/ChangeLog1
-rw-r--r--lisp/org/ob-C.el3
-rw-r--r--lisp/org/ob-R.el3
-rw-r--r--lisp/org/ob-asymptote.el3
-rw-r--r--lisp/org/ob-calc.el3
-rw-r--r--lisp/org/ob-clojure.el3
-rw-r--r--lisp/org/ob-comint.el3
-rw-r--r--lisp/org/ob-css.el3
-rw-r--r--lisp/org/ob-ditaa.el3
-rw-r--r--lisp/org/ob-dot.el3
-rw-r--r--lisp/org/ob-emacs-lisp.el3
-rw-r--r--lisp/org/ob-eval.el3
-rw-r--r--lisp/org/ob-exp.el3
-rw-r--r--lisp/org/ob-gnuplot.el3
-rw-r--r--lisp/org/ob-haskell.el3
-rw-r--r--lisp/org/ob-js.el3
-rw-r--r--lisp/org/ob-keys.el3
-rw-r--r--lisp/org/ob-latex.el3
-rw-r--r--lisp/org/ob-ledger.el3
-rw-r--r--lisp/org/ob-lisp.el3
-rw-r--r--lisp/org/ob-lob.el3
-rw-r--r--lisp/org/ob-matlab.el3
-rw-r--r--lisp/org/ob-mscgen.el3
-rw-r--r--lisp/org/ob-ocaml.el3
-rw-r--r--lisp/org/ob-octave.el3
-rw-r--r--lisp/org/ob-org.el3
-rw-r--r--lisp/org/ob-perl.el3
-rw-r--r--lisp/org/ob-plantuml.el3
-rw-r--r--lisp/org/ob-python.el3
-rw-r--r--lisp/org/ob-ref.el3
-rw-r--r--lisp/org/ob-ruby.el3
-rw-r--r--lisp/org/ob-sass.el3
-rw-r--r--lisp/org/ob-scheme.el3
-rw-r--r--lisp/org/ob-screen.el3
-rw-r--r--lisp/org/ob-sh.el3
-rw-r--r--lisp/org/ob-sql.el3
-rw-r--r--lisp/org/ob-sqlite.el3
-rw-r--r--lisp/org/ob-table.el3
-rw-r--r--lisp/org/ob-tangle.el3
-rw-r--r--lisp/org/ob.el3
-rw-r--r--lisp/org/org-agenda.el1
-rw-r--r--lisp/org/org-archive.el1
-rw-r--r--lisp/org/org-ascii.el1
-rw-r--r--lisp/org/org-attach.el1
-rw-r--r--lisp/org/org-bbdb.el1
-rw-r--r--lisp/org/org-beamer.el3
-rw-r--r--lisp/org/org-bibtex.el1
-rw-r--r--lisp/org/org-capture.el1
-rw-r--r--lisp/org/org-clock.el1
-rw-r--r--lisp/org/org-colview.el1
-rw-r--r--lisp/org/org-compat.el1
-rw-r--r--lisp/org/org-complete.el3
-rw-r--r--lisp/org/org-crypt.el1
-rw-r--r--lisp/org/org-ctags.el3
-rw-r--r--lisp/org/org-datetree.el1
-rw-r--r--lisp/org/org-docbook.el1
-rw-r--r--lisp/org/org-docview.el3
-rw-r--r--lisp/org/org-entities.el3
-rw-r--r--lisp/org/org-exp-blocks.el1
-rw-r--r--lisp/org/org-exp.el1
-rw-r--r--lisp/org/org-faces.el1
-rw-r--r--lisp/org/org-feed.el1
-rw-r--r--lisp/org/org-footnote.el1
-rw-r--r--lisp/org/org-freemind.el1
-rw-r--r--lisp/org/org-gnus.el1
-rw-r--r--lisp/org/org-habit.el1
-rw-r--r--lisp/org/org-html.el1
-rw-r--r--lisp/org/org-icalendar.el1
-rw-r--r--lisp/org/org-id.el1
-rw-r--r--lisp/org/org-indent.el1
-rw-r--r--lisp/org/org-info.el1
-rw-r--r--lisp/org/org-install.el1
-rw-r--r--lisp/org/org-irc.el1
-rw-r--r--lisp/org/org-jsinfo.el1
-rw-r--r--lisp/org/org-latex.el1
-rw-r--r--lisp/org/org-list.el1
-rw-r--r--lisp/org/org-mac-message.el1
-rw-r--r--lisp/org/org-macs.el1
-rw-r--r--lisp/org/org-mew.el1
-rw-r--r--lisp/org/org-mhe.el1
-rw-r--r--lisp/org/org-mks.el3
-rw-r--r--lisp/org/org-mobile.el1
-rw-r--r--lisp/org/org-mouse.el1
-rw-r--r--lisp/org/org-plot.el1
-rw-r--r--lisp/org/org-protocol.el1
-rw-r--r--lisp/org/org-publish.el4
-rw-r--r--lisp/org/org-remember.el1
-rw-r--r--lisp/org/org-rmail.el1
-rw-r--r--lisp/org/org-src.el1
-rw-r--r--lisp/org/org-table.el1
-rw-r--r--lisp/org/org-taskjuggler.el2
-rw-r--r--lisp/org/org-timer.el1
-rw-r--r--lisp/org/org-vm.el1
-rw-r--r--lisp/org/org-w3m.el1
-rw-r--r--lisp/org/org-wl.el1
-rw-r--r--lisp/org/org-xoxo.el1
-rw-r--r--lisp/org/org.el1
-rw-r--r--lisp/outline.el4
-rw-r--r--lisp/password-cache.el4
-rw-r--r--lisp/patcomp.el1
-rw-r--r--lisp/paths.el1
-rw-r--r--lisp/pcmpl-cvs.el1
-rw-r--r--lisp/pcmpl-gnu.el1
-rw-r--r--lisp/pcmpl-linux.el1
-rw-r--r--lisp/pcmpl-rpm.el1
-rw-r--r--lisp/pcmpl-unix.el1
-rw-r--r--lisp/pcomplete.el1
-rw-r--r--lisp/play/5x5.el1
-rw-r--r--lisp/play/animate.el1
-rw-r--r--lisp/play/blackbox.el1
-rw-r--r--lisp/play/bruce.el1
-rw-r--r--lisp/play/bubbles.el1
-rw-r--r--lisp/play/cookie1.el1
-rw-r--r--lisp/play/dissociate.el1
-rw-r--r--lisp/play/dunnet.el1
-rw-r--r--lisp/play/gamegrid.el1
-rw-r--r--lisp/play/handwrite.el1
-rw-r--r--lisp/play/hanoi.el1
-rw-r--r--lisp/play/life.el4
-rw-r--r--lisp/play/meese.el1
-rw-r--r--lisp/play/morse.el1
-rw-r--r--lisp/play/mpuz.el1
-rw-r--r--lisp/play/pong.el1
-rw-r--r--lisp/play/snake.el1
-rw-r--r--lisp/play/solitaire.el1
-rw-r--r--lisp/play/spook.el1
-rw-r--r--lisp/play/studly.el1
-rw-r--r--lisp/play/tetris.el1
-rw-r--r--lisp/play/yow.el1
-rw-r--r--lisp/play/zone.el1
-rw-r--r--lisp/proced.el1
-rw-r--r--lisp/progmodes/ada-mode.el5
-rw-r--r--lisp/progmodes/ada-stmt.el1
-rw-r--r--lisp/progmodes/ada-xref.el5
-rw-r--r--lisp/progmodes/antlr-mode.el1
-rw-r--r--lisp/progmodes/asm-mode.el1
-rw-r--r--lisp/progmodes/autoconf.el1
-rw-r--r--lisp/progmodes/bug-reference.el1
-rw-r--r--lisp/progmodes/cap-words.el1
-rw-r--r--lisp/progmodes/cc-align.el1
-rw-r--r--lisp/progmodes/cc-awk.el1
-rw-r--r--lisp/progmodes/cc-bytecomp.el1
-rw-r--r--lisp/progmodes/cc-cmds.el1
-rw-r--r--lisp/progmodes/cc-compat.el1
-rw-r--r--lisp/progmodes/cc-defs.el1
-rw-r--r--lisp/progmodes/cc-engine.el5
-rw-r--r--lisp/progmodes/cc-fonts.el1
-rw-r--r--lisp/progmodes/cc-langs.el1
-rw-r--r--lisp/progmodes/cc-menus.el1
-rw-r--r--lisp/progmodes/cc-mode.el5
-rw-r--r--lisp/progmodes/cc-styles.el1
-rw-r--r--lisp/progmodes/cc-vars.el1
-rw-r--r--lisp/progmodes/cfengine.el1
-rw-r--r--lisp/progmodes/cmacexp.el1
-rw-r--r--lisp/progmodes/compile.el1
-rw-r--r--lisp/progmodes/cperl-mode.el6
-rw-r--r--lisp/progmodes/cpp.el1
-rw-r--r--lisp/progmodes/cwarn.el1
-rw-r--r--lisp/progmodes/dcl-mode.el4
-rw-r--r--lisp/progmodes/delphi.el1
-rw-r--r--lisp/progmodes/ebnf-abn.el1
-rw-r--r--lisp/progmodes/ebnf-bnf.el1
-rw-r--r--lisp/progmodes/ebnf-dtd.el1
-rw-r--r--lisp/progmodes/ebnf-ebx.el1
-rw-r--r--lisp/progmodes/ebnf-iso.el1
-rw-r--r--lisp/progmodes/ebnf-otz.el1
-rw-r--r--lisp/progmodes/ebnf-yac.el1
-rw-r--r--lisp/progmodes/ebnf2ps.el4
-rw-r--r--lisp/progmodes/ebrowse.el4
-rw-r--r--lisp/progmodes/etags.el6
-rw-r--r--lisp/progmodes/executable.el1
-rw-r--r--lisp/progmodes/f90.el1
-rw-r--r--lisp/progmodes/gdb-mi.el2
-rw-r--r--lisp/progmodes/glasses.el1
-rw-r--r--lisp/progmodes/grep.el12
-rw-r--r--lisp/progmodes/gud.el1
-rw-r--r--lisp/progmodes/hideshow.el1
-rw-r--r--lisp/progmodes/icon.el4
-rw-r--r--lisp/progmodes/idlw-complete-structtag.el4
-rw-r--r--lisp/progmodes/idlw-toolbar.el1
-rw-r--r--lisp/progmodes/inf-lisp.el1
-rw-r--r--lisp/progmodes/ld-script.el5
-rw-r--r--lisp/progmodes/m4-mode.el1
-rw-r--r--lisp/progmodes/make-mode.el1
-rw-r--r--lisp/progmodes/mantemp.el1
-rw-r--r--lisp/progmodes/meta-mode.el4
-rw-r--r--lisp/progmodes/mixal-mode.el1
-rw-r--r--lisp/progmodes/modula2.el1
-rw-r--r--lisp/progmodes/octave-inf.el1
-rw-r--r--lisp/progmodes/octave-mod.el4
-rw-r--r--lisp/progmodes/pascal.el4
-rw-r--r--lisp/progmodes/ps-mode.el1
-rw-r--r--lisp/progmodes/ruby-mode.el4
-rw-r--r--lisp/progmodes/scheme.el1
-rw-r--r--lisp/progmodes/sh-script.el3
-rw-r--r--lisp/progmodes/subword.el1
-rw-r--r--lisp/progmodes/which-func.el1
-rw-r--r--lisp/ps-bdf.el1
-rw-r--r--lisp/ps-def.el1
-rw-r--r--lisp/ps-mule.el1
-rw-r--r--lisp/ps-print.el2
-rw-r--r--lisp/ps-samp.el1
-rw-r--r--lisp/recentf.el1
-rw-r--r--lisp/rect.el1
-rw-r--r--lisp/register.el1
-rw-r--r--lisp/repeat.el1
-rw-r--r--lisp/replace.el1
-rw-r--r--lisp/reposition.el4
-rw-r--r--lisp/reveal.el1
-rw-r--r--lisp/rfn-eshadow.el1
-rw-r--r--lisp/rot13.el1
-rw-r--r--lisp/ruler-mode.el1
-rw-r--r--lisp/savehist.el1
-rw-r--r--lisp/saveplace.el1
-rw-r--r--lisp/sb-image.el1
-rw-r--r--lisp/scroll-all.el1
-rw-r--r--lisp/scroll-bar.el1
-rw-r--r--lisp/scroll-lock.el1
-rw-r--r--lisp/ses.el1
-rw-r--r--lisp/shadowfile.el1
-rw-r--r--lisp/shell.el5
-rw-r--r--lisp/simple.el6
-rw-r--r--lisp/skeleton.el4
-rw-r--r--lisp/sort.el4
-rw-r--r--lisp/soundex.el1
-rw-r--r--lisp/startup.el6
-rw-r--r--lisp/strokes.el8
-rw-r--r--lisp/subr.el40
-rw-r--r--lisp/t-mouse.el1
-rw-r--r--lisp/tabify.el1
-rw-r--r--lisp/talk.el1
-rw-r--r--lisp/tar-mode.el1
-rw-r--r--lisp/tempo.el1
-rw-r--r--lisp/term.el5
-rw-r--r--lisp/term/AT386.el1
-rw-r--r--lisp/term/apollo.el1
-rw-r--r--lisp/term/bobcat.el1
-rw-r--r--lisp/term/cygwin.el1
-rw-r--r--lisp/term/internal.el1
-rw-r--r--lisp/term/iris-ansi.el1
-rw-r--r--lisp/term/linux.el1
-rw-r--r--lisp/term/lk201.el1
-rw-r--r--lisp/term/news.el1
-rw-r--r--lisp/term/pc-win.el4
-rw-r--r--lisp/term/rxvt.el1
-rw-r--r--lisp/term/sun.el1
-rw-r--r--lisp/term/sup-mouse.el1
-rw-r--r--lisp/term/tty-colors.el4
-rw-r--r--lisp/term/tvi970.el1
-rw-r--r--lisp/term/vt100.el1
-rw-r--r--lisp/term/vt102.el1
-rw-r--r--lisp/term/vt125.el1
-rw-r--r--lisp/term/vt200.el1
-rw-r--r--lisp/term/vt201.el1
-rw-r--r--lisp/term/vt220.el1
-rw-r--r--lisp/term/vt240.el1
-rw-r--r--lisp/term/vt300.el1
-rw-r--r--lisp/term/vt320.el1
-rw-r--r--lisp/term/vt400.el1
-rw-r--r--lisp/term/vt420.el1
-rw-r--r--lisp/term/wyse50.el1
-rw-r--r--lisp/term/xterm.el1
-rw-r--r--lisp/terminal.el1
-rw-r--r--lisp/textmodes/artist.el5
-rw-r--r--lisp/textmodes/bib-mode.el1
-rw-r--r--lisp/textmodes/bibtex-style.el4
-rw-r--r--lisp/textmodes/conf-mode.el1
-rw-r--r--lisp/textmodes/css-mode.el1
-rw-r--r--lisp/textmodes/enriched.el5
-rw-r--r--lisp/textmodes/fill.el5
-rw-r--r--lisp/textmodes/ispell.el3
-rw-r--r--lisp/textmodes/makeinfo.el5
-rw-r--r--lisp/textmodes/nroff-mode.el1
-rw-r--r--lisp/textmodes/page-ext.el4
-rw-r--r--lisp/textmodes/page.el1
-rw-r--r--lisp/textmodes/paragraphs.el1
-rw-r--r--lisp/textmodes/po.el1
-rw-r--r--lisp/textmodes/refbib.el1
-rw-r--r--lisp/textmodes/refer.el5
-rw-r--r--lisp/textmodes/refill.el1
-rw-r--r--lisp/textmodes/reftex-auc.el1
-rw-r--r--lisp/textmodes/reftex-cite.el1
-rw-r--r--lisp/textmodes/reftex-dcr.el1
-rw-r--r--lisp/textmodes/reftex-global.el1
-rw-r--r--lisp/textmodes/reftex-parse.el1
-rw-r--r--lisp/textmodes/reftex-vars.el1
-rw-r--r--lisp/textmodes/reftex.el1
-rw-r--r--lisp/textmodes/remember.el4
-rw-r--r--lisp/textmodes/spell.el5
-rw-r--r--lisp/textmodes/tex-mode.el1
-rw-r--r--lisp/textmodes/texinfmt.el6
-rw-r--r--lisp/textmodes/texinfo.el1
-rw-r--r--lisp/textmodes/texnfo-upd.el4
-rw-r--r--lisp/textmodes/text-mode.el1
-rw-r--r--lisp/textmodes/tildify.el1
-rw-r--r--lisp/textmodes/two-column.el1
-rw-r--r--lisp/textmodes/underline.el1
-rw-r--r--lisp/thingatpt.el1
-rw-r--r--lisp/thumbs.el1
-rw-r--r--lisp/time-stamp.el1
-rw-r--r--lisp/time.el1
-rw-r--r--lisp/timezone.el1
-rw-r--r--lisp/tmm.el67
-rw-r--r--lisp/tool-bar.el8
-rw-r--r--lisp/tooltip.el1
-rw-r--r--lisp/tree-widget.el1
-rw-r--r--lisp/tutorial.el1
-rw-r--r--lisp/type-break.el4
-rw-r--r--lisp/uniquify.el1
-rw-r--r--lisp/url/ChangeLog4
-rw-r--r--lisp/url/url-about.el1
-rw-r--r--lisp/url/url-auth.el1
-rw-r--r--lisp/url/url-cache.el1
-rw-r--r--lisp/url/url-cid.el1
-rw-r--r--lisp/url/url-dav.el1
-rw-r--r--lisp/url/url-dired.el1
-rw-r--r--lisp/url/url-expand.el1
-rw-r--r--lisp/url/url-file.el1
-rw-r--r--lisp/url/url-ftp.el1
-rw-r--r--lisp/url/url-gw.el1
-rw-r--r--lisp/url/url-handlers.el1
-rw-r--r--lisp/url/url-history.el5
-rw-r--r--lisp/url/url-http.el5
-rw-r--r--lisp/url/url-imap.el1
-rw-r--r--lisp/url/url-irc.el5
-rw-r--r--lisp/url/url-ldap.el1
-rw-r--r--lisp/url/url-mailto.el1
-rw-r--r--lisp/url/url-methods.el1
-rw-r--r--lisp/url/url-misc.el1
-rw-r--r--lisp/url/url-news.el1
-rw-r--r--lisp/url/url-nfs.el1
-rw-r--r--lisp/url/url-ns.el1
-rw-r--r--lisp/url/url-parse.el1
-rw-r--r--lisp/url/url-privacy.el1
-rw-r--r--lisp/url/url-proxy.el1
-rw-r--r--lisp/url/url-util.el1
-rw-r--r--lisp/url/url-vars.el5
-rw-r--r--lisp/url/url.el5
-rw-r--r--lisp/userlock.el1
-rw-r--r--lisp/vc/add-log.el1
-rw-r--r--lisp/vc/compare-w.el1
-rw-r--r--lisp/vc/cvs-status.el1
-rw-r--r--lisp/vc/diff-mode.el1
-rw-r--r--lisp/vc/ediff-diff.el5
-rw-r--r--lisp/vc/ediff-help.el1
-rw-r--r--lisp/vc/ediff-hook.el1
-rw-r--r--lisp/vc/ediff-init.el1
-rw-r--r--lisp/vc/ediff-merg.el1
-rw-r--r--lisp/vc/ediff-mult.el1
-rw-r--r--lisp/vc/ediff-ptch.el5
-rw-r--r--lisp/vc/ediff-vers.el1
-rw-r--r--lisp/vc/ediff-wind.el5
-rw-r--r--lisp/vc/ediff.el1
-rw-r--r--lisp/vc/log-edit.el1
-rw-r--r--lisp/vc/log-view.el1
-rw-r--r--lisp/vc/pcvs-defs.el1
-rw-r--r--lisp/vc/pcvs-info.el1
-rw-r--r--lisp/vc/pcvs-parse.el1
-rw-r--r--lisp/vc/pcvs-util.el1
-rw-r--r--lisp/vc/pcvs.el1
-rw-r--r--lisp/vc/smerge-mode.el1
-rw-r--r--lisp/vc/vc-annotate.el1
-rw-r--r--lisp/vc/vc-arch.el1
-rw-r--r--lisp/vc/vc-bzr.el2
-rw-r--r--lisp/vc/vc-cvs.el1
-rw-r--r--lisp/vc/vc-dav.el1
-rw-r--r--lisp/vc/vc-dir.el1
-rw-r--r--lisp/vc/vc-dispatcher.el1
-rw-r--r--lisp/vc/vc-git.el1
-rw-r--r--lisp/vc/vc-hg.el1
-rw-r--r--lisp/vc/vc-hooks.el1
-rw-r--r--lisp/vc/vc-mtn.el1
-rw-r--r--lisp/vc/vc-rcs.el1
-rw-r--r--lisp/vc/vc-sccs.el1
-rw-r--r--lisp/vc/vc-svn.el1
-rw-r--r--lisp/vc/vc.el1
-rw-r--r--lisp/vcursor.el1
-rw-r--r--lisp/view.el1
-rw-r--r--lisp/vt-control.el1
-rw-r--r--lisp/vt100-led.el1
-rw-r--r--lisp/wdired.el1
-rw-r--r--lisp/whitespace.el4
-rw-r--r--lisp/wid-browse.el1
-rw-r--r--lisp/widget.el1
-rw-r--r--lisp/windmove.el1
-rw-r--r--lisp/window.el1
-rw-r--r--lisp/winner.el1
-rw-r--r--lisp/xml.el1
-rw-r--r--lisp/xt-mouse.el1
-rw-r--r--lwlib/ChangeLog1
-rw-r--r--lwlib/Makefile.in4
-rw-r--r--lwlib/lwlib-Xaw.c2
-rw-r--r--lwlib/lwlib-Xaw.h2
-rw-r--r--lwlib/lwlib-Xlw.c2
-rw-r--r--lwlib/lwlib-Xlw.h2
-rw-r--r--lwlib/lwlib-Xm.c2
-rw-r--r--lwlib/lwlib-Xm.h2
-rw-r--r--lwlib/lwlib-int.h2
-rw-r--r--lwlib/lwlib-utils.c2
-rw-r--r--lwlib/lwlib-utils.h2
-rw-r--r--lwlib/lwlib.c2
-rw-r--r--lwlib/lwlib.h2
-rw-r--r--lwlib/xlwmenu.c2
-rw-r--r--lwlib/xlwmenu.h2
-rw-r--r--lwlib/xlwmenuP.h2
-rw-r--r--msdos/is_exec.c2
-rw-r--r--msdos/sed1v2.inp5
-rw-r--r--msdos/sed1x.inp3
-rw-r--r--msdos/sed2v2.inp1
-rw-r--r--msdos/sed2x.inp5
-rw-r--r--msdos/sed3v2.inp1
-rw-r--r--msdos/sed4.inp1
-rw-r--r--msdos/sed5x.inp5
-rw-r--r--msdos/sed6.inp1
-rw-r--r--msdos/sedalloc.inp1
-rw-r--r--msdos/sedleim.inp1
-rw-r--r--msdos/sedlisp.inp1
-rw-r--r--msdos/sigaction.c2
-rw-r--r--nextstep/Cocoa/Emacs.base/Contents/Resources/Credits.html3
-rw-r--r--nt/.gitignore2
-rw-r--r--nt/ChangeLog1
-rw-r--r--nt/README4
-rw-r--r--nt/README.W324
-rw-r--r--nt/addpm.c2
-rw-r--r--nt/addsection.c2
-rw-r--r--nt/cmdproxy.c2
-rw-r--r--nt/config.nt2
-rwxr-xr-xnt/configure.bat3
-rw-r--r--nt/ddeclient.c2
-rw-r--r--nt/envadd.bat3
-rwxr-xr-xnt/ftime-nostartup.bat3
-rw-r--r--nt/ftime.bat3
-rw-r--r--nt/gmake.defs1
-rw-r--r--nt/inc/arpa/inet.h2
-rw-r--r--nt/inc/netdb.h2
-rw-r--r--nt/inc/netinet/in.h2
-rw-r--r--nt/inc/pwd.h2
-rw-r--r--nt/inc/sys/dir.h2
-rw-r--r--nt/inc/sys/file.h2
-rw-r--r--nt/inc/sys/ioctl.h2
-rw-r--r--nt/inc/sys/param.h2
-rw-r--r--nt/inc/sys/time.h2
-rw-r--r--nt/inc/unistd.h2
-rw-r--r--nt/multi-install-info.bat3
-rw-r--r--nt/nmake.defs1
-rw-r--r--nt/paths.h2
-rw-r--r--nt/preprep.c2
-rw-r--r--nt/runemacs.c2
-rw-r--r--nt/zipdist.bat4
-rw-r--r--oldXMenu/Activate.c2
-rw-r--r--oldXMenu/AddPane.c2
-rw-r--r--oldXMenu/AddSel.c2
-rw-r--r--oldXMenu/ChangeLog1
-rw-r--r--oldXMenu/ChgPane.c2
-rw-r--r--oldXMenu/ChgSel.c2
-rw-r--r--oldXMenu/Create.c2
-rw-r--r--oldXMenu/DelPane.c2
-rw-r--r--oldXMenu/DelSel.c2
-rw-r--r--oldXMenu/Destroy.c2
-rw-r--r--oldXMenu/Error.c2
-rw-r--r--oldXMenu/EvHand.c2
-rw-r--r--oldXMenu/FindPane.c2
-rw-r--r--oldXMenu/FindSel.c2
-rw-r--r--oldXMenu/InsPane.c2
-rw-r--r--oldXMenu/InsSel.c2
-rw-r--r--oldXMenu/Internal.c2
-rw-r--r--oldXMenu/Locate.c2
-rw-r--r--oldXMenu/Makefile.in4
-rw-r--r--oldXMenu/Post.c2
-rw-r--r--oldXMenu/Recomp.c2
-rw-r--r--oldXMenu/SetAEQ.c2
-rw-r--r--oldXMenu/SetFrz.c2
-rw-r--r--oldXMenu/SetPane.c2
-rw-r--r--oldXMenu/SetSel.c2
-rw-r--r--oldXMenu/X10.h2
-rw-r--r--oldXMenu/XCrAssoc.c2
-rw-r--r--oldXMenu/XDelAssoc.c2
-rw-r--r--oldXMenu/XDestAssoc.c2
-rw-r--r--oldXMenu/XLookAssoc.c2
-rw-r--r--oldXMenu/XMakeAssoc.c2
-rw-r--r--oldXMenu/XMenu.h2
-rw-r--r--oldXMenu/XMenuInt.h2
-rw-r--r--oldXMenu/copyright.h2
-rw-r--r--oldXMenu/insque.c2
-rw-r--r--src/.gitignore2
-rw-r--r--src/ChangeLog13
-rw-r--r--src/ChangeLog.11
-rw-r--r--src/ChangeLog.101
-rw-r--r--src/ChangeLog.21
-rw-r--r--src/ChangeLog.31
-rw-r--r--src/ChangeLog.41
-rw-r--r--src/ChangeLog.51
-rw-r--r--src/ChangeLog.61
-rw-r--r--src/ChangeLog.71
-rw-r--r--src/ChangeLog.81
-rw-r--r--src/README4
-rw-r--r--src/alloc.c2
-rw-r--r--src/atimer.c2
-rw-r--r--src/atimer.h2
-rw-r--r--src/bidi.c2
-rw-r--r--src/blockinput.h2
-rw-r--r--src/buffer.c8
-rw-r--r--src/buffer.h5
-rw-r--r--src/bytecode.c2
-rw-r--r--src/callint.c2
-rw-r--r--src/casefiddle.c2
-rw-r--r--src/casetab.c2
-rw-r--r--src/category.c2
-rw-r--r--src/category.h2
-rw-r--r--src/ccl.c2
-rw-r--r--src/ccl.h2
-rw-r--r--src/character.c2
-rw-r--r--src/character.h2
-rw-r--r--src/charset.c2
-rw-r--r--src/charset.h2
-rw-r--r--src/chartab.c2
-rw-r--r--src/cm.c2
-rw-r--r--src/cm.h2
-rw-r--r--src/cmds.c2
-rw-r--r--src/coding.c2
-rw-r--r--src/coding.h2
-rw-r--r--src/commands.h2
-rw-r--r--src/composite.c2
-rw-r--r--src/composite.h2
-rw-r--r--src/data.c2
-rw-r--r--src/dbusbind.c2
-rw-r--r--src/deps.mk2
-rw-r--r--src/dired.c2
-rw-r--r--src/dispextern.h2
-rw-r--r--src/dispnew.c2
-rw-r--r--src/disptab.h2
-rw-r--r--src/doc.c2
-rw-r--r--src/doprnt.c2
-rw-r--r--src/dosfns.c2
-rw-r--r--src/dosfns.h2
-rw-r--r--src/editfns.c2
-rw-r--r--src/emacs-icon.h2
-rw-r--r--src/epaths.in2
-rw-r--r--src/eval.c6
-rw-r--r--src/fileio.c7
-rw-r--r--src/filelock.c2
-rw-r--r--src/filemode.c2
-rw-r--r--src/firstfile.c2
-rw-r--r--src/floatfns.c2
-rw-r--r--src/fns.c2
-rw-r--r--src/font.c4
-rw-r--r--src/font.h2
-rw-r--r--src/fontset.c2
-rw-r--r--src/fontset.h2
-rw-r--r--src/frame.c4
-rw-r--r--src/frame.h2
-rw-r--r--src/fringe.c2
-rw-r--r--src/ftfont.c2
-rw-r--r--src/ftfont.h2
-rw-r--r--src/ftxfont.c2
-rw-r--r--src/getloadavg.c2
-rw-r--r--src/getpagesize.h2
-rw-r--r--src/gmalloc.c2
-rw-r--r--src/gnutls.c2
-rw-r--r--src/gnutls.h2
-rw-r--r--src/gtkutil.c2
-rw-r--r--src/gtkutil.h2
-rw-r--r--src/image.c2
-rw-r--r--src/indent.c2
-rw-r--r--src/indent.h2
-rw-r--r--src/intervals.c2
-rw-r--r--src/intervals.h2
-rw-r--r--src/keymap.c2
-rw-r--r--src/keymap.h2
-rw-r--r--src/lastfile.c2
-rw-r--r--src/m/alpha.h2
-rw-r--r--src/m/amdx86-64.h7
-rw-r--r--src/m/ia64.h8
-rw-r--r--src/m/ibmrs6000.h7
-rw-r--r--src/m/ibms390.h2
-rw-r--r--src/m/ibms390x.h6
-rw-r--r--src/m/intel386.h7
-rw-r--r--src/m/iris4d.h7
-rw-r--r--src/m/m68k.h2
-rw-r--r--src/m/macppc.h7
-rw-r--r--src/m/sparc.h7
-rw-r--r--src/m/template.h2
-rw-r--r--src/m/vax.h2
-rw-r--r--src/macros.c2
-rw-r--r--src/macros.h2
-rw-r--r--src/marker.c2
-rw-r--r--src/md5.c2
-rw-r--r--src/md5.h2
-rw-r--r--src/mem-limits.h2
-rw-r--r--src/menu.c2
-rw-r--r--src/menu.h2
-rw-r--r--src/msdos.c2
-rw-r--r--src/msdos.h2
-rw-r--r--src/ndir.h2
-rw-r--r--src/ns.mk2
-rw-r--r--src/nsfns.m5
-rw-r--r--src/nsfont.m1
-rw-r--r--src/nsgui.h2
-rw-r--r--src/nsimage.m1
-rw-r--r--src/nsmenu.m1
-rw-r--r--src/nsselect.m1
-rw-r--r--src/nsterm.h2
-rw-r--r--src/nsterm.m1
-rw-r--r--src/pre-crt0.c2
-rw-r--r--src/print.c2
-rw-r--r--src/process.h2
-rw-r--r--src/puresize.h2
-rw-r--r--src/ralloc.c2
-rw-r--r--src/regex.h2
-rw-r--r--src/region-cache.c2
-rw-r--r--src/region-cache.h2
-rw-r--r--src/s/aix4-2.h6
-rw-r--r--src/s/bsd-common.h7
-rw-r--r--src/s/cygwin.h2
-rw-r--r--src/s/darwin.h7
-rw-r--r--src/s/freebsd.h2
-rw-r--r--src/s/gnu-kfreebsd.h2
-rw-r--r--src/s/gnu-linux.h5
-rw-r--r--src/s/gnu.h7
-rw-r--r--src/s/hpux10-20.h7
-rw-r--r--src/s/hpux11.h2
-rw-r--r--src/s/irix6-5.h4
-rw-r--r--src/s/ms-w32.h2
-rw-r--r--src/s/msdos.h2
-rw-r--r--src/s/netbsd.h6
-rw-r--r--src/s/openbsd.h2
-rw-r--r--src/s/sol2-10.h2
-rw-r--r--src/s/sol2-6.h4
-rw-r--r--src/s/template.h2
-rw-r--r--src/s/unixware.h4
-rw-r--r--src/s/usg5-4-common.h2
-rw-r--r--src/scroll.c2
-rw-r--r--src/search.c2
-rw-r--r--src/sheap.c2
-rw-r--r--src/sound.c2
-rw-r--r--src/syntax.c2
-rw-r--r--src/syntax.h2
-rw-r--r--src/sysselect.h2
-rw-r--r--src/syssignal.h2
-rw-r--r--src/systime.h2
-rw-r--r--src/syswait.h2
-rw-r--r--src/termcap.c2
-rw-r--r--src/termchar.h2
-rw-r--r--src/termhooks.h2
-rw-r--r--src/terminal.c2
-rw-r--r--src/terminfo.c2
-rw-r--r--src/termopts.h2
-rw-r--r--src/textprop.c2
-rw-r--r--src/tparam.c2
-rw-r--r--src/undo.c2
-rw-r--r--src/unexaix.c2
-rw-r--r--src/unexcoff.c2
-rw-r--r--src/unexcw.c2
-rw-r--r--src/unexelf.c2
-rw-r--r--src/unexhp9k800.c2
-rw-r--r--src/unexmacosx.c2
-rw-r--r--src/unexsol.c2
-rw-r--r--src/unexw32.c2
-rw-r--r--src/vm-limit.c2
-rw-r--r--src/w16select.c5
-rw-r--r--src/w32.h2
-rw-r--r--src/w32console.c2
-rw-r--r--src/w32font.c2
-rw-r--r--src/w32font.h2
-rw-r--r--src/w32gui.h2
-rw-r--r--src/w32heap.h2
-rw-r--r--src/w32inevt.h2
-rw-r--r--src/w32menu.c2
-rw-r--r--src/w32reg.c2
-rw-r--r--src/w32select.c5
-rw-r--r--src/w32term.c7
-rw-r--r--src/w32term.h2
-rw-r--r--src/w32uniscribe.c2
-rw-r--r--src/w32xfns.c2
-rw-r--r--src/widget.c2
-rw-r--r--src/widget.h2
-rw-r--r--src/widgetprv.h2
-rw-r--r--src/window.c35
-rw-r--r--src/window.h2
-rw-r--r--src/xfaces.c4
-rw-r--r--src/xfns.c7
-rw-r--r--src/xfont.c2
-rw-r--r--src/xftfont.c2
-rw-r--r--src/xgselect.c2
-rw-r--r--src/xgselect.h2
-rw-r--r--src/xml.c2
-rw-r--r--src/xrdb.c2
-rw-r--r--src/xselect.c2
-rw-r--r--src/xsettings.c8
-rw-r--r--src/xsettings.h2
-rw-r--r--src/xsmfns.c2
-rw-r--r--src/xterm.c5
-rw-r--r--src/xterm.h2
-rw-r--r--test/ChangeLog1
-rw-r--r--test/bytecomp-testsuite.el1
-rw-r--r--test/cedet/cedet-utests.el1
-rw-r--r--test/cedet/ede-tests.el1
-rw-r--r--test/cedet/semantic-ia-utest.el1
-rw-r--r--test/cedet/semantic-tests.el1
-rw-r--r--test/cedet/semantic-utest-c.el1
-rw-r--r--test/cedet/semantic-utest.el1
-rw-r--r--test/cedet/srecode-tests.el1
-rw-r--r--test/cedet/tests/test.c2
-rw-r--r--test/cedet/tests/test.el1
-rw-r--r--test/cedet/tests/testdoublens.cpp1
-rw-r--r--test/cedet/tests/testdoublens.hpp1
-rw-r--r--test/cedet/tests/testfriends.cpp1
-rw-r--r--test/cedet/tests/testnsp.cpp1
-rw-r--r--test/cedet/tests/testpolymorph.cpp1
-rw-r--r--test/cedet/tests/testspp.c2
-rw-r--r--test/cedet/tests/testsppcomplete.c2
-rw-r--r--test/cedet/tests/testsppreplace.c2
-rw-r--r--test/cedet/tests/testsppreplaced.c2
-rw-r--r--test/cedet/tests/testsubclass.cpp1
-rw-r--r--test/cedet/tests/testsubclass.hh1
-rw-r--r--test/cedet/tests/testtypedefs.cpp1
-rw-r--r--test/cedet/tests/testvarnames.c2
-rw-r--r--test/comint-testsuite.el2
-rw-r--r--test/icalendar-testsuite.el1
-rw-r--r--test/newsticker-testsuite.el1
-rw-r--r--test/occur-testsuite.el2
-rw-r--r--test/redisplay-testsuite.el1
-rwxr-xr-xupdate-subdirs2
-rw-r--r--vpath.sed1
1875 files changed, 1727 insertions, 3547 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d9782015e..cd9104759d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2011-01-14 Paul Eggert <eggert@cs.ucla.edu>
+2011-01-17 Paul Eggert <eggert@cs.ucla.edu>
* Makefile.in (GNULIB_MODULES): Change ftoastr to dtoastr.
This avoids building ftoastr and ldtoastr, which aren't needed. See
@@ -104,6 +104,14 @@
* make-dist: Also put into the distribution aclocal.m4,
compile, depcomp, missing, and the files under lib/.
+2011-01-15 Glenn Morris <rgm@gnu.org>
+
+ * Makefile.in (epaths-force): No more arch-tag to edit.
+
+2011-01-15 Chong Yidong <cyd@stupidchicken.com>
+
+ * configure.in: Bump min libxml2 version to 2.6.17 (Bug#7603).
+
2011-01-14 Paul Eggert <eggert@cs.ucla.edu>
* make-dist: Distribute test/ files too.
@@ -8813,8 +8821,9 @@
;; coding: utf-8
;; End:
- Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
- 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
+ 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+ Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/Makefile.in b/Makefile.in
index b9237edac8..4cc6b08f89 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -300,8 +300,7 @@ epaths-force: FRC
-e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";' \
-e 's;\(#.*PATH_X_DEFAULTS\).*$$;\1 "${x_default_search_path}";' \
-e 's;\(#.*PATH_GAME\).*$$;\1 "${gamedir}";' \
- -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";' \
- -e 's;/[*] *arch-tag:.*;/*;') && \
+ -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') && \
${srcdir}/move-if-change epaths.h.$$$$ src/epaths.h
# For parallel make, src should be built before leim.
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 0346bb2e62..7febc93bb3 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 5b714193ab..ca310c1b8f 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 432e4f5cf9..1d988a2562 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 17232f5f3a..f47ce7964c 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 3831260424..27aa175fd4 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 759750f847..edabf47fe1 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 ca10d2a87a..6764cbf853 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 a041f7f14a..b16e7ccd74 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 7cae450ba5..7482d11a2d 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 83b5a7f0e3..b7d1fd19d8 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 6cf2f37dbd..39ccc1c7dc 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 d6f1966894..acba033337 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 1580352599..18c19f5fb5 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 7b89c903be..6cd9521ce9 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 c1b691b9a6..3c16cb556e 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 9d43f2e0e8..2bc58c438d 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 deb69e2a1a..4f7a8b96f5 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 6234471e9e..59969c3df2 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 daed2926b2..ef4b203cd7 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 060e100f6c..2fc8b13940 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 92198bad89..c09d95c2ec 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 2e1ee64b24..3b1270b477 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 180c35601b..4e2e70a9a4 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 5ab468c8f5..88461131a3 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 9abfa731be..9937d61d85 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 c66cdd98a3..7a668b13f1 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 e8dcdd3a6d..983b148668 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 1dfc56f7a1..aa0fdc772f 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 e29456b3a2..8c85b8984d 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 c0e95426cc..97ed396f20 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 d146fdad60..0e346cf538 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 4f759a363d..3f2d8ca551 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 7965f36ad0..70aeb5dae5 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 6e57884a87..865177a1fb 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 57a6d3945c..f414ca461f 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) -->
diff --git a/autogen.sh b/autogen.sh
index 6eb8f98208..52184c46f5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,5 +5,3 @@ echo "Please read INSTALL.BZR for instructions on how to build Emacs from Bazaar
# Exit with failure, since people may have generic build scripts that
# try things like "autogen.sh && ./configure && make".
exit 1
-
-# arch-tag: a123408c-fada-4bf7-98a0-a786cff918f0
diff --git a/config.bat b/config.bat
index 9931d61da6..f87bcd13a5 100644
--- a/config.bat
+++ b/config.bat
@@ -316,6 +316,3 @@ set djgpp_ver=
set sys_malloc=
set libxml=
-goto skipArchTag
- arch-tag: 2d2fed23-4dc6-4006-a2e4-49daf0031f33
-:skipArchTag
diff --git a/configure b/configure
index 9fa20d6624..a15a9ea56a 100755
--- a/configure
+++ b/configure
@@ -12262,23 +12262,23 @@ fi
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 > 2.2.0" >&5
-$as_echo_n "checking for libxml-2.0 > 2.2.0... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 > 2.6.17" >&5
+$as_echo_n "checking for libxml-2.0 > 2.6.17... " >&6; }
- if $PKG_CONFIG --exists "libxml-2.0 > 2.2.0" 2>&5; then
+ if $PKG_CONFIG --exists "libxml-2.0 > 2.6.17" 2>&5; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
succeeded=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML2_CFLAGS" >&5
$as_echo_n "checking LIBXML2_CFLAGS... " >&6; }
- LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 > 2.2.0"|sed -e 's,///*,/,g'`
+ LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 > 2.6.17"|sed -e 's,///*,/,g'`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML2_CFLAGS" >&5
$as_echo "$LIBXML2_CFLAGS" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML2_LIBS" >&5
$as_echo_n "checking LIBXML2_LIBS... " >&6; }
- LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 > 2.2.0"|sed -e 's,///*,/,g'`
+ LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 > 2.6.17"|sed -e 's,///*,/,g'`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML2_LIBS" >&5
$as_echo "$LIBXML2_LIBS" >&6; }
else
@@ -12288,7 +12288,7 @@ $as_echo "no" >&6; }
LIBXML2_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
- LIBXML2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 > 2.2.0"`
+ LIBXML2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 > 2.6.17"`
fi
diff --git a/configure.in b/configure.in
index d51e93d94b..2cac4f3e7d 100644
--- a/configure.in
+++ b/configure.in
@@ -2512,7 +2512,7 @@ AC_SUBST(LIBXSM)
### Use libxml (-lxml2) if available
if test "${with_xml2}" != "no"; then
### I'm not sure what the version number should be, so I just guessed.
- PKG_CHECK_MODULES(LIBXML2, libxml-2.0 > 2.2.0, HAVE_LIBXML2=yes, HAVE_LIBXML2=no)
+ PKG_CHECK_MODULES(LIBXML2, libxml-2.0 > 2.6.17, HAVE_LIBXML2=yes, HAVE_LIBXML2=no)
if test "${HAVE_LIBXML2}" = "yes"; then
LIBS="$LIBXML2_LIBS $LIBS"
AC_CHECK_LIB(xml2, htmlReadMemory, HAVE_LIBXML2=yes, HAVE_LIBXML2=no)
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index c2d058119a..84fa7f875c 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,20 @@
+2011-01-15 Chong Yidong <cyd@stupidchicken.com>
+
+ * building.texi (Compilation): Improve instructions for running two
+ compilations (Bug#7573).
+
+ * files.texi (Backup Names): Document the new location of the
+ last-resort backup file.
+
+ * files.texi (File Aliases): Move directory-abbrev-alist doc from Lisp
+ manual. Explain why directory-abbrev-alist elements should be anchored
+ (Bug#7777).
+
+2011-01-15 Eli Zaretskii <eliz@gnu.org>
+
+ * msdog.texi (Windows Startup): Correct inaccurate description of
+ differences between emacsclient.exe and emacsclientw.exe.
+
2011-01-02 Chong Yidong <cyd@stupidchicken.com>
* rmail.texi (Rmail Display): Edit for grammar and conciseness.
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 0d22870a5d..441a08f3be 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -1,7 +1,8 @@
#### Makefile for the Emacs Manual
# Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+# Free Software Foundation, Inc.
# This file is part of GNU Emacs.
diff --git a/doc/emacs/abbrevs.texi b/doc/emacs/abbrevs.texi
index 160c70471d..24bbfb014e 100644
--- a/doc/emacs/abbrevs.texi
+++ b/doc/emacs/abbrevs.texi
@@ -455,7 +455,3 @@ customize dynamic abbrev expansion to handle optional prefixes by setting
the variable @code{dabbrev-abbrev-skip-leading-regexp}. Its value
should be a regular expression that matches the optional prefix that
dynamic abbrev expression should ignore.
-
-@ignore
- arch-tag: 638e0079-9540-48ec-9166-414083e16445
-@end ignore
diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi
index fd54aea4eb..86c1da4514 100644
--- a/doc/emacs/anti.texi
+++ b/doc/emacs/anti.texi
@@ -135,7 +135,3 @@ Support for Sun windows has been added.
To keep up with decreasing computer memory capacity and disk space, many
other functions and files have been eliminated in Emacs 22.3.
@end itemize
-
-@ignore
- arch-tag: 32932bd9-46f5-41b2-8a0e-fb0cc4caeb29
-@end ignore
diff --git a/doc/emacs/arevert-xtra.texi b/doc/emacs/arevert-xtra.texi
index c19fd3a5cc..fe8f9636e8 100644
--- a/doc/emacs/arevert-xtra.texi
+++ b/doc/emacs/arevert-xtra.texi
@@ -186,7 +186,3 @@ should at the very least make clear whether enabling auto-reverting
for the buffer reliably assures that all information in the buffer is
completely up to date (or will be after @code{auto-revert-interval}
seconds).
-
-@ignore
- arch-tag: 2983e613-a272-45f6-9593-3010ad7f865e
-@end ignore
diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi
index 7cee61db71..55c9af4916 100644
--- a/doc/emacs/buffers.texi
+++ b/doc/emacs/buffers.texi
@@ -674,7 +674,3 @@ provides a different and customizable mouse buffer menu which you may
prefer. It replaces the bindings of @code{mouse-buffer-menu},
normally on @kbd{C-Down-Mouse-1}, and the menu bar buffer menu. You
can customize the menu in the @code{msb} Custom group.
-
-@ignore
- arch-tag: 08c43460-f4f4-4b43-9cb5-1ea9ad991695
-@end ignore
diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index 98420b1f56..551ed3c5ce 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -122,10 +122,10 @@ confirmation before actually killing a compilation that is running.
You can also kill the compilation process with @kbd{M-x
kill-compilation}.
- If you want to run two compilations at once, you should start the
-first one, then rename the @samp{*compilation*} buffer (perhaps using
-@code{rename-uniquely}; @pxref{Misc Buffer}), and start the other
-compilation. That will create a new @samp{*compilation*} buffer.
+ To run two compilations at once, start the first one, then rename
+the @samp{*compilation*} buffer (perhaps using @code{rename-uniquely};
+@pxref{Misc Buffer}), then switch buffers and start the other
+compilation. This will create a new @samp{*compilation*} buffer.
Emacs does not expect a compiler process to launch asynchronous
subprocesses; if it does, and they keep running after the main
@@ -1641,7 +1641,3 @@ both modes it has the effect of installing the function definition
that point is in, but the way of doing so is different according to
where the relevant Lisp environment is found.
-
-@ignore
- arch-tag: 9c3c2f71-b332-4144-8500-3ff9945a50ed
-@end ignore
diff --git a/doc/emacs/cal-xtra.texi b/doc/emacs/cal-xtra.texi
index 2f6a09ba67..cc6151a742 100644
--- a/doc/emacs/cal-xtra.texi
+++ b/doc/emacs/cal-xtra.texi
@@ -900,7 +900,3 @@ for example in the European style to @var{day}, @var{month}, @var{year}.)
@var{mark} which specifies how to mark the date in the calendar display.
If one of these functions decides that it applies to a certain date,
it returns a value that contains @var{mark}, as described above.
-
-@ignore
- arch-tag: 52cb299f-fd1f-4616-bfe6-91b988669431
-@end ignore
diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi
index 0cdd348dae..17de12363d 100644
--- a/doc/emacs/calendar.texi
+++ b/doc/emacs/calendar.texi
@@ -1709,7 +1709,3 @@ data in Emacs from the file.
@ifnottex
@include cal-xtra.texi
@end ifnottex
-
-@ignore
- arch-tag: 4531ef09-9df3-449d-9c52-2b5a4a337f92
-@end ignore
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index dc0ff935f7..5d5587cf4f 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -1163,7 +1163,3 @@ test case that simplifies debugging of display problems.
The @samp{--xrm} option (@pxref{Resources}) specifies additional
X resource values.
-
-@ignore
- arch-tag: fffecd9e-7329-4a51-a3cc-dd4a9889340e
-@end ignore
diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi
index 8d7e2556dd..8e7856fb43 100644
--- a/doc/emacs/commands.texi
+++ b/doc/emacs/commands.texi
@@ -195,7 +195,3 @@ specific variables will make sense.
@ifnottex
@lowersections
@end ifnottex
-
-@ignore
- arch-tag: 9be43eef-d1f4-4d03-a916-c741ea713a45
-@end ignore
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index b3efaff3c6..031ea8f5e7 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -2605,7 +2605,3 @@ stop working. It is therefore advisable to use one and only one
coding system, for your init file as well as the files you edit. For
example, don't mix the @samp{latin-1} and @samp{latin-9} coding
systems.
-
-@ignore
- arch-tag: c68abddb-4410-4fb5-925f-63394e971d93
-@end ignore
diff --git a/doc/emacs/dired-xtra.texi b/doc/emacs/dired-xtra.texi
index aa2e83f129..be37765611 100644
--- a/doc/emacs/dired-xtra.texi
+++ b/doc/emacs/dired-xtra.texi
@@ -42,7 +42,3 @@ without explicitly assigned switches.)
You can make Dired forget about all subdirectory switches and relist
all subdirectories with the buffer's default switches using
@kbd{M-x dired-reset-subdir-switches}. This also reverts the Dired buffer.
-
-@ignore
- arch-tag: e3865701-9179-4ffb-bc34-d321111c688d
-@end ignore
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 92105e6566..5f3436d080 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -1404,7 +1404,3 @@ it onto a Dired buffer; this either moves, copies, or creates a link
to the file in that directory. Precisely which action is taken is
determined by the originating program. Dragging files out of a Dired
buffer is currently not supported.
-
-@ignore
- arch-tag: d105f9b9-fc1b-4c5f-a949-9b2cf3ca2fc1
-@end ignore
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 0af2b02210..53d09f2e2c 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -1401,7 +1401,3 @@ page for other output. On such terminals, you might want to set the variable
@code{no-redraw-on-reenter} non-@code{nil}; this tells Emacs to
assume, when resumed, that the screen page it is using still contains
what Emacs last wrote there.
-
-@ignore
- arch-tag: 2219f910-2ff0-4521-b059-1bd231a536c4
-@end ignore
diff --git a/doc/emacs/doclicense.texi b/doc/emacs/doclicense.texi
index 6e9f5a144b..51342e96d6 100644
--- a/doc/emacs/doclicense.texi
+++ b/doc/emacs/doclicense.texi
@@ -506,7 +506,3 @@ to permit their use in free software.
@c ispell-local-pdict: "ispell-dict"
@c End:
-@ignore
- arch-tag: d68e7b7a-0c7c-4c15-905b-a9482214e25a
-@end ignore
-
diff --git a/doc/emacs/emacs-xtra.texi b/doc/emacs/emacs-xtra.texi
index 9d20b33535..ee75a07d10 100644
--- a/doc/emacs/emacs-xtra.texi
+++ b/doc/emacs/emacs-xtra.texi
@@ -136,7 +136,3 @@ the Emacs manual.
@printindex cp
@bye
-
-@ignore
- arch-tag: 75c33f13-32c6-41b6-9537-847a312e2e49
-@end ignore
diff --git a/doc/emacs/emerge-xtra.texi b/doc/emacs/emerge-xtra.texi
index 5db2d2b4a2..144c5465e2 100644
--- a/doc/emacs/emerge-xtra.texi
+++ b/doc/emacs/emerge-xtra.texi
@@ -412,7 +412,3 @@ commands.
@ifnottex
@xref{Hooks}.
@end ifnottex
-
-@ignore
- arch-tag: cda63f09-9c5f-4ea1-adb9-4a820fdfb24e
-@end ignore
diff --git a/doc/emacs/entering.texi b/doc/emacs/entering.texi
index 349e6326ec..44af26a5df 100644
--- a/doc/emacs/entering.texi
+++ b/doc/emacs/entering.texi
@@ -181,7 +181,3 @@ keys to run any commands of your choice (@pxref{Keymaps}).
@ifnottex
@lowersections
@end ifnottex
-
-@ignore
- arch-tag: df798d8b-f253-4113-b585-f528f078a944
-@end ignore
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 0df3769cd8..c88ff90ac3 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -568,10 +568,10 @@ another from the newly saved contents if you save again.
appending @samp{~} to the file name being edited; thus, the backup
file for @file{eval.c} would be @file{eval.c~}.
- If access control stops Emacs from writing backup files under the usual
-names, it writes the backup file as @file{%backup%~} in your home
-directory. Only one such file can exist, so only the most recently
-made such backup is available.
+ If access control stops Emacs from writing backup files under the
+usual names, it writes the backup file as @file{~/.emacs.d/%backup%~}.
+Only one such file can exist, so only the most recently made such
+backup is available.
Emacs can also make @dfn{numbered backup files}. Numbered backup
file names contain @samp{.~}, the number, and another @samp{~} after
@@ -1160,7 +1160,6 @@ links point to directories.
@vindex find-file-existing-other-name
@vindex find-file-suppress-same-file-warnings
-
Normally, if you visit a file which Emacs is already visiting under
a different name, Emacs displays a message in the echo area and uses
the existing buffer visiting that file. This can happen on systems
@@ -1182,6 +1181,31 @@ then the file name recorded for a buffer is the file's @dfn{truename}
than the name you specify. Setting @code{find-file-visit-truename} also
implies the effect of @code{find-file-existing-other-name}.
+@cindex directory name abbreviation
+@vindex directory-abbrev-alist
+ Sometimes, a directory is ordinarily accessed through a symbolic
+link, and you may want Emacs to preferentially display its ``linked''
+name instead of its truename. To do this, customize the variable
+@code{directory-abbrev-alist}. Each element in this list should have
+the form @code{(@var{from} . @var{to})}, which says to replace
+@var{from} with @var{to} when it appears in a directory name. For
+this feature to work properly, @var{from} and @var{to} should point to
+the same file. The @var{from} string is actually a regular expression
+(@pxref{Regexps}); it should always start with @samp{\`}, to avoid
+matching to an incorrect part of the original directory name. The
+@var{to} string should be an ordinary absolute directory name. Do not
+use @samp{~} to stand for a home directory in the @var{to} string;
+Emacs performs these substitutions separately.
+
+ Here's an example, from a system on which file system
+@file{/home/fsf} and so on are normally accessed through symbolic
+links named @file{/fsf} and so on.
+
+@example
+(("\\`/home/fsf" . "/fsf")
+ ("\\`/home/gd" . "/gd"))
+@end example
+
@node Directories
@section File Directories
@@ -1974,7 +1998,3 @@ menu, where each existing fileset is represented by a submenu.
Control} to describe sets of files to be treated as a group for
purposes of version control operations. Those filesets are unnamed
and do not persist across Emacs sessions.
-
-@ignore
- arch-tag: 768d32cb-e15a-4cc1-b7bf-62c00ee12250
-@end ignore
diff --git a/doc/emacs/fixit.texi b/doc/emacs/fixit.texi
index 4b1f592be6..ad18de451c 100644
--- a/doc/emacs/fixit.texi
+++ b/doc/emacs/fixit.texi
@@ -423,7 +423,3 @@ that it only checks words in comments and string constants. This
feature is useful for editing programs. Type @kbd{M-x
flyspell-prog-mode} to enable or disable this mode in the current
buffer.
-
-@ignore
- arch-tag: 3359a443-96ed-448f-9f05-c8111ba8eac0
-@end ignore
diff --git a/doc/emacs/fortran-xtra.texi b/doc/emacs/fortran-xtra.texi
index fdf6733d26..e44913a4e4 100644
--- a/doc/emacs/fortran-xtra.texi
+++ b/doc/emacs/fortran-xtra.texi
@@ -582,7 +582,3 @@ to @samp{continue}, provided Abbrev mode is enabled.@refill
Type @samp{;?} or @samp{;C-h} to display a list of all the built-in
Fortran abbrevs and what they stand for.
-
-@ignore
- arch-tag: 23ed7c36-1517-4646-9235-2d5ade5f06f6
-@end ignore
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index dadba9fb95..55111ff53d 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -1439,7 +1439,3 @@ again.
In the console on GNU/Linux, you can use @kbd{M-x gpm-mouse-mode} to
enable terminal mouse support. You must have the gpm package
installed and running on your system in order for this to work.
-
-@ignore
- arch-tag: 7dcf3a31-a43b-45d4-a900-445b10d77e49
-@end ignore
diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi
index d75673c65d..fe19cde5ed 100644
--- a/doc/emacs/glossary.texi
+++ b/doc/emacs/glossary.texi
@@ -1372,7 +1372,3 @@ Yanking means reinserting text previously killed (q.v.@:). It can be
used to undo a mistaken kill, or for copying or moving text. Some
other systems call this ``pasting.'' @xref{Yanking}.
@end table
-
-@ignore
- arch-tag: 0dd53ce1-5f09-4ac2-b13b-cf22b0f28d23
-@end ignore
diff --git a/doc/emacs/gnu.texi b/doc/emacs/gnu.texi
index 7f5bef785f..66046a3105 100644
--- a/doc/emacs/gnu.texi
+++ b/doc/emacs/gnu.texi
@@ -549,7 +549,3 @@ this are bureaucracy and isometric struggles against competition. Free
software will greatly reduce these drains in the area of software
production. We must do this, in order for technical gains in productivity
to translate into less work for us.
-
-@ignore
- arch-tag: 21eb38f8-6fa0-480a-91cd-f3dab7148542
-@end ignore
diff --git a/doc/emacs/gpl.texi b/doc/emacs/gpl.texi
index 7fe5c3ebe4..1908d1f8f9 100644
--- a/doc/emacs/gpl.texi
+++ b/doc/emacs/gpl.texi
@@ -715,7 +715,3 @@ library, you may consider it more useful to permit linking proprietary
applications with the library. If this is what you want to do, use
the GNU Lesser General Public License instead of this License. But
first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
-
-@ignore
- arch-tag: 8b9947e1-c830-4d70-8907-a97e556731ba
-@end ignore
diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi
index 2c701c8a4d..0542a86fbc 100644
--- a/doc/emacs/help.texi
+++ b/doc/emacs/help.texi
@@ -677,7 +677,3 @@ help text for active buffer text using the keyboard. @kbd{C-h .}
character after point, using the echo area. To display help text
automatically whenever it is available on the character after point, set
the variable @code{help-at-pt-display-when-idle} to @code{t}.
-
-@ignore
- arch-tag: 6f33ab62-bc75-4367-8057-fd67cc15c3a1
-@end ignore
diff --git a/doc/emacs/indent.texi b/doc/emacs/indent.texi
index 86e15605ed..5c400e2b08 100644
--- a/doc/emacs/indent.texi
+++ b/doc/emacs/indent.texi
@@ -258,7 +258,3 @@ preserving the columns of all nonblank text. @kbd{M-x tabify} scans the
region for sequences of spaces, and converts sequences of at least two
spaces to tabs if that can be done without changing indentation. @kbd{M-x
untabify} changes all tabs in the region to appropriate numbers of spaces.
-
-@ignore
- arch-tag: acc07de7-ae11-4ee8-a159-cb59c473f0fb
-@end ignore
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index 119b08065e..30ad749d77 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -667,7 +667,3 @@ navigate to each of the words you want in the list, mark it (e.g. with
@kbd{S-M-f}), copy it to the list with @kbd{C-c} or @kbd{M-w}, and
insert a newline after the word in the target list by pressing
@key{RET}.
-
-@ignore
- arch-tag: d8da8f96-0928-449a-816e-ff2d3497866c
-@end ignore
diff --git a/doc/emacs/kmacro.texi b/doc/emacs/kmacro.texi
index 6807c62049..b388d9be28 100644
--- a/doc/emacs/kmacro.texi
+++ b/doc/emacs/kmacro.texi
@@ -569,7 +569,3 @@ including the final @kbd{C-j}), and appends them at the end of the
keyboard macro; it then terminates the step-editing and replaces the
original keyboard macro with the edited macro.
@end itemize
-
-@ignore
- arch-tag: c1b0dd3b-3159-4c08-928f-52e763953e9c
-@end ignore
diff --git a/doc/emacs/m-x.texi b/doc/emacs/m-x.texi
index 3489bed0d8..cbc9a36f55 100644
--- a/doc/emacs/m-x.texi
+++ b/doc/emacs/m-x.texi
@@ -69,7 +69,3 @@ the command is followed by arguments.
@kbd{M-x} works by running the command
@code{execute-extended-command}, which is responsible for reading the
name of another command and invoking it.
-
-@ignore
- arch-tag: b67bff53-9628-4666-b94e-eda972a7ba56
-@end ignore
diff --git a/doc/emacs/major.texi b/doc/emacs/major.texi
index 78fdbf6a96..0e089d9a8a 100644
--- a/doc/emacs/major.texi
+++ b/doc/emacs/major.texi
@@ -235,7 +235,3 @@ However, this does not happen if the buffer contents specify a major
mode, and certain ``special'' major modes do not allow the mode to
change. You can turn off this mode-changing feature by setting
@code{change-major-mode-with-file-name} to @code{nil}.
-
-@ignore
- arch-tag: f2558800-cf32-4839-8acb-7d3b4df2a155
-@end ignore
diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi
index 1b702273be..1a25ef1e13 100644
--- a/doc/emacs/mark.texi
+++ b/doc/emacs/mark.texi
@@ -447,7 +447,3 @@ mode only until the mark is deactivated. One reason you may want to
use them is that some commands operate on the entire buffer instead of
the region when Transient Mark mode is off. Enabling Transient Mark
mode momentarily gives you a way to use these commands on the region.
-
-@ignore
- arch-tag: f35e4d82-911b-4cfc-a3d7-3c87b2abba20
-@end ignore
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index bf7e4469dd..737f0357e8 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -654,7 +654,3 @@ password (@pxref{Killing}). You may type either @key{RET} or
@key{ESC} to submit the password. Any other self-inserting character
key inserts the associated character into the password, and all other
input is ignored.
-
-@ignore
- arch-tag: ba913cfd-b70e-400f-b663-22b2c309227f
-@end ignore
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index c989ded26d..afad6b2c87 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -2883,7 +2883,3 @@ idle.
@ifnottex
@lowersections
@end ifnottex
-
-@ignore
- arch-tag: 8f094220-c0d5-4e9e-af7d-3e0da8187474
-@end ignore
diff --git a/doc/emacs/msdog-xtra.texi b/doc/emacs/msdog-xtra.texi
index 70ed3dde91..48602dfbd3 100644
--- a/doc/emacs/msdog-xtra.texi
+++ b/doc/emacs/msdog-xtra.texi
@@ -613,7 +613,3 @@ MS-DOS supports only some of the possible options you can mention in
the @code{dired-listing-switches} variable. The options that work are
@samp{-A}, @samp{-a}, @samp{-c}, @samp{-i}, @samp{-r}, @samp{-S},
@samp{-s}, @samp{-t}, and @samp{-u}.
-
-@ignore
- arch-tag: 868d50ff-07f8-4a13-a807-dab6f1cdb431
-@end ignore
diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi
index 0c0dcb3f4a..306cb21337 100644
--- a/doc/emacs/msdog.texi
+++ b/doc/emacs/msdog.texi
@@ -90,20 +90,24 @@ Via the Emacs client program, @file{emacsclient.exe} or
programs, and to reuse a running Emacs process for serving editing
jobs required by other programs. @xref{Emacs Server}. The difference
between @file{emacsclient.exe} and @file{emacsclientw.exe} is that the
-former waits for Emacs to signal that the editing job is finished,
-while the latter does not wait. Which one of them to use in each case
-depends on the expectations of the program that needs editing
-services. If the program will use the edited files, it needs to wait
-for Emacs, so you should use @file{emacsclient.exe}. By contrast, if
-the results of editing are not needed by the invoking program, you
-will be better off using @file{emacsclientw.exe}. A notable situation
-where you would want @file{emacsclientw.exe} is when you right-click
-on a file in the Windows Explorer and select ``Open With'' from the
-pop-up menu. Use the @samp{--alternate-editor=} or @samp{-a} options
-if Emacs might not be running (or not running as a server) when
-@command{emacsclient} is invoked---that will always give you an
-editor. When invoked via @command{emacsclient}, Emacs will start in
-the current directory of the program that invoked
+former is a console program, while the latter is a Windows GUI
+program. Both programs wait for Emacs to signal that the editing job
+is finished, before they exit and return control to the program that
+invoked them. Which one of them to use in each case depends on the
+expectations of the program that needs editing services. If that
+program is itself a console (text-mode) program, you should use
+@file{emacsclient.exe}, so that any of its messages and prompts appear
+in the same command window as those of the invoking program. By
+contrast, if the invoking program is a GUI program, you will be better
+off using @file{emacsclientw.exe}, because @file{emacsclient.exe} will
+pop up a command window if it is invoked from a GUI program. A
+notable situation where you would want @file{emacsclientw.exe} is when
+you right-click on a file in the Windows Explorer and select ``Open
+With'' from the pop-up menu. Use the @samp{--alternate-editor=} or
+@samp{-a} options if Emacs might not be running (or not running as a
+server) when @command{emacsclient} is invoked---that will always give
+you an editor. When invoked via @command{emacsclient}, Emacs will
+start in the current directory of the program that invoked
@command{emacsclient}.
@end enumerate
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index 1d4d90c5bf..054b973df9 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -1745,7 +1745,3 @@ highlighted region covering a contiguous range of character positions
may look discontinuous if the region spans reordered text. This is
normal and similar to behavior of other programs that support
bidirectional text.
-
-@ignore
- arch-tag: 310ba60d-31ef-4ce7-91f1-f282dd57b6b3
-@end ignore
diff --git a/doc/emacs/picture-xtra.texi b/doc/emacs/picture-xtra.texi
index 36254ea999..750c78f95a 100644
--- a/doc/emacs/picture-xtra.texi
+++ b/doc/emacs/picture-xtra.texi
@@ -285,7 +285,3 @@ other modes. @kbd{C-c C-y} (@code{picture-yank-rectangle}) inserts
(by overwriting) the rectangle that was most recently killed, while
@kbd{C-c C-x} (@code{picture-yank-rectangle-from-register}) does
likewise for the rectangle found in a specified register.
-
-@ignore
- arch-tag: 10e423ad-d896-42f2-a7e8-7018adeaf8c2
-@end ignore
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index cfe32eab35..f1fc28f211 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -1839,7 +1839,3 @@ starts comments in assembler syntax.
@ifnottex
@include fortran-xtra.texi
@end ifnottex
-
-@ignore
- arch-tag: c7ee7409-40a4-45c7-bfb7-ae7f2c74d0c0
-@end ignore
diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi
index 731e03cde0..39ad0e721a 100644
--- a/doc/emacs/regs.texi
+++ b/doc/emacs/regs.texi
@@ -330,7 +330,3 @@ points to.
Insert in the buffer the @emph{contents} of the file that bookmark
@var{bookmark} points to.
@end table
-
-@ignore
- arch-tag: b00af991-ebc3-4b3a-8e82-a3ac81ff2e64
-@end ignore
diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index 581845fc42..1e8983c267 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -1506,7 +1506,3 @@ include the following in the Rmail inbox list:
@smallexample
maildir://var/spool/mail/in
@end smallexample
-
-@ignore
- arch-tag: 034965f6-38df-47a2-a9f1-b8bc8ab37e23
-@end ignore
diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi
index c3b2e17827..093296b73d 100644
--- a/doc/emacs/screen.texi
+++ b/doc/emacs/screen.texi
@@ -320,7 +320,3 @@ items, and then you can type @key{RET} to select the item.
that item; it is usually the initial of some word in the item's name.
This letter or digit is separated from the item name by @samp{=>}. You
can type the item's letter or digit to select the item.
-
-@ignore
- arch-tag: 104ba40e-d972-4866-a542-a98be94bdf2f
-@end ignore
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index fdf48230fb..c38e07ef3e 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -1378,7 +1378,3 @@ it never deletes lines that are only partially contained in the region
If a match is split across lines, this command keeps all those lines.
@end table
-
-@ignore
- arch-tag: fd9d8e77-66af-491c-b212-d80999613e3e
-@end ignore
diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi
index 8dbe24856a..c1e8d7eac1 100644
--- a/doc/emacs/sending.texi
+++ b/doc/emacs/sending.texi
@@ -713,7 +713,3 @@ buffer, and their commands are different as well.
Similarly, to specify your preferred method for reading mail,
customize the variable @code{read-mail-command}. The default is
@code{rmail} (@pxref{Rmail}).
-
-@ignore
- arch-tag: d8a3dfc3-5d87-45c5-a7f2-69871b8e4fd6
-@end ignore
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 75fcc86563..9435401541 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -2925,7 +2925,3 @@ then inserts the generated table in the proper syntax into the
destination buffer. The default destination buffer is
@code{table.@var{lang}}, where @var{lang} is the language you
specified.
-
-@ignore
- arch-tag: 8db54ed8-2036-49ca-b0df-23811d03dc70
-@end ignore
diff --git a/doc/emacs/vc-xtra.texi b/doc/emacs/vc-xtra.texi
index 89e8428749..b75b4cd656 100644
--- a/doc/emacs/vc-xtra.texi
+++ b/doc/emacs/vc-xtra.texi
@@ -24,7 +24,3 @@ the Emacs Manual}). This chapter describes more advanced VC usage.
@iftex
@include vc1-xtra.texi
@end iftex
-
-@ignore
- arch-tag: 11a18d0e-1baf-49da-8e38-f61195ae4dc3
-@end ignore
diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index 668c3a4168..0ea5b24728 100644
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -787,7 +787,3 @@ only for repositories from hosts that match the pattern.
operations in the variable @code{vc-cvs-global-switches}. These
switches are inserted immediately after the @code{cvs} command, before
the name of the operation to invoke.
-
-@ignore
- arch-tag: 8e8c2a01-ad41-4e61-a89a-60131ad67263
-@end ignore
diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi
index 8071f95743..c919ff5039 100644
--- a/doc/emacs/windows.texi
+++ b/doc/emacs/windows.texi
@@ -397,7 +397,3 @@ windows together. You can also turn it on by customizing the variable
scroll-all-scroll-down-all}, @kbd{M-x scroll-all-page-down-all} and
their corresponding ``up'' equivalents. To make this mode useful,
you should bind these commands to appropriate keys.
-
-@ignore
- arch-tag: 8bea7453-d4b1-49b1-9bf4-cfe4383e1113
-@end ignore
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index 89ec08d820..c890fac2b5 100644
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -1219,7 +1219,3 @@ family. It corresponds to the fifth part of an X font name. It is one of
@noindent
@var{size} is a decimal number that describes the font size in points.
@end ifnottex
-
-@ignore
- arch-tag: 9b6ff773-48b6-41f6-b2f9-f114b8bdd97f
-@end ignore
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 1b7b803b39..4320a29f60 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -449,8 +449,8 @@
;; coding: utf-8
;; End:
- 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.
This file is part of GNU Emacs.
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index 91648e2d66..9dc3197863 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -1,7 +1,8 @@
#### Makefile for the Emacs Lisp Introduction manual
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
-# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+# Free Software Foundation, Inc.
# This file is part of GNU Emacs.
diff --git a/doc/lispintro/doclicense.texi b/doc/lispintro/doclicense.texi
index 1aa7613611..51342e96d6 100644
--- a/doc/lispintro/doclicense.texi
+++ b/doc/lispintro/doclicense.texi
@@ -506,7 +506,3 @@ to permit their use in free software.
@c ispell-local-pdict: "ispell-dict"
@c End:
-@ignore
- arch-tag: 839f250e-4800-4bc9-bd28-49ec7968331f
-@end ignore
-
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 6a51b3f506..40481acec1 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-15 Chong Yidong <cyd@stupidchicken.com>
+
+ * files.texi (Directory Names): Move directory-abbrev-alist doc to
+ Emacs manual.
+
+2011-01-15 Eli Zaretskii <eliz@gnu.org>
+
+ * files.texi (Directory Names): Explain why FROM in
+ directory-abbrev-alist should begin with \`. (Bug#7777)
+
2011-01-11 Stefan Monnier <monnier@iro.umontreal.ca>
* loading.texi (Hooks for Loading): Adjust doc of eval-after-load.
diff --git a/doc/lispref/abbrevs.texi b/doc/lispref/abbrevs.texi
index dcc3c57663..00232b36f4 100644
--- a/doc/lispref/abbrevs.texi
+++ b/doc/lispref/abbrevs.texi
@@ -512,7 +512,3 @@ added to the table.
@end table
-
-@ignore
- arch-tag: 5ffdbe08-2cd4-48ec-a5a8-080f95756eec
-@end ignore
diff --git a/doc/lispref/advice.texi b/doc/lispref/advice.texi
index 544a6a211e..b4a6862e19 100644
--- a/doc/lispref/advice.texi
+++ b/doc/lispref/advice.texi
@@ -777,7 +777,3 @@ pieces of advice is the same. The only difference is that
executed even if some previous piece of advice had an error or a
non-local exit. If any around-advice is protected, then the whole
around-advice onion is protected as a result.
-
-@ignore
- arch-tag: 80c135c2-f1c3-4f8d-aa85-f8d8770d307f
-@end ignore
diff --git a/doc/lispref/anti.texi b/doc/lispref/anti.texi
index 7c5df41158..1fa604edbc 100644
--- a/doc/lispref/anti.texi
+++ b/doc/lispref/anti.texi
@@ -154,7 +154,3 @@ Many variables have been removed, including @code{read-circle},
@code{inhibit-changing-match-data}, @code{wrap-prefix}, and
@code{line-prefix},
@end itemize
-
-@ignore
- arch-tag: 1d0ef137-2bad-430e-ae8e-d820d569b5a6
-@end ignore
diff --git a/doc/lispref/back.texi b/doc/lispref/back.texi
index 373da7b1e1..5bfc57c99d 100644
--- a/doc/lispref/back.texi
+++ b/doc/lispref/back.texi
@@ -36,7 +36,3 @@ are peculiar to Emacs Lisp or relate specifically to editing.
@hfil
@bye
-
-@ignore
- arch-tag: ac7694c8-1f02-4b42-9531-33ba13b179e1
-@end ignore
diff --git a/doc/lispref/backups.texi b/doc/lispref/backups.texi
index e196ce0396..813ddf5037 100644
--- a/doc/lispref/backups.texi
+++ b/doc/lispref/backups.texi
@@ -752,7 +752,3 @@ This normal hook is run by @code{revert-buffer} after inserting
the modified contents---but only if @code{revert-buffer-function} is
@code{nil}.
@end defvar
-
-@ignore
- arch-tag: 295a6321-e5ab-46d5-aef5-0bb4f447a67f
-@end ignore
diff --git a/doc/lispref/buffers.texi b/doc/lispref/buffers.texi
index 64d10fa4a2..9c8072ad6b 100644
--- a/doc/lispref/buffers.texi
+++ b/doc/lispref/buffers.texi
@@ -1,7 +1,8 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002,
-@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+@c Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../../info/buffers
@node Buffers, Windows, Backups and Auto-Saving, Top
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index 29e104c769..6d078713f2 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -3386,7 +3386,3 @@ This normal hook (@pxref{Standard Hooks}) is run when a keyboard
macro terminates, regardless of what caused it to terminate (reaching
the macro end or an error which ended the macro prematurely).
@end defvar
-
-@ignore
- arch-tag: e34944ad-7d5c-4980-be00-36a5fe54d4b1
-@end ignore
diff --git a/doc/lispref/compile.texi b/doc/lispref/compile.texi
index 3b4897336e..562df191da 100644
--- a/doc/lispref/compile.texi
+++ b/doc/lispref/compile.texi
@@ -790,7 +790,3 @@ The @code{silly-loop} function is somewhat more complex:
@end group
@end example
-
-@ignore
- arch-tag: f78e3050-2f0a-4dee-be27-d9979a0a2289
-@end ignore
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index f3da3ccd34..3371773b39 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -1319,7 +1319,3 @@ quit, and the quit happens immediately after the function
@code{ftp-setup-buffer} returns but before the variable @code{process} is
set, the process will not be killed. There is no easy way to fix this bug,
but at least it is very unlikely.
-
-@ignore
- arch-tag: 8abc30d4-4d3a-47f9-b908-e9e971c18c6d
-@end ignore
diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi
index 8ce523dda2..1d68dee4ea 100644
--- a/doc/lispref/customize.texi
+++ b/doc/lispref/customize.texi
@@ -1282,7 +1282,3 @@ the inferior widgets will convert @emph{their} inferior widgets. If
the data structure is itself recursive, this conversion is an infinite
recursion. The @code{lazy} widget prevents the recursion: it convert
its @code{:type} argument only when needed.
-
-@ignore
- arch-tag: d1b8fad3-f48c-4ce4-a402-f73b5ef19bd2
-@end ignore
diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi
index 13ebbabbb9..cc4c280ee4 100644
--- a/doc/lispref/debugging.texi
+++ b/doc/lispref/debugging.texi
@@ -817,7 +817,3 @@ the error.
successfully, then point is located at the end of the form. In this
case, this technique can't localize the error precisely, but can still
show you which function to check.
-
-@ignore
- arch-tag: ddc57378-b0e6-4195-b7b6-43f8777395a7
-@end ignore
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 7c7db8a0eb..34d8106891 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -5954,7 +5954,3 @@ This hook is used for internal purposes: setting up communication with
the window system, and creating the initial window. Users should not
interfere with it.
@end defvar
-
-@ignore
- arch-tag: ffdf5714-7ecf-415b-9023-fbc6b409c2c6
-@end ignore
diff --git a/doc/lispref/doclicense.texi b/doc/lispref/doclicense.texi
index 9adddffba9..0c2d47827a 100644
--- a/doc/lispref/doclicense.texi
+++ b/doc/lispref/doclicense.texi
@@ -508,7 +508,3 @@ to permit their use in free software.
@c Local Variables:
@c ispell-local-pdict: "ispell-dict"
@c End:
-
-@ignore
- arch-tag: 9014cf6e-f3c4-401d-b8da-4fe52723984c
-@end ignore
diff --git a/doc/lispref/edebug.texi b/doc/lispref/edebug.texi
index cd2c128696..18625f1fed 100644
--- a/doc/lispref/edebug.texi
+++ b/doc/lispref/edebug.texi
@@ -1588,7 +1588,3 @@ If non-@code{nil}, an expression to test for at every stop point. If
the result is non-@code{nil}, then break. Errors are ignored.
@xref{Global Break Condition}.
@end defopt
-
-@ignore
- arch-tag: 74842db8-019f-4818-b5a4-b2de878e57fd
-@end ignore
diff --git a/doc/lispref/elisp-covers.texi b/doc/lispref/elisp-covers.texi
index f7d1eaae02..c19cf5c00a 100644
--- a/doc/lispref/elisp-covers.texi
+++ b/doc/lispref/elisp-covers.texi
@@ -251,7 +251,3 @@
@end titlepage
@bye
-
-@ignore
- arch-tag: 02d65d63-3b64-49bc-a5c0-bfd5eabb6c98
-@end ignore
diff --git a/doc/lispref/errors.texi b/doc/lispref/errors.texi
index 1ec1029b96..669739cd01 100644
--- a/doc/lispref/errors.texi
+++ b/doc/lispref/errors.texi
@@ -203,7 +203,3 @@ This is a subcategory of @code{domain-error}.@*
This is a subcategory of @code{domain-error}.@*
@xref{Math Functions}.
@end table
-
-@ignore
- arch-tag: 717c6048-5d9d-4c7d-9a62-df57390b6f19
-@end ignore
diff --git a/doc/lispref/eval.texi b/doc/lispref/eval.texi
index d5d271c1ad..6e3b1e18c1 100644
--- a/doc/lispref/eval.texi
+++ b/doc/lispref/eval.texi
@@ -748,7 +748,3 @@ particular elements, like this:
@end group
@end example
@end defvar
-
-@ignore
- arch-tag: f723a4e0-31b3-453f-8afc-0bf8fd276d57
-@end ignore
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index e2d22033a0..0dd876251a 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -1906,51 +1906,22 @@ Don't try concatenating a slash by hand, as in
because this is not portable. Always use
@code{file-name-as-directory}.
-@cindex directory name abbreviation
- Directory name abbreviations are useful for directories that are
-normally accessed through symbolic links. Sometimes the users recognize
-primarily the link's name as ``the name'' of the directory, and find it
-annoying to see the directory's ``real'' name. If you define the link
-name as an abbreviation for the ``real'' name, Emacs shows users the
-abbreviation instead.
-
-@defopt directory-abbrev-alist
-The variable @code{directory-abbrev-alist} contains an alist of
-abbreviations to use for file directories. Each element has the form
-@code{(@var{from} . @var{to})}, and says to replace @var{from} with
-@var{to} when it appears in a directory name. The @var{from} string is
-actually a regular expression; it ought to always start with @samp{\`}.
-The @var{to} string should be an ordinary absolute directory name. Do
-not use @samp{~} to stand for a home directory in that string. The
-function @code{abbreviate-file-name} performs these substitutions.
-
-You can set this variable in @file{site-init.el} to describe the
-abbreviations appropriate for your site.
-
-Here's an example, from a system on which file system @file{/home/fsf}
-and so on are normally accessed through symbolic links named @file{/fsf}
-and so on.
-
-@example
-(("\\`/home/fsf" . "/fsf")
- ("\\`/home/gp" . "/gp")
- ("\\`/home/gd" . "/gd"))
-@end example
-@end defopt
-
To convert a directory name to its abbreviation, use this
function:
@defun abbreviate-file-name filename
@anchor{Definition of abbreviate-file-name}
-This function applies abbreviations from @code{directory-abbrev-alist}
-to its argument, and also substitutes @samp{~} for the user's home
-directory if the argument names a file in the home directory or one of
-its subdirectories. (If the home directory is a root directory, it is
-not replaced with @samp{~}, because this does not make the result
-shorter on many systems.) You can use it for directory names and for
-file names, because it recognizes abbreviations even as part of the
-name.
+This function returns an abbreviated form of @var{filename}. It
+applies the abbreviations specified in @code{directory-abbrev-alist}
+(@pxref{File Aliases,,File Aliases, emacs, The GNU Emacs Manual}),
+then substitutes @samp{~} for the user's home directory if the
+argument names a file in the home directory or one of its
+subdirectories. If the home directory is a root directory, it is not
+replaced with @samp{~}, because this does not make the result shorter
+on many systems.
+
+You can use this function for directory names and for file names,
+because it recognizes abbreviations even as part of the name.
@end defun
@node File Name Expansion
@@ -3187,7 +3158,3 @@ will produce good, general extensions we can install in Emacs.
names or values---because a program that general is probably difficult
to write, and slow. Instead, choose a set of possible data types that
are reasonably flexible, and not too hard to encode.
-
-@ignore
- arch-tag: 141f74ce-6ae3-40dc-a6c4-ef83fc4ec35c
-@end ignore
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 8318f2c7b7..0d83aadbcd 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -2477,7 +2477,3 @@ The functions @code{x-pixel-width} and @code{x-pixel-height} return the
width and height of an X Window frame, measured in pixels.
@end ignore
-
-@ignore
- arch-tag: 94977df6-3dca-4730-b57b-c6329e9282ba
-@end ignore
diff --git a/doc/lispref/front-cover-1.texi b/doc/lispref/front-cover-1.texi
index 5c9f4351f4..56d0f2b1c2 100644
--- a/doc/lispref/front-cover-1.texi
+++ b/doc/lispref/front-cover-1.texi
@@ -50,7 +50,3 @@
@end titlepage
@bye
-
-@ignore
- arch-tag: 5182b306-c403-4e4f-ba24-e1911bc6da9d
-@end ignore
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 198cc1a1ae..e704f92858 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -1510,7 +1510,3 @@ See @ref{Mapping Functions}.
@item undefined
See @ref{Functions for Key Lookup}.
@end table
-
-@ignore
- arch-tag: 39100cdf-8a55-4898-acba-595db619e8e2
-@end ignore
diff --git a/doc/lispref/gpl.texi b/doc/lispref/gpl.texi
index 163af4627b..244f3330d4 100644
--- a/doc/lispref/gpl.texi
+++ b/doc/lispref/gpl.texi
@@ -721,7 +721,3 @@ library, you may consider it more useful to permit linking proprietary
applications with the library. If this is what you want to do, use
the GNU Lesser General Public License instead of this License. But
first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
-
-@ignore
- arch-tag: d00ac830-e120-41fb-bbc5-7ca3eeaa227f
-@end ignore
diff --git a/doc/lispref/hash.texi b/doc/lispref/hash.texi
index 82c172c753..e1830b2301 100644
--- a/doc/lispref/hash.texi
+++ b/doc/lispref/hash.texi
@@ -355,7 +355,3 @@ This returns the rehash threshold of @var{table}.
@defun hash-table-size table
This returns the current nominal size of @var{table}.
@end defun
-
-@ignore
- arch-tag: 3b5107f9-d2f0-47d5-ad61-3498496bea0e
-@end ignore
diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi
index 941956534c..f010e6176f 100644
--- a/doc/lispref/help.texi
+++ b/doc/lispref/help.texi
@@ -1,7 +1,8 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
-@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+@c Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../../info/help
@node Documentation, Files, Modes, Top
diff --git a/doc/lispref/hooks.texi b/doc/lispref/hooks.texi
index c76634be45..7f371b22a9 100644
--- a/doc/lispref/hooks.texi
+++ b/doc/lispref/hooks.texi
@@ -343,7 +343,3 @@ Manual}.
@item write-region-annotate-functions
@xref{Format Conversion}.
@end table
-
-@ignore
- arch-tag: 55fd0296-d906-4551-b300-979d3846aa88
-@end ignore
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi
index aba8cca80e..cfb83cd659 100644
--- a/doc/lispref/internals.texi
+++ b/doc/lispref/internals.texi
@@ -1400,7 +1400,3 @@ Symbol indicating the type of process: @code{real}, @code{network},
@code{serial}
@end table
-
-@ignore
- arch-tag: 4b2c33bc-d7e4-43f5-bc20-27c0db52a53e
-@end ignore
diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi
index 881ae94223..325799e77a 100644
--- a/doc/lispref/intro.texi
+++ b/doc/lispref/intro.texi
@@ -546,7 +546,3 @@ Friedrich Pukelsheim, Arnold D. Robbins, Raul Rockwell, Jason Rumney,
Per Starb@"ack, Shinichirou Sugou, Kimmo Suominen, Edward Tharp, Bill
Trost, Rickard Westman, Jean White, Eduard Wiebe, Matthew Wilding,
Carl Witty, Dale Worley, Rusty Wright, and David D. Zuhn.
-
-@ignore
- arch-tag: d156593f-82f8-4708-a844-204e48f7f2aa
-@end ignore
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 6f0a953efe..2c1b8aebbb 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -2796,7 +2796,3 @@ menu of Shell mode, after the item @code{break}:
[work] '("Work" . work-command) 'break)
@end example
@end defun
-
-@ignore
- arch-tag: cfb87287-9364-4e46-9e93-6c2f7f6ae794
-@end ignore
diff --git a/doc/lispref/lay-flat.texi b/doc/lispref/lay-flat.texi
index 56e6c47990..53f2c26f5c 100644
--- a/doc/lispref/lay-flat.texi
+++ b/doc/lispref/lay-flat.texi
@@ -42,7 +42,3 @@ pushed or held down.
@end tex
@bye
-
-@ignore
- arch-tag: 9e03a1c7-6f62-4346-85d9-ed5b79386e07
-@end ignore
diff --git a/doc/lispref/lists.texi b/doc/lispref/lists.texi
index 4435af43c8..2cb7647ccc 100644
--- a/doc/lispref/lists.texi
+++ b/doc/lispref/lists.texi
@@ -1888,7 +1888,3 @@ use the ring as a first-in-first-out queue. For example:
(ring-remove fifo)))
@result{} (0 t one t "two")
@end lisp
-
-@ignore
- arch-tag: 31fb8a4e-4aa8-4a74-a206-aa00451394d4
-@end ignore
diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi
index b7f430b88b..5733df87d1 100644
--- a/doc/lispref/loading.texi
+++ b/doc/lispref/loading.texi
@@ -994,7 +994,3 @@ symbol, and the value is a list of forms. The forms are evaluated
when the key matches the absolute true name or feature name of the
library being loaded.
@end defvar
-
-@ignore
- arch-tag: df731f89-0900-4389-a436-9105241b6f7a
-@end ignore
diff --git a/doc/lispref/locals.texi b/doc/lispref/locals.texi
index fff0594947..fed639499c 100644
--- a/doc/lispref/locals.texi
+++ b/doc/lispref/locals.texi
@@ -217,7 +217,3 @@ Used for communication between mouse commands and scroll-bar commands.
@xref{Saving Buffers}.
@end table
-
-@ignore
- arch-tag: 6baae835-b667-4447-91e2-9829ae1cf543
-@end ignore
diff --git a/doc/lispref/macros.texi b/doc/lispref/macros.texi
index a74bcb17a5..2c4e3747b1 100644
--- a/doc/lispref/macros.texi
+++ b/doc/lispref/macros.texi
@@ -732,7 +732,3 @@ indentation is being computed by @kbd{C-M-q}; if the value is a
number, @kbd{C-M-q} need not recalculate indentation for the following
lines until the end of the list.
@end table
-
-@ignore
- arch-tag: d4cce66d-1047-45c3-bfde-db6719d6e82b
-@end ignore
diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi
index 3314ec25c8..3e2172436f 100644
--- a/doc/lispref/markers.texi
+++ b/doc/lispref/markers.texi
@@ -674,7 +674,3 @@ mark is active, and there's a valid region in the buffer. Commands
that operate on the region (instead of on text near point) when
there's an active mark should use this to test whether to do that.
@end defun
-
-@ignore
- arch-tag: b1ba2e7a-a0f3-4c5e-875c-7d8e22d73299
-@end ignore
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 0d907ea653..728f613ed9 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -2202,7 +2202,3 @@ arrives, whichever comes first. If @var{args} is non-@code{nil}, the
actual message is obtained by passing @var{string} and @var{args}
through @code{format}. @xref{Formatting Strings}.
@end defun
-
-@ignore
- arch-tag: bba7f945-9078-477f-a2ce-18818a6e1218
-@end ignore
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 11898894da..7ff8d6724c 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -1921,7 +1921,3 @@ strings in the return value are decoded using
@code{locale-coding-system}. @xref{Locales,,, libc, The GNU Libc Manual},
for more information about locales and locale items.
@end defun
-
-@ignore
- arch-tag: be705bf8-941b-4c35-84fc-ad7d20ddb7cb
-@end ignore
diff --git a/doc/lispref/numbers.texi b/doc/lispref/numbers.texi
index b27d206eb4..360bd44fe0 100644
--- a/doc/lispref/numbers.texi
+++ b/doc/lispref/numbers.texi
@@ -1217,7 +1217,3 @@ On some machines, any integer representable in Lisp may be the result
of @code{random}. On other machines, the result can never be larger
than a certain maximum or less than a certain (negative) minimum.
@end defun
-
-@ignore
- arch-tag: 574e8dd2-d513-4616-9844-c9a27869782e
-@end ignore
diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index 7b9603c336..6cd746e59c 100644
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -2106,7 +2106,3 @@ that for two strings to be equal, they have the same text properties.
@end group
@end example
@end defun
-
-@ignore
- arch-tag: 9711a66e-4749-4265-9e8c-972d55b67096
-@end ignore
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index e5df6d967d..194548d589 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -2237,7 +2237,3 @@ be loaded through it.
This variable is ignored if the given @var{library} is statically
linked into Emacs.
@end defvar
-
-@ignore
- arch-tag: 8378814a-30d7-467c-9615-74a80b9988a7
-@end ignore
diff --git a/doc/lispref/package.texi b/doc/lispref/package.texi
index 138f8d934e..08b181599b 100644
--- a/doc/lispref/package.texi
+++ b/doc/lispref/package.texi
@@ -1,6 +1,6 @@
@c -*-texinfo-*-
@c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 2010
+@c Copyright (C) 2010, 2011
@c Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@setfilename ../../info/package
diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi
index 0b5dcd44dd..1cf09cbcbd 100644
--- a/doc/lispref/positions.texi
+++ b/doc/lispref/positions.texi
@@ -985,7 +985,3 @@ This is the contents of foo@point{}
@end group
@end example
@end defspec
-
-@ignore
- arch-tag: 56e8ff26-4ffe-4832-a141-7e991a2d0f87
-@end ignore
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 00b8f547f9..6e2b0670b1 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -3018,7 +3018,3 @@ Fetching data from this structure:
(bindat-get-field decoded 'item 1 'id)
@result{} "BCDEFG"
@end lisp
-
-@ignore
- arch-tag: ba9da253-e65f-4e7f-b727-08fba0a1df7a
-@end ignore
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index 17dec5c800..908b776a85 100644
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -1831,7 +1831,3 @@ values of the variables @code{sentence-end-double-space}
@code{sentence-end-without-period} and
@code{sentence-end-without-space}.
@end defun
-
-@ignore
- arch-tag: c2573ca2-18aa-4839-93b8-924043ef831f
-@end ignore
diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi
index 81a0c6b952..69253eb912 100644
--- a/doc/lispref/sequences.texi
+++ b/doc/lispref/sequences.texi
@@ -729,7 +729,3 @@ bv
@noindent
These results make sense because the binary codes for control-_ and
control-W are 11111 and 10111, respectively.
-
-@ignore
- arch-tag: fcf1084a-cd29-4adc-9f16-68586935b386
-@end ignore
diff --git a/doc/lispref/streams.texi b/doc/lispref/streams.texi
index 39943372e2..1fa6695bee 100644
--- a/doc/lispref/streams.texi
+++ b/doc/lispref/streams.texi
@@ -837,7 +837,3 @@ variable. The string should hold a @samp{%}-specification to be used
in the C function @code{sprintf}. For further restrictions on what
you can use, see the variable's documentation string.
@end defvar
-
-@ignore
- arch-tag: 07636b8c-c4e3-4735-9e06-2e864320b434
-@end ignore
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi
index bb550346e9..438619ff0d 100644
--- a/doc/lispref/strings.texi
+++ b/doc/lispref/strings.texi
@@ -1142,7 +1142,3 @@ This function makes @var{char} case-invariant, with syntax
This command displays a description of the contents of the current
buffer's case table.
@end deffn
-
-@ignore
- arch-tag: 700b8e95-7aa5-4b52-9eb3-8f2e1ea152b4
-@end ignore
diff --git a/doc/lispref/symbols.texi b/doc/lispref/symbols.texi
index 257a2a4c9a..d2884357d5 100644
--- a/doc/lispref/symbols.texi
+++ b/doc/lispref/symbols.texi
@@ -590,7 +590,3 @@ between a missing property and a property with the value @code{nil}.
The value is actually the tail of @var{plist} whose @code{car} is
@var{property}.
@end defun
-
-@ignore
- arch-tag: 8750b7d2-de4c-4923-809a-d35fc39fd8ce
-@end ignore
diff --git a/doc/lispref/syntax.texi b/doc/lispref/syntax.texi
index 89fa440068..8d91db01ad 100644
--- a/doc/lispref/syntax.texi
+++ b/doc/lispref/syntax.texi
@@ -1192,7 +1192,3 @@ category table. It inserts the descriptions in a buffer, and then
displays that buffer. If @var{buffer-or-name} is non-@code{nil}, it
describes the category table of that buffer instead.
@end deffn
-
-@ignore
- arch-tag: 4d914e96-0283-445c-9233-75d33662908c
-@end ignore
diff --git a/doc/lispref/tindex.pl b/doc/lispref/tindex.pl
index b1c65fcf2c..ce2b54a850 100755
--- a/doc/lispref/tindex.pl
+++ b/doc/lispref/tindex.pl
@@ -123,4 +123,3 @@ foreach $key (keys %removed) {
print " $key\n";
}
-# arch-tag: f8460df6-6bef-4c98-8555-e2c63a88b0fa
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index 8726625afe..634c7da353 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -1115,7 +1115,3 @@ This is the @dfn{footer line}; it appears at the very end of the file.
Its purpose is to enable people to detect truncated versions of the file
from the lack of a footer line.
@end table
-
-@ignore
- arch-tag: 9ea911c2-6b1d-47dd-88b7-0a94e8b27c2e
-@end ignore
diff --git a/doc/lispref/two-volume.make b/doc/lispref/two-volume.make
index edd2305028..3b7a581e51 100644
--- a/doc/lispref/two-volume.make
+++ b/doc/lispref/two-volume.make
@@ -221,4 +221,3 @@ elisp2-init: vol2.texi
# You should have received a copy of the GNU General Public License
# along with this file. If not, see <http://www.gnu.org/licenses/>.
-# arch-tag: 5c258a2e-d4a9-4d0e-b279-fb3a6faa27eb
diff --git a/doc/lispref/two.el b/doc/lispref/two.el
index 339ec299dd..1759d9c293 100644
--- a/doc/lispref/two.el
+++ b/doc/lispref/two.el
@@ -76,5 +76,4 @@ This is for the *Elisp Ref Manual*."
(defun volume-numbers-toc-markup-I () (volume-numbers-toc-markup "I"))
(defun volume-numbers-toc-markup-II () (volume-numbers-toc-markup "II"))
-;; arch-tag: 848955fe-e9cf-45e7-a2f1-570ef156d6a5
;;; two.el ends here
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 2baf389582..b7b5ebb4ce 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1929,7 +1929,3 @@ Attempting to assign them any other value will result in an error:
(setq window-min-height 5.0)
@error{} Wrong type argument: integerp, 5.0
@end example
-
-@ignore
- arch-tag: 5ff62c44-2b51-47bb-99d4-fea5aeec5d3e
-@end ignore
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 77fd44fb16..b2e50dbda0 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -2607,7 +2607,3 @@ frame selected.
Lock fontification function, which will be called whenever parts of a
buffer are (re)fontified because a window was scrolled or its size
changed. @xref{Other Font Lock Variables}.
-
-@ignore
- arch-tag: 3f6c36e8-df49-4986-b757-417feed88be3
-@end ignore
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index ec117affda..48bde6b61b 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -127,4 +127,3 @@
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: 2bd1112e-157f-4884-b0ca-0fb1057972d7
diff --git a/doc/man/ctags.1 b/doc/man/ctags.1
index 9a6505b020..1eab02f214 100644
--- a/doc/man/ctags.1
+++ b/doc/man/ctags.1
@@ -1,3 +1 @@
.so man1/etags.1
-
-.\" arch-tag: 54d4579b-9d66-4ba5-9fda-f01ec83612ad
diff --git a/doc/man/ebrowse.1 b/doc/man/ebrowse.1
index 5481a49780..5afe59d6bc 100644
--- a/doc/man/ebrowse.1
+++ b/doc/man/ebrowse.1
@@ -101,4 +101,3 @@ document into another language, under the above conditions for
modified versions, except that this permission notice may be stated
in a translation approved by the Free Software Foundation.
.
-.\" arch-tag: b771158b-90cb-43a5-b9af-dbc506311817
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 89eafc9ba5..10fcc186fd 100644
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -660,4 +660,3 @@ document into another language, under the above conditions for
modified versions, except that this permission notice may be stated
in a translation approved by the Free Software Foundation.
.
-.\" arch-tag: 04dfd376-b46e-4924-919a-cecc3b257eaa
diff --git a/doc/man/emacsclient.1 b/doc/man/emacsclient.1
index 6af699e036..cae4d76634 100644
--- a/doc/man/emacsclient.1
+++ b/doc/man/emacsclient.1
@@ -94,4 +94,3 @@ for the Debian GNU/Linux system (but may be used by others).
.SH COPYING
This manual page is in the public domain.
-.\" arch-tag: 2b35e723-b197-4073-8752-231bc8b3d3f3
diff --git a/doc/man/etags.1 b/doc/man/etags.1
index 177809d4d7..f6b46add21 100644
--- a/doc/man/etags.1
+++ b/doc/man/etags.1
@@ -284,4 +284,3 @@ document into another language, under the above conditions for
modified versions, except that this permission notice may be stated
in a translation approved by the Free Software Foundation.
-.\" arch-tag: 9534977f-af78-42f0-991d-1df6b6c05573
diff --git a/doc/man/grep-changelog.1 b/doc/man/grep-changelog.1
index 8161b09bcb..45a6abfd57 100644
--- a/doc/man/grep-changelog.1
+++ b/doc/man/grep-changelog.1
@@ -78,4 +78,3 @@ document into another language, under the above conditions for
modified versions, except that this permission notice may be stated
in a translation approved by the Free Software Foundation.
.
-.\" arch-tag: c6df2aea-f3ac-49c7-981b-7b3aae648cda
diff --git a/doc/man/rcs-checkin.1 b/doc/man/rcs-checkin.1
index f50d74dacd..545b128b40 100644
--- a/doc/man/rcs-checkin.1
+++ b/doc/man/rcs-checkin.1
@@ -85,4 +85,3 @@ document into another language, under the above conditions for
modified versions, except that this permission notice may be stated
in a translation approved by the Free Software Foundation.
.
-.\" arch-tag: d903862f-cc72-487c-8fd2-5c63677f325d
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 4ba74539b0..489f55ffaf 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -1,7 +1,8 @@
#### Makefile for documentation other than the Emacs manual.
# Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+# Free Software Foundation, Inc.
# This file is part of GNU Emacs.
diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi
index fdb0bccc29..399840a8a1 100644
--- a/doc/misc/ada-mode.texi
+++ b/doc/misc/ada-mode.texi
@@ -1524,7 +1524,3 @@ autofill the current comment.
@printindex fn
@bye
-
-@ignore
- arch-tag: 68cf0d8a-55cc-4190-a28d-4984fa56ed1e
-@end ignore
diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index 4c2335a8b5..89fc511a78 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -664,7 +664,3 @@ of the expansion possibilities.
@printindex vr
@bye
-
-@ignore
- arch-tag: 54001b27-5ef8-4a9d-a199-905d650fafba
-@end ignore
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index fe7918038e..dcf1b52186 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -1840,7 +1840,3 @@ whether a given D-Bus error is related to them.
@include doclicense.texi
@bye
-
-@ignore
- arch-tag: 2eeec19d-0caf-44e0-a193-329d7f9951d8
-@end ignore
diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index 58fcc9ecbc..9e19f4fe52 100644
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -1258,7 +1258,3 @@ Lawrence R. Dodd
@printindex vr
@bye
-
-@ignore
- arch-tag: 201727aa-9318-4c74-a0d7-4f51c550c4de
-@end ignore
diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi
index a4278f05c6..9c6aaf5ba3 100644
--- a/doc/misc/ebrowse.texi
+++ b/doc/misc/ebrowse.texi
@@ -1451,7 +1451,3 @@ in on with the command @kbd{C-c C-m m}.
@printindex cp
@bye
-
-@ignore
- arch-tag: 52fe78ac-a1c4-48e7-815e-0a31acfad4bf
-@end ignore
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index 267a2bed84..a622111936 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -3791,7 +3791,3 @@ For example, C code uses .o on unix, and Emacs Lisp uses .elc.
@end table
@bye
-
-@ignore
- arch-tag: c9bfdc6e-e6e9-4e87-97f7-d8348342fbf4
-@end ignore
diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi
index ea5d2e478f..da934ef23b 100644
--- a/doc/misc/eieio.texi
+++ b/doc/misc/eieio.texi
@@ -1906,7 +1906,3 @@ Allow method overloading of method-like functions in Emacs.
@contents
@bye
-
-@ignore
- arch-tag: 7225b7c7-2462-4563-99e7-836a20172178
-@end ignore
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index 37eb94b960..43ec07a6e7 100644
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -496,7 +496,3 @@ buffer name is a whitespace.
@bye
@c End:
-
-@ignore
- arch-tag: 7404e246-7d4c-4db4-9332-c1293a455a4f
-@end ignore
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 0d87d7d315..724d92d5d9 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -1061,7 +1061,3 @@ We switched to using git for our version control system.
@printindex cp
@bye
-
-@ignore
- arch-tag: cf9cfaff-fc12-4297-ad15-ec2493002b1e
-@end ignore
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index bea522983a..0f5ff001d4 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -1015,7 +1015,3 @@ Since it keeps the cursor up where the command was invoked.
@printindex ky
@bye
-
-@ignore
- arch-tag: 776409ba-cb15-42b9-b2b6-d2bdc7ebad01
-@end ignore
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index bdbbee1b64..6fc2c265a2 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -749,7 +749,3 @@ It just kills all the active syntax check processes before calling
@printindex cp
@bye
-
-@ignore
- arch-tag: 9f0db077-5598-49ab-90b9-8df9248a63ec
-@end ignore
diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi
index fc809db576..d8ae5bd66e 100644
--- a/doc/misc/forms.texi
+++ b/doc/misc/forms.texi
@@ -976,7 +976,3 @@ Software Foundation. Thanks, Richard!
@printindex cp
@bye
-
-@ignore
- arch-tag: 2ac9810b-aa49-4ea6-8030-d7f1ecd467ed
-@end ignore
diff --git a/doc/misc/gpl.texi b/doc/misc/gpl.texi
index 5b416d3cb4..1908d1f8f9 100644
--- a/doc/misc/gpl.texi
+++ b/doc/misc/gpl.texi
@@ -715,7 +715,3 @@ library, you may consider it more useful to permit linking proprietary
applications with the library. If this is what you want to do, use
the GNU Lesser General Public License instead of this License. But
first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
-
-@ignore
- arch-tag: 0c4a2556-f87e-464f-9b1d-efd920fcaf67
-@end ignore
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index 2e8aa8a028..0e40a3ccd8 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -4295,7 +4295,3 @@ IDLWAVE is @samp{fsf-compat, xemacs-base, mail-lib}.
@printindex cp
@bye
-
-@ignore
- arch-tag: f1d73958-1423-4127-b8aa-f7b953d64492
-@end ignore
diff --git a/doc/misc/info.texi b/doc/misc/info.texi
index 03b9b64a39..e7cd8515ea 100644
--- a/doc/misc/info.texi
+++ b/doc/misc/info.texi
@@ -1508,7 +1508,3 @@ topics discussed in this document.
@printindex cp
@bye
-
-@ignore
- arch-tag: 965c1638-01d6-4156-9227-b10418b9d8e8
-@end ignore
diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi
index dc391bd430..1d4467e026 100644
--- a/doc/misc/mairix-el.texi
+++ b/doc/misc/mairix-el.texi
@@ -349,7 +349,3 @@ And that's it!
@bye
-
-@ignore
- arch-tag: cb81470f-e080-489d-bb67-0d11516b63b9
-@end ignore
diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi
index 5f65522e9b..0c8919ce53 100644
--- a/doc/misc/newsticker.texi
+++ b/doc/misc/newsticker.texi
@@ -315,7 +315,3 @@ Byte-compiling newsticker.el is recommended.
@bye
-
-@ignore
- arch-tag: 7a4de539-117c-4658-b799-0b9e3d0ccec0
-@end ignore
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 330e68603c..6a39dcf122 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -14759,10 +14759,6 @@ org-customize @key{RET}} and then click yourself through the tree.
@bye
-@ignore
- arch-tag: 7893d1Fe-cc57-4d13-b5e5-f494a1CBC7ac
-@end ignore
-
@c Local variables:
@c fill-column: 77
@c indent-tabs-mode: nil
diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi
index 909c0e3507..b9af986c15 100644
--- a/doc/misc/pcl-cvs.texi
+++ b/doc/misc/pcl-cvs.texi
@@ -1432,7 +1432,3 @@ this manual.
@printindex ky
@bye
-
-@ignore
- arch-tag: 5c7178ce-56fa-40b0-abd7-f4a09758b235
-@end ignore
diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi
index 4393399699..e68987618e 100644
--- a/doc/misc/rcirc.texi
+++ b/doc/misc/rcirc.texi
@@ -948,7 +948,3 @@ The real answer, therefore, is a @code{/reconnect} command:
@printindex cp
@bye
-
-@ignore
- arch-tag: 2589e562-3843-4ffc-8c2f-477cbad57c01
-@end ignore
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index 73f40c2559..1e8f0ab298 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -5890,7 +5890,3 @@ released on 7 Jan 1997.
@printindex cp
@bye
-
-@ignore
- arch-tag: 1e055774-0576-4b1b-b47f-550d0961fd43
-@end ignore
diff --git a/doc/misc/remember.texi b/doc/misc/remember.texi
index 58d50c9714..3b817383bf 100644
--- a/doc/misc/remember.texi
+++ b/doc/misc/remember.texi
@@ -403,7 +403,3 @@ consult @ref{Remember, , , org}.
@printindex cp
@bye
-
-@ignore
- arch-tag: 5b980db0-20cc-4167-b845-52dc11d53b9f
-@end ignore
diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi
index b85c9e8871..3ab5fdeb5d 100644
--- a/doc/misc/sc.texi
+++ b/doc/misc/sc.texi
@@ -1941,7 +1941,3 @@ its @var{variable} name.
@end iftex
@printindex vr
@bye
-
-@ignore
- arch-tag: 0521847a-4680-44b6-ae6e-13ce20e18436
-@end ignore
diff --git a/doc/misc/sem-user.texi b/doc/misc/sem-user.texi
index f986c0fd45..ec35b92d61 100644
--- a/doc/misc/sem-user.texi
+++ b/doc/misc/sem-user.texi
@@ -1330,7 +1330,3 @@ To add other kind of decorations on a tag, @code{NAME-highlight} must use
@dfn{semantic-decorate-tag}, and other functions of the semantic
decoration @var{api} found in this library.
@end defun
-
-@ignore
- arch-tag: 760dca58-7119-484e-8237-866cbaf36f79
-@end ignore
diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi
index 87ca122451..352b303e55 100644
--- a/doc/misc/semantic.texi
+++ b/doc/misc/semantic.texi
@@ -622,7 +622,3 @@ Emacs Lisp. It is an LALR parser suitable for complex languages.
@c LocalWords: subsubsection sw sym texi texinfo titlefont titlepage
@c LocalWords: tok TOKEN's toplevel typemodifiers uml unset untar
@c LocalWords: uref usedb var vskip xref yak
-
-@ignore
- arch-tag: cbc6e78c-4ff1-410e-9fc7-936487e39bbf
-@end ignore
diff --git a/doc/misc/ses.texi b/doc/misc/ses.texi
index 94ef50e434..8b08144146 100644
--- a/doc/misc/ses.texi
+++ b/doc/misc/ses.texi
@@ -982,7 +982,3 @@ Jean-Philippe Theberge @email{jphil@@acs.pagesjaunes.fr}
@include doclicense.texi
@bye
-
-@ignore
- arch-tag: 10a4ee1c-7ef4-4c06-8b7a-f975e39f0dec
-@end ignore
diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi
index b59c8ab580..6fd9017d25 100644
--- a/doc/misc/smtpmail.texi
+++ b/doc/misc/smtpmail.texi
@@ -415,7 +415,3 @@ cannot accept mail.
@printindex fn
@bye
-
-@ignore
- arch-tag: 6316abdf-b366-4562-87a2-f37e8f894b6f
-@end ignore
diff --git a/doc/misc/speedbar.texi b/doc/misc/speedbar.texi
index 88c293e67f..7aa2a72023 100644
--- a/doc/misc/speedbar.texi
+++ b/doc/misc/speedbar.texi
@@ -1253,7 +1253,3 @@ Two good values are @code{nil} and @code{statictag}.
@bye
@c LocalWords: speedbar's xref slowbar kbd subsubsection
@c LocalWords: keybindings
-
-@ignore
- arch-tag: e1fc85f0-1eeb-489f-a8d4-a2bfe711fa02
-@end ignore
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index 62ed9d87b5..d78d557392 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -1194,7 +1194,3 @@ Connect directly.
@printindex cp
@bye
-
-@ignore
- arch-tag: c96be356-7e2d-4196-bcda-b13246c5c3f0
-@end ignore
diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi
index c136070a41..5020756a92 100644
--- a/doc/misc/vip.texi
+++ b/doc/misc/vip.texi
@@ -1946,7 +1946,3 @@ file.
@printindex cp
@bye
-
-@ignore
- arch-tag: 7c5d17b9-1d21-4261-a88a-b9fdbbf1020b
-@end ignore
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index 1b087559e8..27e99bff12 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -4558,7 +4558,3 @@ zapman@@cc.gatech.edu (Jason Zapman II),
@printindex cp
@bye
-
-@ignore
- arch-tag: f53e866a-15cf-4b1e-aead-77da9da1e864
-@end ignore
diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi
index 275da073a9..21b0011687 100644
--- a/doc/misc/widget.texi
+++ b/doc/misc/widget.texi
@@ -1829,7 +1829,3 @@ variables, and widgets described in this manual.
@printindex cp
@bye
-
-@ignore
- arch-tag: 2b427731-4c61-4e72-85de-5ccec9c623f0
-@end ignore
diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi
index acec1e8def..3324ba612d 100644
--- a/doc/misc/woman.texi
+++ b/doc/misc/woman.texi
@@ -1430,7 +1430,3 @@ Eli Zaretskii, @email{eliz@@is.elta.co.il}
@printindex cp
@bye
-
-@ignore
- arch-tag: a1a6b715-396f-4378-9b94-0b2ca0aa5028
-@end ignore
diff --git a/etc/.gitignore b/etc/.gitignore
index 83bad1103f..618d09438f 100644
--- a/etc/.gitignore
+++ b/etc/.gitignore
@@ -1,5 +1,3 @@
DOC
DOC-*
icons/
-
-# arch-tag: 617d2467-cd9f-42e2-9115-88e1d44e66e6
diff --git a/etc/DEBUG b/etc/DEBUG
index 2604b39331..91819f90c4 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -755,4 +755,3 @@ mode: outline
paragraph-separate: "[ ]*$"
end:
-;;; arch-tag: fbf32980-e35d-481f-8e4c-a2eca2586e6b
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index 127bb71098..e97c00baca 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -1343,4 +1343,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: 2b21b387-6cdc-4192-889c-6743cfffdcb1
diff --git a/etc/MACHINES b/etc/MACHINES
index 6fa0e53336..2101ccddd4 100644
--- a/etc/MACHINES
+++ b/etc/MACHINES
@@ -403,4 +403,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: 7d2e93c7-e982-40ec-9055-3cd064042473
diff --git a/etc/MAILINGLISTS b/etc/MAILINGLISTS
index da6b147e1d..91395d2b46 100644
--- a/etc/MAILINGLISTS
+++ b/etc/MAILINGLISTS
@@ -332,4 +332,3 @@ Free Software Foundation, Inc.
included in all copies or substantial portions of the file.
-arch-tag: 6e42bba8-7532-4a23-8486-99dbc5770a8e
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index e70f994ee6..6322723894 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -3253,4 +3253,3 @@ mode: outline
paragraph-separate: "[ ]*$"
end:
-arch-tag: f6696cad-eb1b-4c5f-8057-4e3954a98d18
diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF
index 95ebedbcac..c98df7edca 100644
--- a/etc/MORE.STUFF
+++ b/etc/MORE.STUFF
@@ -277,4 +277,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: c1d4e7c8-db85-44e6-909e-659e2b20fefa
diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17
index 3086363906..30916132a1 100644
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
@@ -2531,4 +2531,3 @@ Local variables:
mode: text
end:
-arch-tag: 33dc900d-9c58-473b-87c9-b6d7222323ea
diff --git a/etc/NEWS.18 b/etc/NEWS.18
index bbee5562ac..3792b2eba8 100644
--- a/etc/NEWS.18
+++ b/etc/NEWS.18
@@ -1621,4 +1621,3 @@ Local variables:
mode: text
end:
-arch-tag: 8fed393b-c9c5-47d1-afbb-c0e7a135094a
diff --git a/etc/NEWS.19 b/etc/NEWS.19
index 347d281260..e8c5b23a00 100644
--- a/etc/NEWS.19
+++ b/etc/NEWS.19
@@ -6542,4 +6542,3 @@ mode: outline
paragraph-separate: "[ ]*$"
end:
-arch-tag: 944be39b-afe8-4217-9977-c745b68a7ca2
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index cba39763c3..9cff9ec626 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -5607,4 +5607,3 @@ mode: outline
paragraph-separate: "[ ]*$"
end:
-arch-tag: 1aca9dfa-2ac4-4d14-bebf-0007cee12793
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index fd47f89699..0f1ee3e2f5 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -21,6 +21,10 @@ with a prefix argument or by typing C-u C-h C-n.
* Changes in Emacs 23.3
++++
+** The last-resort backup file `%backup%~' is now written to
+`user-emacs-directory', instead of the user's home directory.
+
* Editing Changes in Emacs 23.3
@@ -2514,4 +2518,3 @@ mode: outline
paragraph-separate: "[ ]*$"
end:
-arch-tag: e759449d-88b3-4de4-9900-3a6c3dfa23e2
diff --git a/etc/NEXTSTEP b/etc/NEXTSTEP
index d55bd65d88..19c9dcc1eb 100644
--- a/etc/NEXTSTEP
+++ b/etc/NEXTSTEP
@@ -1,4 +1,4 @@
-Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
See the end of the file for license conditions.
This file contains information about GNU Emacs on "Nextstep" platforms.
diff --git a/etc/SERVICE b/etc/SERVICE
index 3a057b98af..61a4b950ce 100644
--- a/etc/SERVICE
+++ b/etc/SERVICE
@@ -7,4 +7,3 @@ GNU software, including GNU Emacs, for a fee or in some cases at no
charge.
-arch-tag: 1253ce32-1cbd-428a-ac36-70ed9e3999fc
diff --git a/etc/TODO b/etc/TODO
index c8adca54c4..abe1b3432f 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -1,7 +1,7 @@
Emacs TODO List -*-outline-*-
-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.
See the end of the file for license conditions.
diff --git a/etc/edt-user.el b/etc/edt-user.el
index 5abf74b580..97f84b32d3 100644
--- a/etc/edt-user.el
+++ b/etc/edt-user.el
@@ -166,5 +166,4 @@ G-C-\\: Split Window
(interactive)
(describe-function 'edt-user-keypad-help))
-;; arch-tag: a4671ca7-34b7-43a5-844c-2b2a89134ff4
;;; edt-user.el ends here
diff --git a/etc/emacs-buffer.gdb b/etc/emacs-buffer.gdb
index ed9169a8e3..330bdb27d3 100644
--- a/etc/emacs-buffer.gdb
+++ b/etc/emacs-buffer.gdb
@@ -268,4 +268,3 @@ end
# mode: gdb-script
# end:
-# arch-tag: 02087f62-2663-4868-977a-1fbb2fc2e7ef
diff --git a/etc/emacs.py b/etc/emacs.py
index 964c1f17f4..24004b321f 100644
--- a/etc/emacs.py
+++ b/etc/emacs.py
@@ -8,4 +8,3 @@ if sys.version_info[0] == 3:
else:
from emacs2 import *
-# arch-tag: 894b5227-638f-45fd-8567-0417d5c35900
diff --git a/etc/emacs2.py b/etc/emacs2.py
index 02c1274729..d3b15ddfd7 100644
--- a/etc/emacs2.py
+++ b/etc/emacs2.py
@@ -234,4 +234,3 @@ Assumes that MODULE.py and MODULE.pyc are in the same directory."""
# print '_emacs_ok' # ready for input and can call continuation
-# arch-tag: d90408f3-90e2-4de4-99c2-6eb9c7b9ca46
diff --git a/etc/emacs3.py b/etc/emacs3.py
index 778be1c01f..3978eec491 100644
--- a/etc/emacs3.py
+++ b/etc/emacs3.py
@@ -232,4 +232,3 @@ Assumes that MODULE.py and MODULE.pyc are in the same directory."""
# print '_emacs_ok' # ready for input and can call continuation
-# arch-tag: 37bfed38-5f4a-4027-a2bf-d5f41819dd89
diff --git a/etc/images/checked.xpm b/etc/images/checked.xpm
index e015259483..95a0c78087 100644
--- a/etc/images/checked.xpm
+++ b/etc/images/checked.xpm
@@ -1,5 +1,5 @@
/* XPM */
-/* Copyright (C) 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2010, 2011 Free Software Foundation, Inc.
*
* Author: Chong Yidong <cyd@stupidchicken.com>
*
diff --git a/etc/images/mpc/ffwd.xpm b/etc/images/mpc/ffwd.xpm
index c0b5a91a73..0d1ca0136e 100644
--- a/etc/images/mpc/ffwd.xpm
+++ b/etc/images/mpc/ffwd.xpm
@@ -31,4 +31,3 @@ static char * ffwd_xpm[] = {
" .ooooooooooooooooooooo ",
" "};
-/* arch-tag: 9b0fa3cf-1e36-4c20-ac68-948c2ae86b62 */
diff --git a/etc/images/mpc/next.xpm b/etc/images/mpc/next.xpm
index e94b6388a4..af712de14f 100644
--- a/etc/images/mpc/next.xpm
+++ b/etc/images/mpc/next.xpm
@@ -31,4 +31,3 @@ static char * next_xpm[] = {
" .ooooooooooooooooooooo ",
" "};
-/* arch-tag: 69a2ee4e-e71f-432d-b17b-ac8055dacc93 */
diff --git a/etc/images/mpc/pause.xpm b/etc/images/mpc/pause.xpm
index 5a5d977c6f..e02c3b80a2 100644
--- a/etc/images/mpc/pause.xpm
+++ b/etc/images/mpc/pause.xpm
@@ -30,4 +30,3 @@ static char * pause_xpm[] = {
" .ooooooooooooooooooooo ",
" "};
-/* arch-tag: 3fe99afb-7dfd-49dd-b5b3-d8eedf14b362 */
diff --git a/etc/images/mpc/play.xpm b/etc/images/mpc/play.xpm
index 0f9b6905d7..9a6e289b36 100644
--- a/etc/images/mpc/play.xpm
+++ b/etc/images/mpc/play.xpm
@@ -31,4 +31,3 @@ static char * play_xpm[] = {
" .ooooooooooooooooooooo ",
" "};
-/* arch-tag: 318eb8de-b126-48bd-818b-bb293df74ec8 */
diff --git a/etc/images/mpc/prev.xpm b/etc/images/mpc/prev.xpm
index aa973706fe..6fe140de9d 100644
--- a/etc/images/mpc/prev.xpm
+++ b/etc/images/mpc/prev.xpm
@@ -30,4 +30,3 @@ static char * prev_xpm[] = {
" .ooooooooooooooooooooo ",
" "};
-/* arch-tag: 284e0591-6e14-4dae-9cc3-c722fa0b9099 */
diff --git a/etc/images/mpc/rewind.xpm b/etc/images/mpc/rewind.xpm
index 3dd285a9a7..af94c0fed2 100644
--- a/etc/images/mpc/rewind.xpm
+++ b/etc/images/mpc/rewind.xpm
@@ -30,4 +30,3 @@ static char * rewind_xpm[] = {
" .ooooooooooooooooooooo ",
" "};
-/* arch-tag: 2bdb6c7f-8ddb-4110-b8ee-ffc3f06d1aa9 */
diff --git a/etc/images/mpc/stop.xpm b/etc/images/mpc/stop.xpm
index d5e4d517d0..446c462e12 100644
--- a/etc/images/mpc/stop.xpm
+++ b/etc/images/mpc/stop.xpm
@@ -30,4 +30,3 @@ static char * stop_xpm[] = {
" .ooooooooooooooooooooo ",
" "};
-/* arch-tag: 184ad626-ea69-40ae-839a-f5b5929ebb93 */
diff --git a/etc/images/unchecked.xpm b/etc/images/unchecked.xpm
index ad01824d22..1b91b7f7c9 100644
--- a/etc/images/unchecked.xpm
+++ b/etc/images/unchecked.xpm
@@ -1,5 +1,5 @@
/* XPM */
-/* Copyright (C) 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2010, 2011 Free Software Foundation, Inc.
*
* Author: Chong Yidong <cyd@stupidchicken.com>
*
diff --git a/etc/nxml/00000-0007F.el b/etc/nxml/00000-0007F.el
index da2be08938..4fc236b53f 100644
--- a/etc/nxml/00000-0007F.el
+++ b/etc/nxml/00000-0007F.el
@@ -96,4 +96,3 @@
("TILDE" #x007E)
))
-;; arch-tag: c46ffe15-ef5b-46f6-837f-d6bcf56db5b2
diff --git a/etc/nxml/00080-000FF.el b/etc/nxml/00080-000FF.el
index 61fd8e0a4b..8f00b10afa 100644
--- a/etc/nxml/00080-000FF.el
+++ b/etc/nxml/00080-000FF.el
@@ -97,4 +97,3 @@
("LATIN SMALL LETTER Y WITH DIAERESIS" #x00FF)
))
-;; arch-tag: f7ca0f06-9eb7-4b7a-b014-795af10f23ac
diff --git a/etc/nxml/00100-0017F.el b/etc/nxml/00100-0017F.el
index 5c15ef91df..f78006615e 100644
--- a/etc/nxml/00100-0017F.el
+++ b/etc/nxml/00100-0017F.el
@@ -129,4 +129,3 @@
("LATIN SMALL LETTER LONG S" #x017F)
))
-;; arch-tag: 30e6e868-1bc7-4cd1-b75b-7fd4354cf8fe
diff --git a/etc/nxml/00180-0024F.el b/etc/nxml/00180-0024F.el
index 5bc138be49..fe99beef0e 100644
--- a/etc/nxml/00180-0024F.el
+++ b/etc/nxml/00180-0024F.el
@@ -180,4 +180,3 @@
("LATIN SMALL LETTER Y WITH MACRON" #x0233)
))
-;; arch-tag: d2a4e7e0-0d3a-4a29-994e-f5d0ed62cea2
diff --git a/etc/nxml/00250-002AF.el b/etc/nxml/00250-002AF.el
index 62ffa630e9..63c474c63d 100644
--- a/etc/nxml/00250-002AF.el
+++ b/etc/nxml/00250-002AF.el
@@ -95,4 +95,3 @@
("LATIN LETTER BIDENTAL PERCUSSIVE" #x02AD)
))
-;; arch-tag: edc50b43-a94e-48db-91c5-0f9ea113c93c
diff --git a/etc/nxml/002B0-002FF.el b/etc/nxml/002B0-002FF.el
index e94f58cc18..e72339e44a 100644
--- a/etc/nxml/002B0-002FF.el
+++ b/etc/nxml/002B0-002FF.el
@@ -64,4 +64,3 @@
("MODIFIER LETTER DOUBLE APOSTROPHE" #x02EE)
))
-;; arch-tag: 5fa09061-850e-4bbe-ad44-54c57a81a461
diff --git a/etc/nxml/00300-0036F.el b/etc/nxml/00300-0036F.el
index d82fa0b2fa..09024c92ec 100644
--- a/etc/nxml/00300-0036F.el
+++ b/etc/nxml/00300-0036F.el
@@ -97,4 +97,3 @@
("COMBINING LATIN SMALL LETTER X" #x036F)
))
-;; arch-tag: a3b46b6e-38fc-4043-b7f5-92a3591e2e47
diff --git a/etc/nxml/00370-003FF.el b/etc/nxml/00370-003FF.el
index 780653b57b..e127ea137a 100644
--- a/etc/nxml/00370-003FF.el
+++ b/etc/nxml/00370-003FF.el
@@ -116,4 +116,3 @@
("GREEK REVERSED LUNATE EPSILON SYMBOL" #x03F6)
))
-;; arch-tag: 033e25a2-6f9c-4e9f-b517-be5ed38829af
diff --git a/etc/nxml/00400-004FF.el b/etc/nxml/00400-004FF.el
index b041b437cc..e93109913a 100644
--- a/etc/nxml/00400-004FF.el
+++ b/etc/nxml/00400-004FF.el
@@ -247,4 +247,3 @@
("CYRILLIC SMALL LETTER YERU WITH DIAERESIS" #x04F9)
))
-;; arch-tag: 9cd8c4dd-3386-4c0a-b1dd-984efa12d958
diff --git a/etc/nxml/00500-0052F.el b/etc/nxml/00500-0052F.el
index c098c89824..ba1587a43c 100644
--- a/etc/nxml/00500-0052F.el
+++ b/etc/nxml/00500-0052F.el
@@ -17,4 +17,3 @@
("CYRILLIC SMALL LETTER KOMI TJE" #x050F)
))
-;; arch-tag: 3ae51d36-3921-4ec5-b6be-3e9c895be9f3
diff --git a/etc/nxml/00530-0058F.el b/etc/nxml/00530-0058F.el
index 2b530a5afe..83b5bdff20 100644
--- a/etc/nxml/00530-0058F.el
+++ b/etc/nxml/00530-0058F.el
@@ -87,4 +87,3 @@
("ARMENIAN HYPHEN" #x058A)
))
-;; arch-tag: 7b3d705a-d060-42de-a918-ff39dbe5d276
diff --git a/etc/nxml/00590-005FF.el b/etc/nxml/00590-005FF.el
index 764022948e..ecd07b12cf 100644
--- a/etc/nxml/00590-005FF.el
+++ b/etc/nxml/00590-005FF.el
@@ -83,4 +83,3 @@
("HEBREW PUNCTUATION GERSHAYIM" #x05F4)
))
-;; arch-tag: 262da37d-1065-4dfd-b6e4-a8259a780caf
diff --git a/etc/nxml/00600-006FF.el b/etc/nxml/00600-006FF.el
index c489a70dca..a3b997f755 100644
--- a/etc/nxml/00600-006FF.el
+++ b/etc/nxml/00600-006FF.el
@@ -209,4 +209,3 @@
("ARABIC SIGN SINDHI POSTPOSITION MEN" #x06FE)
))
-;; arch-tag: b20189fa-7cdb-4544-a41c-f4e0477d9e5e
diff --git a/etc/nxml/00700-0074F.el b/etc/nxml/00700-0074F.el
index 549387afe8..16bc7ae7f5 100644
--- a/etc/nxml/00700-0074F.el
+++ b/etc/nxml/00700-0074F.el
@@ -72,4 +72,3 @@
("SYRIAC BARREKH" #x074A)
))
-;; arch-tag: c008122a-484e-4253-b18f-eb215dbd1ecf
diff --git a/etc/nxml/00780-007BF.el b/etc/nxml/00780-007BF.el
index cda860cfeb..8d54fd5c22 100644
--- a/etc/nxml/00780-007BF.el
+++ b/etc/nxml/00780-007BF.el
@@ -51,4 +51,3 @@
("THAANA LETTER NAA" #x07B1)
))
-;; arch-tag: e1974c30-0604-412a-af3d-b6e688e0586c
diff --git a/etc/nxml/00900-0097F.el b/etc/nxml/00900-0097F.el
index 49bcde867d..3a253f67b1 100644
--- a/etc/nxml/00900-0097F.el
+++ b/etc/nxml/00900-0097F.el
@@ -105,4 +105,3 @@
("DEVANAGARI ABBREVIATION SIGN" #x0970)
))
-;; arch-tag: c9d655c5-2ec9-4b64-a13f-d4fafe0cbad7
diff --git a/etc/nxml/00980-009FF.el b/etc/nxml/00980-009FF.el
index 6c6b01e1a8..5cec96eceb 100644
--- a/etc/nxml/00980-009FF.el
+++ b/etc/nxml/00980-009FF.el
@@ -90,4 +90,3 @@
("BENGALI ISSHAR" #x09FA)
))
-;; arch-tag: 66599f15-c2b7-436a-9737-577d4f041abd
diff --git a/etc/nxml/00A00-00A7F.el b/etc/nxml/00A00-00A7F.el
index 98f221a201..be542ff3eb 100644
--- a/etc/nxml/00A00-00A7F.el
+++ b/etc/nxml/00A00-00A7F.el
@@ -76,4 +76,3 @@
("GURMUKHI EK ONKAR" #x0A74)
))
-;; arch-tag: e97fe67c-79ac-48f8-8274-22436eec2f01
diff --git a/etc/nxml/00A80-00AFF.el b/etc/nxml/00A80-00AFF.el
index 3bbd427271..029c3519f6 100644
--- a/etc/nxml/00A80-00AFF.el
+++ b/etc/nxml/00A80-00AFF.el
@@ -79,4 +79,3 @@
("GUJARATI DIGIT NINE" #x0AEF)
))
-;; arch-tag: e11e63c9-1fd7-496b-be1b-4c2bb32bdec4
diff --git a/etc/nxml/00B00-00B7F.el b/etc/nxml/00B00-00B7F.el
index 033d73b41d..5f32f4fb2c 100644
--- a/etc/nxml/00B00-00B7F.el
+++ b/etc/nxml/00B00-00B7F.el
@@ -80,4 +80,3 @@
("ORIYA ISSHAR" #x0B70)
))
-;; arch-tag: 3a780627-f875-450a-b482-6b25f28c6f96
diff --git a/etc/nxml/00B80-00BFF.el b/etc/nxml/00B80-00BFF.el
index ab5a34b821..5258288dbe 100644
--- a/etc/nxml/00B80-00BFF.el
+++ b/etc/nxml/00B80-00BFF.el
@@ -62,4 +62,3 @@
("TAMIL NUMBER ONE THOUSAND" #x0BF2)
))
-;; arch-tag: a299bfdc-4543-4405-a4a8-202d178a578f
diff --git a/etc/nxml/00C00-00C7F.el b/etc/nxml/00C00-00C7F.el
index 8ccda98c60..f33086da5d 100644
--- a/etc/nxml/00C00-00C7F.el
+++ b/etc/nxml/00C00-00C7F.el
@@ -81,4 +81,3 @@
("TELUGU DIGIT NINE" #x0C6F)
))
-;; arch-tag: 12e2c9a2-fa3a-400a-9adb-82a89e0a639b
diff --git a/etc/nxml/00C80-00CFF.el b/etc/nxml/00C80-00CFF.el
index d5251fafba..459b253275 100644
--- a/etc/nxml/00C80-00CFF.el
+++ b/etc/nxml/00C80-00CFF.el
@@ -81,4 +81,3 @@
("KANNADA DIGIT NINE" #x0CEF)
))
-;; arch-tag: b17f4e00-00e9-4e2f-8343-37b9c8e29e89
diff --git a/etc/nxml/00D00-00D7F.el b/etc/nxml/00D00-00D7F.el
index 5d4a728ae0..80001ac8f7 100644
--- a/etc/nxml/00D00-00D7F.el
+++ b/etc/nxml/00D00-00D7F.el
@@ -79,4 +79,3 @@
("MALAYALAM DIGIT NINE" #x0D6F)
))
-;; arch-tag: 1bce48f6-bdc3-4ebc-b1f0-1563c32e4926
diff --git a/etc/nxml/00D80-00DFF.el b/etc/nxml/00D80-00DFF.el
index 3130b1f919..98068983f2 100644
--- a/etc/nxml/00D80-00DFF.el
+++ b/etc/nxml/00D80-00DFF.el
@@ -81,4 +81,3 @@
("SINHALA PUNCTUATION KUNDDALIYA" #x0DF4)
))
-;; arch-tag: 3dfac4e1-97f5-433a-bd47-8cd364b09075
diff --git a/etc/nxml/00E00-00E7F.el b/etc/nxml/00E00-00E7F.el
index f265a069a5..992ee9a46d 100644
--- a/etc/nxml/00E00-00E7F.el
+++ b/etc/nxml/00E00-00E7F.el
@@ -88,4 +88,3 @@
("THAI CHARACTER KHOMUT" #x0E5B)
))
-;; arch-tag: cf6119b0-ae54-4871-a8a7-10621d74cba8
diff --git a/etc/nxml/00E80-00EFF.el b/etc/nxml/00E80-00EFF.el
index 29be3e172a..8ef8a304d1 100644
--- a/etc/nxml/00E80-00EFF.el
+++ b/etc/nxml/00E80-00EFF.el
@@ -66,4 +66,3 @@
("LAO HO MO" #x0EDD)
))
-;; arch-tag: 36f98cb4-447d-49e0-bae5-03a026adabac
diff --git a/etc/nxml/00F00-00FFF.el b/etc/nxml/00F00-00FFF.el
index 8e8be125cc..adc8fecfa9 100644
--- a/etc/nxml/00F00-00FFF.el
+++ b/etc/nxml/00F00-00FFF.el
@@ -194,4 +194,3 @@
("TIBETAN SIGN RDEL NAG GSUM" #x0FCF)
))
-;; arch-tag: 547e48c6-3ded-4dc7-be69-4ee324c604c3
diff --git a/etc/nxml/01000-0109F.el b/etc/nxml/01000-0109F.el
index 56ab64648b..56c6310415 100644
--- a/etc/nxml/01000-0109F.el
+++ b/etc/nxml/01000-0109F.el
@@ -79,4 +79,3 @@
("MYANMAR VOWEL SIGN VOCALIC LL" #x1059)
))
-;; arch-tag: 030cc7f0-2667-4504-ae9c-39c00fe146ff
diff --git a/etc/nxml/010A0-010FF.el b/etc/nxml/010A0-010FF.el
index d8c3ab7d31..e7b5916f1c 100644
--- a/etc/nxml/010A0-010FF.el
+++ b/etc/nxml/010A0-010FF.el
@@ -81,4 +81,3 @@
("GEORGIAN PARAGRAPH SEPARATOR" #x10FB)
))
-;; arch-tag: 8f5a9cec-8b71-48c9-af68-c8c51112e5b2
diff --git a/etc/nxml/01100-011FF.el b/etc/nxml/01100-011FF.el
index 7e7619d3e8..dbaa621275 100644
--- a/etc/nxml/01100-011FF.el
+++ b/etc/nxml/01100-011FF.el
@@ -241,4 +241,3 @@
("HANGUL JONGSEONG YEORINHIEUH" #x11F9)
))
-;; arch-tag: e631a2ad-7d7e-4a86-89f0-e6e4f7db5f39
diff --git a/etc/nxml/01200-0137F.el b/etc/nxml/01200-0137F.el
index 26a5a3a383..c7ac4e0ddb 100644
--- a/etc/nxml/01200-0137F.el
+++ b/etc/nxml/01200-0137F.el
@@ -346,4 +346,3 @@
("ETHIOPIC NUMBER TEN THOUSAND" #x137C)
))
-;; arch-tag: a34092f4-c605-4c01-b619-222a1241853d
diff --git a/etc/nxml/013A0-013FF.el b/etc/nxml/013A0-013FF.el
index e3fd669671..392b4f267a 100644
--- a/etc/nxml/013A0-013FF.el
+++ b/etc/nxml/013A0-013FF.el
@@ -86,4 +86,3 @@
("CHEROKEE LETTER YV" #x13F4)
))
-;; arch-tag: 42d669f3-aa0a-4b38-8f60-c1bf05b0d8be
diff --git a/etc/nxml/01400-0167F.el b/etc/nxml/01400-0167F.el
index 1dfce26a85..996d5b46d6 100644
--- a/etc/nxml/01400-0167F.el
+++ b/etc/nxml/01400-0167F.el
@@ -631,4 +631,3 @@
("CANADIAN SYLLABICS NNGAA" #x1676)
))
-;; arch-tag: 7b4079a4-dea1-44b9-9699-8826b5919ad7
diff --git a/etc/nxml/01680-0169F.el b/etc/nxml/01680-0169F.el
index 52c4cce879..ef59332874 100644
--- a/etc/nxml/01680-0169F.el
+++ b/etc/nxml/01680-0169F.el
@@ -30,4 +30,3 @@
("OGHAM REVERSED FEATHER MARK" #x169C)
))
-;; arch-tag: db8ea8fc-61b4-4f83-97f5-d2a952b9d8b6
diff --git a/etc/nxml/016A0-016FF.el b/etc/nxml/016A0-016FF.el
index 81f1df77c2..b194a0ca0d 100644
--- a/etc/nxml/016A0-016FF.el
+++ b/etc/nxml/016A0-016FF.el
@@ -82,4 +82,3 @@
("RUNIC BELGTHOR SYMBOL" #x16F0)
))
-;; arch-tag: e21b5eb5-adb4-44fa-a453-995bf3c7fdc5
diff --git a/etc/nxml/01700-0171F.el b/etc/nxml/01700-0171F.el
index 06df5066a6..2b1238c814 100644
--- a/etc/nxml/01700-0171F.el
+++ b/etc/nxml/01700-0171F.el
@@ -21,4 +21,3 @@
("TAGALOG SIGN VIRAMA" #x1714)
))
-;; arch-tag: f30d4825-3942-4534-8671-5fcd71df44ba
diff --git a/etc/nxml/01720-0173F.el b/etc/nxml/01720-0173F.el
index a7530051ce..7fb9c228b5 100644
--- a/etc/nxml/01720-0173F.el
+++ b/etc/nxml/01720-0173F.el
@@ -24,4 +24,3 @@
("PHILIPPINE DOUBLE PUNCTUATION" #x1736)
))
-;; arch-tag: d577c8e1-70e3-4afc-82f4-b61e4cf0b603
diff --git a/etc/nxml/01740-0175F.el b/etc/nxml/01740-0175F.el
index 4043bcc317..26f8f6ed7d 100644
--- a/etc/nxml/01740-0175F.el
+++ b/etc/nxml/01740-0175F.el
@@ -21,4 +21,3 @@
("BUHID VOWEL SIGN U" #x1753)
))
-;; arch-tag: a30b6352-4c93-4908-a5df-0172b643ae23
diff --git a/etc/nxml/01760-0177F.el b/etc/nxml/01760-0177F.el
index d6bb109d8d..2097b4f52e 100644
--- a/etc/nxml/01760-0177F.el
+++ b/etc/nxml/01760-0177F.el
@@ -19,4 +19,3 @@
("TAGBANWA VOWEL SIGN U" #x1773)
))
-;; arch-tag: 7ec84a4f-8077-400f-9b1a-f31b6d75fb65
diff --git a/etc/nxml/01780-017FF.el b/etc/nxml/01780-017FF.el
index 182440e5eb..762fd463d3 100644
--- a/etc/nxml/01780-017FF.el
+++ b/etc/nxml/01780-017FF.el
@@ -104,4 +104,3 @@
("KHMER DIGIT NINE" #x17E9)
))
-;; arch-tag: 2d03b253-c5f2-4595-b346-36e3b87df51c
diff --git a/etc/nxml/01800-018AF.el b/etc/nxml/01800-018AF.el
index a24ec715bc..b3701d4596 100644
--- a/etc/nxml/01800-018AF.el
+++ b/etc/nxml/01800-018AF.el
@@ -156,4 +156,3 @@
("MONGOLIAN LETTER ALI GALI DAGALGA" #x18A9)
))
-;; arch-tag: 36134d5c-514f-4042-b104-97688d5194b4
diff --git a/etc/nxml/01E00-01EFF.el b/etc/nxml/01E00-01EFF.el
index fed5cf3ca7..2f86f03995 100644
--- a/etc/nxml/01E00-01EFF.el
+++ b/etc/nxml/01E00-01EFF.el
@@ -247,4 +247,3 @@
("LATIN SMALL LETTER Y WITH TILDE" #x1EF9)
))
-;; arch-tag: 67862606-3d2a-4063-b666-45ccd6edff6b
diff --git a/etc/nxml/01F00-01FFF.el b/etc/nxml/01F00-01FFF.el
index 5da301f019..64e5f26c46 100644
--- a/etc/nxml/01F00-01FFF.el
+++ b/etc/nxml/01F00-01FFF.el
@@ -234,4 +234,3 @@
("GREEK DASIA" #x1FFE)
))
-;; arch-tag: ace2193e-e5be-4800-898e-efad7ba5d6da
diff --git a/etc/nxml/02000-0206F.el b/etc/nxml/02000-0206F.el
index 0a367cb1e1..36dedde38e 100644
--- a/etc/nxml/02000-0206F.el
+++ b/etc/nxml/02000-0206F.el
@@ -96,4 +96,3 @@
("NOMINAL DIGIT SHAPES" #x206F)
))
-;; arch-tag: 9208787e-c528-416d-a9b1-7261c9cde84e
diff --git a/etc/nxml/02070-0209F.el b/etc/nxml/02070-0209F.el
index aad7f331cc..e7c3f215ce 100644
--- a/etc/nxml/02070-0209F.el
+++ b/etc/nxml/02070-0209F.el
@@ -30,4 +30,3 @@
("SUBSCRIPT RIGHT PARENTHESIS" #x208E)
))
-;; arch-tag: 59e357e5-c021-440d-a923-921b485dcbb8
diff --git a/etc/nxml/020A0-020CF.el b/etc/nxml/020A0-020CF.el
index 98f334752b..a1df8bc204 100644
--- a/etc/nxml/020A0-020CF.el
+++ b/etc/nxml/020A0-020CF.el
@@ -19,4 +19,3 @@
("PESO SIGN" #x20B1)
))
-;; arch-tag: 2f9ece37-0ae6-4a82-b12e-dc10ac58e6ce
diff --git a/etc/nxml/020D0-020FF.el b/etc/nxml/020D0-020FF.el
index c2626c6f36..7dcc145e84 100644
--- a/etc/nxml/020D0-020FF.el
+++ b/etc/nxml/020D0-020FF.el
@@ -28,4 +28,3 @@
("COMBINING LEFTWARDS ARROW OVERLAY" #x20EA)
))
-;; arch-tag: 4b1f7ef0-287b-49a6-a9f2-910752aac517
diff --git a/etc/nxml/02100-0214F.el b/etc/nxml/02100-0214F.el
index 1c499c0c02..df92477cf6 100644
--- a/etc/nxml/02100-0214F.el
+++ b/etc/nxml/02100-0214F.el
@@ -75,4 +75,3 @@
("TURNED AMPERSAND" #x214B)
))
-;; arch-tag: 4233f761-f78d-4854-a019-2409f78514fa
diff --git a/etc/nxml/02150-0218F.el b/etc/nxml/02150-0218F.el
index ac2e7067fd..e4b7bcbac7 100644
--- a/etc/nxml/02150-0218F.el
+++ b/etc/nxml/02150-0218F.el
@@ -50,4 +50,3 @@
("ROMAN NUMERAL REVERSED ONE HUNDRED" #x2183)
))
-;; arch-tag: 9931b436-670d-471f-8214-f4c4454ae841
diff --git a/etc/nxml/02190-021FF.el b/etc/nxml/02190-021FF.el
index 4a2851a955..e8b6861b07 100644
--- a/etc/nxml/02190-021FF.el
+++ b/etc/nxml/02190-021FF.el
@@ -113,4 +113,3 @@
("LEFT RIGHT OPEN-HEADED ARROW" #x21FF)
))
-;; arch-tag: de5679de-82b6-4d64-9b7c-79c35e12521d
diff --git a/etc/nxml/02200-022FF.el b/etc/nxml/02200-022FF.el
index be8278341d..2889a1c956 100644
--- a/etc/nxml/02200-022FF.el
+++ b/etc/nxml/02200-022FF.el
@@ -257,4 +257,3 @@
("Z NOTATION BAG MEMBERSHIP" #x22FF)
))
-;; arch-tag: 12911bcf-5cc6-4b8a-9f0e-48c0b6f85566
diff --git a/etc/nxml/02300-023FF.el b/etc/nxml/02300-023FF.el
index 58526bd98e..2e7cd88ca6 100644
--- a/etc/nxml/02300-023FF.el
+++ b/etc/nxml/02300-023FF.el
@@ -208,4 +208,3 @@
("RETURN SYMBOL" #x23CE)
))
-;; arch-tag: ee70bee5-f22f-4c0e-bed6-2606b27d94cf
diff --git a/etc/nxml/02400-0243F.el b/etc/nxml/02400-0243F.el
index ff6bdce848..798a795c0c 100644
--- a/etc/nxml/02400-0243F.el
+++ b/etc/nxml/02400-0243F.el
@@ -40,4 +40,3 @@
("SYMBOL FOR SUBSTITUTE FORM TWO" #x2426)
))
-;; arch-tag: efc349c9-065d-4033-b261-7cb961c54072
diff --git a/etc/nxml/02440-0245F.el b/etc/nxml/02440-0245F.el
index 3a484cec29..019d6baecc 100644
--- a/etc/nxml/02440-0245F.el
+++ b/etc/nxml/02440-0245F.el
@@ -12,4 +12,3 @@
("OCR DOUBLE BACKSLASH" #x244A)
))
-;; arch-tag: e532db31-38fd-4eee-8e47-974316fb6dd5
diff --git a/etc/nxml/02460-024FF.el b/etc/nxml/02460-024FF.el
index 4cbea4a5f6..736ff0b937 100644
--- a/etc/nxml/02460-024FF.el
+++ b/etc/nxml/02460-024FF.el
@@ -160,4 +160,3 @@
("DOUBLE CIRCLED NUMBER TEN" #x24FE)
))
-;; arch-tag: 2ec7ede5-ce9d-48b5-a725-dd3f177060f4
diff --git a/etc/nxml/02500-0257F.el b/etc/nxml/02500-0257F.el
index 97e63df862..a8cc739c28 100644
--- a/etc/nxml/02500-0257F.el
+++ b/etc/nxml/02500-0257F.el
@@ -129,4 +129,3 @@
("BOX DRAWINGS HEAVY UP AND LIGHT DOWN" #x257F)
))
-;; arch-tag: 6870ad7c-84cf-42a0-82ce-f6863da1c7ad
diff --git a/etc/nxml/02580-0259F.el b/etc/nxml/02580-0259F.el
index bc4d6a12bf..0c7220971f 100644
--- a/etc/nxml/02580-0259F.el
+++ b/etc/nxml/02580-0259F.el
@@ -33,4 +33,3 @@
("QUADRANT UPPER RIGHT AND LOWER LEFT AND LOWER RIGHT" #x259F)
))
-;; arch-tag: 51c971a7-cd90-42a5-bf18-dd9683bcab41
diff --git a/etc/nxml/025A0-025FF.el b/etc/nxml/025A0-025FF.el
index 47284d4a12..b9fbe6f95d 100644
--- a/etc/nxml/025A0-025FF.el
+++ b/etc/nxml/025A0-025FF.el
@@ -97,4 +97,3 @@
("LOWER RIGHT TRIANGLE" #x25FF)
))
-;; arch-tag: ac97acd5-57a6-4521-bee4-8c2d0a9bd06a
diff --git a/etc/nxml/02600-026FF.el b/etc/nxml/02600-026FF.el
index c0d0a065ae..72ae5c3772 100644
--- a/etc/nxml/02600-026FF.el
+++ b/etc/nxml/02600-026FF.el
@@ -134,4 +134,3 @@
("BLACK CIRCLE WITH TWO WHITE DOTS" #x2689)
))
-;; arch-tag: b976b52e-eefc-4aa3-b96c-7f4998429f77
diff --git a/etc/nxml/02700-027BF.el b/etc/nxml/02700-027BF.el
index 4759925587..5ca5d8fe4f 100644
--- a/etc/nxml/02700-027BF.el
+++ b/etc/nxml/02700-027BF.el
@@ -175,4 +175,3 @@
("OPEN-OUTLINED RIGHTWARDS ARROW" #x27BE)
))
-;; arch-tag: 183adc05-e931-4f1b-8a89-abd760a8fcd5
diff --git a/etc/nxml/027C0-027EF.el b/etc/nxml/027C0-027EF.el
index e0171576a5..04e9d5c048 100644
--- a/etc/nxml/027C0-027EF.el
+++ b/etc/nxml/027C0-027EF.el
@@ -29,4 +29,3 @@
("MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET" #x27EB)
))
-;; arch-tag: f66b9857-6560-4ad9-9adb-1f3b5fb079de
diff --git a/etc/nxml/027F0-027FF.el b/etc/nxml/027F0-027FF.el
index 5da2bc2a22..dce4f7f867 100644
--- a/etc/nxml/027F0-027FF.el
+++ b/etc/nxml/027F0-027FF.el
@@ -17,4 +17,3 @@
("LONG RIGHTWARDS SQUIGGLE ARROW" #x27FF)
))
-;; arch-tag: 64623112-13d2-4bd6-8768-5508e3a7f8a9
diff --git a/etc/nxml/02800-028FF.el b/etc/nxml/02800-028FF.el
index d936481aca..efcf879669 100644
--- a/etc/nxml/02800-028FF.el
+++ b/etc/nxml/02800-028FF.el
@@ -257,4 +257,3 @@
("BRAILLE PATTERN DOTS-12345678" #x28FF)
))
-;; arch-tag: 461f6d3c-a4fb-404c-a107-ec8afd212bd2
diff --git a/etc/nxml/02900-0297F.el b/etc/nxml/02900-0297F.el
index d1c217b0df..bf8c2002c8 100644
--- a/etc/nxml/02900-0297F.el
+++ b/etc/nxml/02900-0297F.el
@@ -129,4 +129,3 @@
("DOWN FISH TAIL" #x297F)
))
-;; arch-tag: 57fdeec3-1003-4f3e-ac93-1d698f6eacd8
diff --git a/etc/nxml/02980-029FF.el b/etc/nxml/02980-029FF.el
index 11197e31c9..9751a03c36 100644
--- a/etc/nxml/02980-029FF.el
+++ b/etc/nxml/02980-029FF.el
@@ -129,4 +129,3 @@
("MINY" #x29FF)
))
-;; arch-tag: 4ae3dcff-8f56-4f7e-b9f3-07108e543969
diff --git a/etc/nxml/02A00-02AFF.el b/etc/nxml/02A00-02AFF.el
index 3cdaa5d295..6e7cdf2e64 100644
--- a/etc/nxml/02A00-02AFF.el
+++ b/etc/nxml/02A00-02AFF.el
@@ -257,4 +257,3 @@
("N-ARY WHITE VERTICAL BAR" #x2AFF)
))
-;; arch-tag: 672a8fbf-fb4a-4862-8b8e-2379b799484c
diff --git a/etc/nxml/02E80-02EFF.el b/etc/nxml/02E80-02EFF.el
index deb81105ea..aca68f2027 100644
--- a/etc/nxml/02E80-02EFF.el
+++ b/etc/nxml/02E80-02EFF.el
@@ -116,4 +116,3 @@
("CJK RADICAL C-SIMPLIFIED TURTLE" #x2EF3)
))
-;; arch-tag: 59a2c3dd-63ee-4cba-b427-1e8eb782634f
diff --git a/etc/nxml/02F00-02FDF.el b/etc/nxml/02F00-02FDF.el
index 1a2448aa84..63ad5b758b 100644
--- a/etc/nxml/02F00-02FDF.el
+++ b/etc/nxml/02F00-02FDF.el
@@ -215,4 +215,3 @@
("KANGXI RADICAL FLUTE" #x2FD5)
))
-;; arch-tag: e7210935-b74b-4a42-88c6-de146c755742
diff --git a/etc/nxml/02FF0-02FFF.el b/etc/nxml/02FF0-02FFF.el
index f94bd1fe31..fc1eafb11e 100644
--- a/etc/nxml/02FF0-02FFF.el
+++ b/etc/nxml/02FF0-02FFF.el
@@ -13,4 +13,3 @@
("IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID" #x2FFB)
))
-;; arch-tag: dd6d1436-4620-4994-8da5-9140a8a6ec5b
diff --git a/etc/nxml/03000-0303F.el b/etc/nxml/03000-0303F.el
index 997795f31d..a2f6435cdf 100644
--- a/etc/nxml/03000-0303F.el
+++ b/etc/nxml/03000-0303F.el
@@ -65,4 +65,3 @@
("IDEOGRAPHIC HALF FILL SPACE" #x303F)
))
-;; arch-tag: 05689acc-1d48-4a36-9b60-75d5abf8a065
diff --git a/etc/nxml/03040-0309F.el b/etc/nxml/03040-0309F.el
index 18cdaa0827..2484d11b95 100644
--- a/etc/nxml/03040-0309F.el
+++ b/etc/nxml/03040-0309F.el
@@ -94,4 +94,3 @@
("HIRAGANA DIGRAPH YORI" #x309F)
))
-;; arch-tag: dc96b2bf-74f6-4885-adbb-4a81bd2884be
diff --git a/etc/nxml/030A0-030FF.el b/etc/nxml/030A0-030FF.el
index 2407060527..4507ed4083 100644
--- a/etc/nxml/030A0-030FF.el
+++ b/etc/nxml/030A0-030FF.el
@@ -97,4 +97,3 @@
("KATAKANA DIGRAPH KOTO" #x30FF)
))
-;; arch-tag: 58c48b02-037a-43f3-b225-9e9bf37a7fbd
diff --git a/etc/nxml/03100-0312F.el b/etc/nxml/03100-0312F.el
index f7fa151bb6..6ab50b1dbb 100644
--- a/etc/nxml/03100-0312F.el
+++ b/etc/nxml/03100-0312F.el
@@ -41,4 +41,3 @@
("BOPOMOFO LETTER GN" #x312C)
))
-;; arch-tag: 0aeb6bb4-ac93-4014-a836-eb793636a168
diff --git a/etc/nxml/03130-0318F.el b/etc/nxml/03130-0318F.el
index 8bf3334371..3aabfb76cf 100644
--- a/etc/nxml/03130-0318F.el
+++ b/etc/nxml/03130-0318F.el
@@ -95,4 +95,3 @@
("HANGUL LETTER ARAEAE" #x318E)
))
-;; arch-tag: 3ea3aa1e-8551-433b-8506-9591ed150673
diff --git a/etc/nxml/03190-0319F.el b/etc/nxml/03190-0319F.el
index 1fe8f164c6..6dce50e469 100644
--- a/etc/nxml/03190-0319F.el
+++ b/etc/nxml/03190-0319F.el
@@ -17,4 +17,3 @@
("IDEOGRAPHIC ANNOTATION MAN MARK" #x319F)
))
-;; arch-tag: e25f7331-0993-4daf-a193-0fe56332f9fa
diff --git a/etc/nxml/031A0-031BF.el b/etc/nxml/031A0-031BF.el
index 0119b7e78d..54d2f54b80 100644
--- a/etc/nxml/031A0-031BF.el
+++ b/etc/nxml/031A0-031BF.el
@@ -25,4 +25,3 @@
("BOPOMOFO FINAL LETTER H" #x31B7)
))
-;; arch-tag: 1821baca-d463-4e8e-bf3d-97a35af58fd4
diff --git a/etc/nxml/031F0-031FF.el b/etc/nxml/031F0-031FF.el
index 125d12d30f..d447c3b0be 100644
--- a/etc/nxml/031F0-031FF.el
+++ b/etc/nxml/031F0-031FF.el
@@ -17,4 +17,3 @@
("KATAKANA LETTER SMALL RO" #x31FF)
))
-;; arch-tag: 090acfb7-1a46-4b05-bebb-573bbc0d8a82
diff --git a/etc/nxml/03200-032FF.el b/etc/nxml/03200-032FF.el
index 8b8c84e07d..eb05e9d2f3 100644
--- a/etc/nxml/03200-032FF.el
+++ b/etc/nxml/03200-032FF.el
@@ -233,4 +233,3 @@
("CIRCLED KATAKANA WO" #x32FE)
))
-;; arch-tag: 56d35bfa-c41b-4779-be54-3999fbe11265
diff --git a/etc/nxml/03300-033FF.el b/etc/nxml/03300-033FF.el
index acf2b6899b..7d5820e08a 100644
--- a/etc/nxml/03300-033FF.el
+++ b/etc/nxml/03300-033FF.el
@@ -250,4 +250,3 @@
("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY-ONE" #x33FE)
))
-;; arch-tag: 818090a1-7854-485f-80bc-97e89f733e75
diff --git a/etc/nxml/03400-04DBF.el b/etc/nxml/03400-04DBF.el
index 45d69119e8..6bae106687 100644
--- a/etc/nxml/03400-04DBF.el
+++ b/etc/nxml/03400-04DBF.el
@@ -1,4 +1,3 @@
(nxml-define-char-name-set 'cjk-unified-ideographs-extension-a
'())
-;; arch-tag: 571a41a5-7cc5-47c4-b98c-e98a415723bb
diff --git a/etc/nxml/0A000-0A48F.el b/etc/nxml/0A000-0A48F.el
index 9c54d94e55..e797cf13b0 100644
--- a/etc/nxml/0A000-0A48F.el
+++ b/etc/nxml/0A000-0A48F.el
@@ -1166,4 +1166,3 @@
("YI SYLLABLE YYR" #xA48C)
))
-;; arch-tag: 4c900a8b-cd84-4c41-86f4-dcb47efac01b
diff --git a/etc/nxml/0A490-0A4CF.el b/etc/nxml/0A490-0A4CF.el
index 57e731ed12..3052371a12 100644
--- a/etc/nxml/0A490-0A4CF.el
+++ b/etc/nxml/0A490-0A4CF.el
@@ -56,4 +56,3 @@
("YI RADICAL KE" #xA4C6)
))
-;; arch-tag: 2c93cdf1-e6f2-4a91-a798-3e1d7c094cf4
diff --git a/etc/nxml/0FB00-0FB4F.el b/etc/nxml/0FB00-0FB4F.el
index 52d47dd746..20b19e19ff 100644
--- a/etc/nxml/0FB00-0FB4F.el
+++ b/etc/nxml/0FB00-0FB4F.el
@@ -59,4 +59,3 @@
("HEBREW LIGATURE ALEF LAMED" #xFB4F)
))
-;; arch-tag: 06519b44-408f-43f4-89e6-3e5c1d2afe4d
diff --git a/etc/nxml/0FB50-0FDFF.el b/etc/nxml/0FB50-0FDFF.el
index 87b83cfff0..9feea5e918 100644
--- a/etc/nxml/0FB50-0FDFF.el
+++ b/etc/nxml/0FB50-0FDFF.el
@@ -595,4 +595,3 @@
("RIAL SIGN" #xFDFC)
))
-;; arch-tag: 1fbfd997-096a-43c8-88a1-9d438ddabb57
diff --git a/etc/nxml/0FE00-0FE0F.el b/etc/nxml/0FE00-0FE0F.el
index 187b58d4e6..04d855e560 100644
--- a/etc/nxml/0FE00-0FE0F.el
+++ b/etc/nxml/0FE00-0FE0F.el
@@ -17,4 +17,3 @@
("VARIATION SELECTOR-16" #xFE0F)
))
-;; arch-tag: 591c3457-10c0-4036-8bfb-6cccd23f44dd
diff --git a/etc/nxml/0FE20-0FE2F.el b/etc/nxml/0FE20-0FE2F.el
index 358dccd061..f2c9ae8a72 100644
--- a/etc/nxml/0FE20-0FE2F.el
+++ b/etc/nxml/0FE20-0FE2F.el
@@ -5,4 +5,3 @@
("COMBINING DOUBLE TILDE RIGHT HALF" #xFE23)
))
-;; arch-tag: de291a34-737a-4bbb-8d97-94f878921d05
diff --git a/etc/nxml/0FE30-0FE4F.el b/etc/nxml/0FE30-0FE4F.el
index b7fe8c00d6..cef6a39c83 100644
--- a/etc/nxml/0FE30-0FE4F.el
+++ b/etc/nxml/0FE30-0FE4F.el
@@ -31,4 +31,3 @@
("WAVY LOW LINE" #xFE4F)
))
-;; arch-tag: 6d8f4c10-304f-4d0b-b830-1e37a8386015
diff --git a/etc/nxml/0FE50-0FE6F.el b/etc/nxml/0FE50-0FE6F.el
index 966d5a21c4..eda9e89630 100644
--- a/etc/nxml/0FE50-0FE6F.el
+++ b/etc/nxml/0FE50-0FE6F.el
@@ -27,4 +27,3 @@
("SMALL COMMERCIAL AT" #xFE6B)
))
-;; arch-tag: 4facf8e4-cea2-4194-bc17-f0959c358f7f
diff --git a/etc/nxml/0FE70-0FEFF.el b/etc/nxml/0FE70-0FEFF.el
index 07b03dadc7..4de14be73c 100644
--- a/etc/nxml/0FE70-0FEFF.el
+++ b/etc/nxml/0FE70-0FEFF.el
@@ -142,4 +142,3 @@
("ZERO WIDTH NO-BREAK SPACE" #xFEFF)
))
-;; arch-tag: cdc72129-3cd8-4568-8366-c0deee767c17
diff --git a/etc/nxml/0FF00-0FFEF.el b/etc/nxml/0FF00-0FFEF.el
index fb8dd897f1..a2134af9ac 100644
--- a/etc/nxml/0FF00-0FFEF.el
+++ b/etc/nxml/0FF00-0FFEF.el
@@ -226,4 +226,3 @@
("HALFWIDTH WHITE CIRCLE" #xFFEE)
))
-;; arch-tag: 8af7a95d-6e71-47da-9679-b516b6e2f01a
diff --git a/etc/nxml/0FFF0-0FFFF.el b/etc/nxml/0FFF0-0FFFF.el
index 392312be01..e7366549d5 100644
--- a/etc/nxml/0FFF0-0FFFF.el
+++ b/etc/nxml/0FFF0-0FFFF.el
@@ -6,4 +6,3 @@
("REPLACEMENT CHARACTER" #xFFFD)
))
-;; arch-tag: 0bef6e81-4857-4032-a18a-18784233cc81
diff --git a/etc/nxml/10300-1032F.el b/etc/nxml/10300-1032F.el
index 95d2600552..cf394b58ee 100644
--- a/etc/nxml/10300-1032F.el
+++ b/etc/nxml/10300-1032F.el
@@ -36,4 +36,3 @@
("OLD ITALIC NUMERAL FIFTY" #x10323)
))
-;; arch-tag: 823cbcc4-a815-4f82-a1e9-348c2f5d237e
diff --git a/etc/nxml/10330-1034F.el b/etc/nxml/10330-1034F.el
index edd9de4050..9c6dfb6ead 100644
--- a/etc/nxml/10330-1034F.el
+++ b/etc/nxml/10330-1034F.el
@@ -28,4 +28,3 @@
("GOTHIC LETTER NINE HUNDRED" #x1034A)
))
-;; arch-tag: 29caddb6-76f0-44bc-83f9-6cef55c20600
diff --git a/etc/nxml/10400-1044F.el b/etc/nxml/10400-1044F.el
index a26005a395..8aea9e3d72 100644
--- a/etc/nxml/10400-1044F.el
+++ b/etc/nxml/10400-1044F.el
@@ -77,4 +77,3 @@
("DESERET SMALL LETTER ENG" #x1044D)
))
-;; arch-tag: 0fbf6586-41cf-41b2-88e9-d113db5d933e
diff --git a/etc/nxml/1D000-1D0FF.el b/etc/nxml/1D000-1D0FF.el
index 1c76fd0eff..5d2eb237be 100644
--- a/etc/nxml/1D000-1D0FF.el
+++ b/etc/nxml/1D000-1D0FF.el
@@ -247,4 +247,3 @@
("BYZANTINE MUSICAL SYMBOL GORGON NEO KATO" #x1D0F5)
))
-;; arch-tag: 2b360fc3-2760-43c9-9d3e-2ef3fd8452b5
diff --git a/etc/nxml/1D100-1D1FF.el b/etc/nxml/1D100-1D1FF.el
index 1bfbf2608d..9c71f5ca78 100644
--- a/etc/nxml/1D100-1D1FF.el
+++ b/etc/nxml/1D100-1D1FF.el
@@ -220,4 +220,3 @@
("MUSICAL SYMBOL PES SUBPUNCTIS" #x1D1DD)
))
-;; arch-tag: 4e6bd082-bedb-46a2-81be-06f86fbb74f4
diff --git a/etc/nxml/1D400-1D7FF.el b/etc/nxml/1D400-1D7FF.el
index f702765c55..5d4f159300 100644
--- a/etc/nxml/1D400-1D7FF.el
+++ b/etc/nxml/1D400-1D7FF.el
@@ -992,4 +992,3 @@
("MATHEMATICAL MONOSPACE DIGIT NINE" #x1D7FF)
))
-;; arch-tag: af730f58-d05e-4cd5-8a94-f914444a5351
diff --git a/etc/nxml/E0000-E007F.el b/etc/nxml/E0000-E007F.el
index 1f4da35df2..db1d8ad9a3 100644
--- a/etc/nxml/E0000-E007F.el
+++ b/etc/nxml/E0000-E007F.el
@@ -98,4 +98,3 @@
("CANCEL TAG" #xE007F)
))
-;; arch-tag: e79cd51a-999f-4f8c-8f11-a5eeb5c2de4c
diff --git a/etc/nxml/test-invalid.xml b/etc/nxml/test-invalid.xml
index 87a0031f8e..bdf6a2cb7e 100644
--- a/etc/nxml/test-invalid.xml
+++ b/etc/nxml/test-invalid.xml
@@ -6,6 +6,3 @@
<p>This XHTML document is <span class="#foo">invalid</span>.</p>
</body>
</html>
-
-<!-- arch-tag: 8127c8be-d617-46f5-bdf2-c9159a417c38
- (do not change this comment) -->
diff --git a/etc/nxml/test-valid.xml b/etc/nxml/test-valid.xml
index c11380a0e4..56a12800fa 100644
--- a/etc/nxml/test-valid.xml
+++ b/etc/nxml/test-valid.xml
@@ -6,6 +6,3 @@
<p>This is a valid, albeit boring, XHTML document.</p>
</body>
</html>
-
-<!-- arch-tag: 6f7701be-ec51-48d0-bb63-38ed564718d6
- (do not change this comment) -->
diff --git a/etc/refcards/pdflayout.sty b/etc/refcards/pdflayout.sty
index eb3ba849bd..74ff8f1ed3 100644
--- a/etc/refcards/pdflayout.sty
+++ b/etc/refcards/pdflayout.sty
@@ -41,7 +41,3 @@
\else
\def\pdflayout=(#1#2){}
\fi
-
-% archtag: 63c938a5-cc78-4964-962d-603c90d34afc
-
-% arch-tag: 3464d27c-1439-473a-bc47-a7c501e8c156
diff --git a/etc/schema/schemas.xml b/etc/schema/schemas.xml
index d5de5e35dc..594d5ce696 100644
--- a/etc/schema/schemas.xml
+++ b/etc/schema/schemas.xml
@@ -56,6 +56,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. -->
<typeId id="DocBook" uri="docbook.rnc"/>
<typeId id="RDF" uri="rdfxml.rnc"/>
</locatingRules>
-
-<!-- arch-tag: 1fde96fa-b401-4033-8514-c4990b1e18a5
- (do not change this comment) -->
diff --git a/etc/ses-example.ses b/etc/ses-example.ses
index 99539d786a..0bdb2097d4 100644
--- a/etc/ses-example.ses
+++ b/etc/ses-example.ses
@@ -223,4 +223,3 @@ Sales summary - Acme fundraising
;;; You should have received a copy of the GNU General Public License
;;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-;;; arch-tag: 4fcb0843-e3f9-4270-b8fb-998129190765
diff --git a/etc/themes/tsdh-dark-theme.el b/etc/themes/tsdh-dark-theme.el
index cc1e86b330..d15677114a 100644
--- a/etc/themes/tsdh-dark-theme.el
+++ b/etc/themes/tsdh-dark-theme.el
@@ -32,6 +32,7 @@
'(diff-indicator-removed ((t (:inherit diff-indicator-changed))))
'(diff-removed ((t (:inherit diff-changed :background "dark red"))))
'(dired-directory ((t (:inherit font-lock-function-name-face :weight bold))))
+ '(header-line ((t (:inherit mode-line :inverse-video t))))
'(hl-line ((t (:background "grey28"))))
'(message-header-subject ((t (:foreground "SkyBlue"))))
'(minibuffer-prompt ((t (:background "yellow" :foreground "medium blue" :box (:line-width -1 :color "red" :style released-button) :weight bold))))
diff --git a/etc/themes/tsdh-light-theme.el b/etc/themes/tsdh-light-theme.el
index 5fb6ba84d7..9fac27fda1 100644
--- a/etc/themes/tsdh-light-theme.el
+++ b/etc/themes/tsdh-light-theme.el
@@ -32,6 +32,7 @@
'(diff-indicator-removed ((t (:inherit diff-indicator-changed))))
'(diff-removed ((t (:inherit diff-changed :background "sandy brown"))))
'(dired-directory ((t (:inherit font-lock-function-name-face :weight bold))))
+ '(header-line ((t (:inherit mode-line :inverse-video t))))
'(hl-line ((t (:background "grey95"))))
'(minibuffer-prompt ((t (:background "yellow" :foreground "medium blue" :box (:line-width -1 :color "red" :style released-button) :weight bold))))
'(mode-line ((t (:box (:line-width -1 :color "red" :style released-button) :family "DejaVu Sans"))))
diff --git a/etc/themes/wheatgrass-theme.el b/etc/themes/wheatgrass-theme.el
index 848e5e9507..1a86524ffa 100644
--- a/etc/themes/wheatgrass-theme.el
+++ b/etc/themes/wheatgrass-theme.el
@@ -1,6 +1,6 @@
;;; wheatgrass-theme.el --- custom theme for faces
-;; 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/etc/tutorials/TUTORIAL b/etc/tutorials/TUTORIAL
index 2c1f614920..7b5dfc7f4d 100644
--- a/etc/tutorials/TUTORIAL
+++ b/etc/tutorials/TUTORIAL
@@ -1143,4 +1143,3 @@ Please read the file COPYING and then do give copies of GNU Emacs to
your friends. Help stamp out software obstructionism ("ownership") by
using, writing, and sharing free software!
-;;; arch-tag: a0f84628-777f-4238-8865-451a73167f55
diff --git a/etc/tutorials/TUTORIAL.bg b/etc/tutorials/TUTORIAL.bg
index bd1f046824..ee22c0870d 100644
--- a/etc/tutorials/TUTORIAL.bg
+++ b/etc/tutorials/TUTORIAL.bg
@@ -1185,4 +1185,3 @@ Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
;;; Local Variables:
;;; coding: windows-1251
;;; End:
-;;; arch-tag: 70cf6ad7-c2e4-41fe-8199-74aa52683b0e
diff --git a/etc/tutorials/TUTORIAL.cn b/etc/tutorials/TUTORIAL.cn
index 6cd6ff430b..b4dd0f47f8 100644
--- a/etc/tutorials/TUTORIAL.cn
+++ b/etc/tutorials/TUTORIAL.cn
@@ -1024,4 +1024,3 @@ Emacs ×ÔÉíµÄ°æȨÎÊÌâËä±È±¾ÎĵµÒª¸´ÔÓһЩ£¬µ«Ò²»ùÓÚÏàͬµÄ¾«Éñ¡£¾´ÇëÔĶÁÎÄ
;;; coding: chinese-iso-8bit
;;; End:
-;;; arch-tag: 46a53d82-a85a-46b6-bdc7-583aca063578
diff --git a/etc/tutorials/TUTORIAL.cs b/etc/tutorials/TUTORIAL.cs
index a3cdabdd85..3a74ac4b2d 100644
--- a/etc/tutorials/TUTORIAL.cs
+++ b/etc/tutorials/TUTORIAL.cs
@@ -1037,4 +1037,3 @@ GNU Emacsu svým pøátelùm. Pomáhejte potírat softwarovou obstrukci
;;; coding: iso-latin-2
;;; End:
-;;; arch-tag: 479ef577-3d4d-4384-aeea-9fe79d5e89ca
diff --git a/etc/tutorials/TUTORIAL.de b/etc/tutorials/TUTORIAL.de
index 65be22445d..211b5329cd 100644
--- a/etc/tutorials/TUTORIAL.de
+++ b/etc/tutorials/TUTORIAL.de
@@ -1506,4 +1506,3 @@ freie Software verwenden, verteilen, oder sogar selber schreiben.
;;; coding: latin-1
;;; End:
-;;; arch-tag: a8f2fe06-631d-4ae1-887e-446f971b0baa
diff --git a/etc/tutorials/TUTORIAL.eo b/etc/tutorials/TUTORIAL.eo
index 63cc6426a4..4c72dc9cbb 100644
--- a/etc/tutorials/TUTORIAL.eo
+++ b/etc/tutorials/TUTORIAL.eo
@@ -1115,4 +1115,3 @@ kaj kompletigis Sergio B. Pokrovskij.
;;; coding: latin-3
;;; End:
-;; arch-tag: ee436ebb-58b6-4102-9402-1e92c33966e9
diff --git a/etc/tutorials/TUTORIAL.es b/etc/tutorials/TUTORIAL.es
index 3d0bbc1494..088a3304e8 100644
--- a/etc/tutorials/TUTORIAL.es
+++ b/etc/tutorials/TUTORIAL.es
@@ -1205,4 +1205,3 @@ compartiendo software libre!
;;; coding: latin-1
;;; End:
-;;; arch-tag: 66aae86e-6f86-4a3e-b82a-44a783f774fd
diff --git a/etc/tutorials/TUTORIAL.fr b/etc/tutorials/TUTORIAL.fr
index 038430e6a0..d778d85244 100644
--- a/etc/tutorials/TUTORIAL.fr
+++ b/etc/tutorials/TUTORIAL.fr
@@ -1192,4 +1192,3 @@ Cette traduction française a été effectuée par Éric Jacoboni
;;; sentence-end-double-space: nil
;;; End:
-;;; arch-tag: f6c5c2ff-bf24-477c-bd18-32f76f51ba65
diff --git a/etc/tutorials/TUTORIAL.he b/etc/tutorials/TUTORIAL.he
index 8c376314d2..2ef60c2f96 100644
--- a/etc/tutorials/TUTORIAL.he
+++ b/etc/tutorials/TUTORIAL.he
@@ -1008,7 +1008,7 @@ find-file.
גירסה זו של השיעור ×”×™× ×” חלק מחבילת GNU Emacs. ×”×™× ×ž×•×’× ×ª בזכויות יוצרי×
וניתנת להעתקה והפצת ×¢×•×ª×§×™× ×‘×ª× ××™× ×ž×¡×•×™×™×ž×™× ×›×“×œ×§×ž×Ÿ:
- Copyright (C) 2010 Free Software Foundation, Inc.
+ Copyright (C) 2010, 2011 Free Software Foundation, Inc.
â€GNU Emacs הינו תכנה חפשית; ×–×›×•×ª×›× ×œ×”×¤×™×¦×• ו\×ו לשנותו בכפוף לתנ××™
הרשיון GNU General Public License, כפי ×©×”×•× ×™×•×¦× ×œ×ור ×¢"×™ Free
diff --git a/etc/tutorials/TUTORIAL.it b/etc/tutorials/TUTORIAL.it
index 0073991243..a92b455ffe 100644
--- a/etc/tutorials/TUTORIAL.it
+++ b/etc/tutorials/TUTORIAL.it
@@ -1109,4 +1109,3 @@ condividendo software libero!
;;; coding: latin-1
;;; End:
-;;; arch-tag: c6f7079d-8032-473d-91d4-36754af15719
diff --git a/etc/tutorials/TUTORIAL.ja b/etc/tutorials/TUTORIAL.ja
index 331eaef30d..35f39e4110 100644
--- a/etc/tutorials/TUTORIAL.ja
+++ b/etc/tutorials/TUTORIAL.ja
@@ -1085,4 +1085,3 @@ GNU Emacs to your friends. Help stamp out software obstructionism
;;; coding: iso-2022-jp
;;; End:
-;;; arch-tag: 7136abc2-eb97-4f51-80a2-fa690ba4cfe8
diff --git a/etc/tutorials/TUTORIAL.ko b/etc/tutorials/TUTORIAL.ko
index 19cf60647b..c6f6e83f2d 100644
--- a/etc/tutorials/TUTORIAL.ko
+++ b/etc/tutorials/TUTORIAL.ko
@@ -998,4 +998,3 @@ COPYING$(C@L6s4B(B $(CFD@O@;(B $(C@P0m(B $(C3-(B $(CHD?!(B GNU $(C@L8
$(CAV=J=C?@(B. $(C@Z@/(B $(C<RGAF.?~>n8&(B $(C>20m(B $(C885i0m(B $(C0x@/GT@87N=a(B $(C<RGAF.?~>n(B
$(C9fGX8&(B ("$(C<R@/1G(B") $(C1Y@}GO4B5%(B $(C55?s=C4Y(B.
-;;; arch-tag: 44503bc5-b2c1-4169-962d-9d33157221a9
diff --git a/etc/tutorials/TUTORIAL.nl b/etc/tutorials/TUTORIAL.nl
index 5b77d27c0e..800eba73ac 100644
--- a/etc/tutorials/TUTORIAL.nl
+++ b/etc/tutorials/TUTORIAL.nl
@@ -1244,4 +1244,3 @@ GNU Emacs to your friends. Help stamp out software obstructionism
;;; coding: latin-1
;;; End:
-;;; arch-tag: 3399e308-e605-4125-8fbb-b2fe91ac3149
diff --git a/etc/tutorials/TUTORIAL.pl b/etc/tutorials/TUTORIAL.pl
index cb436cd03b..5f46b11f2f 100644
--- a/etc/tutorials/TUTORIAL.pl
+++ b/etc/tutorials/TUTORIAL.pl
@@ -1237,4 +1237,3 @@ u¿ywaj±c, tworz±c i dziel±c siê oprogramowaniem swobodnym.
;;; sentence-end-double-space: nil
;;; End:
-;;; arch-tag: 6c6b7445-4cd5-44ca-a101-7f4697b92f60
diff --git a/etc/tutorials/TUTORIAL.pt_BR b/etc/tutorials/TUTORIAL.pt_BR
index a08386b9f2..2949024c00 100644
--- a/etc/tutorials/TUTORIAL.pt_BR
+++ b/etc/tutorials/TUTORIAL.pt_BR
@@ -1078,4 +1078,3 @@ Emacs para seus amigos. Ajude a erradicar o obstrucionismo de software
;;; sentence-end-double-space: nil
;;; End:
-;;; arch-tag: 8ea256d6-2c4a-49ee-ac08-0ea6ef25bf8d
diff --git a/etc/tutorials/TUTORIAL.ro b/etc/tutorials/TUTORIAL.ro
index d5417e41b5..9be059bd2c 100644
--- a/etc/tutorials/TUTORIAL.ro
+++ b/etc/tutorials/TUTORIAL.ro
@@ -1105,4 +1105,3 @@ folosind, scriind ºi distribuind free software!
;;; coding: iso-latin-2
;;; End:
-;;; arch-tag: dcf252cf-bd67-4f8d-a440-1ec4b8dbfd70
diff --git a/etc/tutorials/TUTORIAL.ru b/etc/tutorials/TUTORIAL.ru
index e2e5bb3ff5..daa00f6e4e 100644
--- a/etc/tutorials/TUTORIAL.ru
+++ b/etc/tutorials/TUTORIAL.ru
@@ -1156,4 +1156,3 @@ Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
;;; sentence-end-double-space: nil
;;; End:
-;;; arch-tag: ad4e5698-ea8b-45b7-b236-ed5ad5b72d2b
diff --git a/etc/tutorials/TUTORIAL.sk b/etc/tutorials/TUTORIAL.sk
index a799eb9405..73ab5a4f0e 100644
--- a/etc/tutorials/TUTORIAL.sk
+++ b/etc/tutorials/TUTORIAL.sk
@@ -1096,4 +1096,3 @@ GNU Emacsu svojim priateµom. Pomáhajte potlaèova» softwarovú ob¹trukciu
;;; coding: iso-latin-2
;;; End:
-;;; arch-tag: 87861cfa-5cf6-4b87-9fab-86c93c5ca9f3
diff --git a/etc/tutorials/TUTORIAL.sl b/etc/tutorials/TUTORIAL.sl
index be0032f463..0acdcd614d 100644
--- a/etc/tutorials/TUTORIAL.sl
+++ b/etc/tutorials/TUTORIAL.sl
@@ -1129,4 +1129,3 @@ pi¹ete in delite prosto programje!
;;; sentence-end-double-space: nil
;;; End:
-;;; arch-tag: 985059e4-44c6-4ac9-b627-46c8db57acf6
diff --git a/etc/tutorials/TUTORIAL.sv b/etc/tutorials/TUTORIAL.sv
index e22a2a7c80..66ba6f12b7 100644
--- a/etc/tutorials/TUTORIAL.sv
+++ b/etc/tutorials/TUTORIAL.sv
@@ -1143,4 +1143,3 @@ GNU Emacs to your friends. Help stamp out software obstructionism
;;; sentence-end-double-space: nil
;;; End:
-;;; arch-tag: b352f774-622b-4cc6-85ce-43e3baf4fc1b
diff --git a/etc/tutorials/TUTORIAL.th b/etc/tutorials/TUTORIAL.th
index e2c302c239..602621d666 100644
--- a/etc/tutorials/TUTORIAL.th
+++ b/etc/tutorials/TUTORIAL.th
@@ -1005,4 +1005,3 @@ Translate - January 1999 by Virach Sornlertlamvanich
;;; sentence-end-double-space: nil
;;; End:
-;;; arch-tag: 79ad252a-448a-4dc9-a4cb-2097dd1ec014
diff --git a/etc/tutorials/TUTORIAL.translators b/etc/tutorials/TUTORIAL.translators
index ea0b1ec040..a69d23c471 100644
--- a/etc/tutorials/TUTORIAL.translators
+++ b/etc/tutorials/TUTORIAL.translators
@@ -96,4 +96,3 @@ Maintainer: Chao-Hong Liu <chliu@gnu.org>
;;; coding: utf-8
;;; End:
-;;; arch-tag: 8788b16b-e739-4304-a7f2-729bdb999fa0
diff --git a/etc/tutorials/TUTORIAL.zh b/etc/tutorials/TUTORIAL.zh
index cadb7bfa2b..0f51c91d38 100644
--- a/etc/tutorials/TUTORIAL.zh
+++ b/etc/tutorials/TUTORIAL.zh
@@ -1083,4 +1083,3 @@ Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
;;; coding: chinese-big5
;;; End:
-;;; arch-tag: a51dafb4-e602-432b-8020-5d5d5f150811
diff --git a/info/.gitignore b/info/.gitignore
index 7e3bcdff84..72e8ffc0db 100644
--- a/info/.gitignore
+++ b/info/.gitignore
@@ -1,3 +1 @@
*
-
-# arch-tag: 4cf702c2-f50e-49bd-a3ff-4fd962c5975a
diff --git a/leim/.gitignore b/leim/.gitignore
index 5fca4a301b..02175a1deb 100644
--- a/leim/.gitignore
+++ b/leim/.gitignore
@@ -1,4 +1,2 @@
*.elc
leim-list.el
-
-# arch-tag: 652dce56-7a2f-46ff-8699-c3289ccdc165
diff --git a/leim/CXTERM-DIC/4Corner.tit b/leim/CXTERM-DIC/4Corner.tit
index b62a4ff922..e95b970d65 100644
--- a/leim/CXTERM-DIC/4Corner.tit
+++ b/leim/CXTERM-DIC/4Corner.tit
@@ -6676,4 +6676,3 @@ BEGINDICTIONARY
99903 ¿¢
99904 ºa
-# arch-tag: aa089b66-ed25-422f-97e2-78574370efa5
diff --git a/leim/CXTERM-DIC/ARRAY30.tit b/leim/CXTERM-DIC/ARRAY30.tit
index 55919c862d..f1f7f1e247 100644
--- a/leim/CXTERM-DIC/ARRAY30.tit
+++ b/leim/CXTERM-DIC/ARRAY30.tit
@@ -13185,4 +13185,3 @@ napa ùÚ # ---> 6v1-0^1- 0
,nr\040 ùÛ # ---> 8v6v4^ 0
weu\040 ùÜ # ---> 2^3^7^ 0
-# arch-tag: 344d9e2d-e34b-4c61-ac52-aa46da44347d
diff --git a/leim/CXTERM-DIC/CCDOSPY.tit b/leim/CXTERM-DIC/CCDOSPY.tit
index c428f126a2..930f424839 100644
--- a/leim/CXTERM-DIC/CCDOSPY.tit
+++ b/leim/CXTERM-DIC/CCDOSPY.tit
@@ -564,4 +564,3 @@ zuj ×ê×ë߬çÚõò
zun ×ð×ñߤé×÷®
zuo ×ò×ó×ô×õ×ö×÷×ø×ùßòàÜâôëÑìñ
-# arch-tag: cc94b635-0552-40f3-8513-5edab6f13ce5
diff --git a/leim/CXTERM-DIC/ECDICT.tit b/leim/CXTERM-DIC/ECDICT.tit
index 8b3beec828..7508e6b1f2 100644
--- a/leim/CXTERM-DIC/ECDICT.tit
+++ b/leim/CXTERM-DIC/ECDICT.tit
@@ -7837,4 +7837,3 @@ zoological °Êª«¾Çªº
zoology °Êª«¾Ç
-# arch-tag: 618eec81-84f6-42ce-b2e7-01569fb3f8cb
diff --git a/leim/CXTERM-DIC/ETZY.tit b/leim/CXTERM-DIC/ETZY.tit
index befb511f56..ab123a9fd4 100644
--- a/leim/CXTERM-DIC/ETZY.tit
+++ b/leim/CXTERM-DIC/ETZY.tit
@@ -1580,4 +1580,3 @@ z2 ¼õ±Î¾C¿¬¹Èîg÷´ÆRÃïö}á¼ævæ©Ámólâ°ê¢ä»å­çWðjðæòj
z3 ÃͶþͽØD
z4 ¶Æ¿D¶ø¾ÒéMØ´Êó鮩íÛäéj
-# arch-tag: 7f36821c-dc1c-4119-8679-f354a58ff15f
diff --git a/leim/CXTERM-DIC/PY-b5.tit b/leim/CXTERM-DIC/PY-b5.tit
index e34fd3a87d..c3d88ca39d 100644
--- a/leim/CXTERM-DIC/PY-b5.tit
+++ b/leim/CXTERM-DIC/PY-b5.tit
@@ -2299,4 +2299,3 @@ zuo3 ¥ª¦õðw
zuo4 °µ§@§¤®yÜ`¯®Æw¬gÌ©Ð_ÍÚßÜÑY
zuo5
-# arch-tag: cd75d187-c91f-4197-8e77-1ee1a89a38bb
diff --git a/leim/CXTERM-DIC/Punct-b5.tit b/leim/CXTERM-DIC/Punct-b5.tit
index 89ee06a3c0..adff8b9430 100644
--- a/leim/CXTERM-DIC/Punct-b5.tit
+++ b/leim/CXTERM-DIC/Punct-b5.tit
@@ -138,4 +138,3 @@ unit ¢a
} ¡¢¡b¡d
~ ¡\¡ã¡Û
-# arch-tag: 6c85fd95-a46d-4b07-8a87-2121eb14e132
diff --git a/leim/CXTERM-DIC/Punct.tit b/leim/CXTERM-DIC/Punct.tit
index 61c3d4f907..09a23915bc 100644
--- a/leim/CXTERM-DIC/Punct.tit
+++ b/leim/CXTERM-DIC/Punct.tit
@@ -75,4 +75,3 @@ symbol ¡á¡â¡ã¡ä¡å¡æ¡ç¡è¡é¡ê¡ë¡ì¡í
| £ü¡¬¡Î
~ £þ¡«¡×¡Ø¡Þ
-# arch-tag: 4d0e14b7-4eb2-4310-9582-e981f4c4a7f0
diff --git a/leim/CXTERM-DIC/QJ-b5.tit b/leim/CXTERM-DIC/QJ-b5.tit
index 4214616b05..7ef537bd5c 100644
--- a/leim/CXTERM-DIC/QJ-b5.tit
+++ b/leim/CXTERM-DIC/QJ-b5.tit
@@ -110,4 +110,3 @@ z £C
} ¡b
~ ¡ã
-# arch-tag: 5c41662d-6b85-467f-a977-ba80a6bd9f2c
diff --git a/leim/CXTERM-DIC/QJ.tit b/leim/CXTERM-DIC/QJ.tit
index d620a30fba..e2b2c529ac 100644
--- a/leim/CXTERM-DIC/QJ.tit
+++ b/leim/CXTERM-DIC/QJ.tit
@@ -110,4 +110,3 @@ z £ú
} £ý
~ £þ
-# arch-tag: 3ee780cd-600a-49e7-a77b-85b898adc205
diff --git a/leim/CXTERM-DIC/SW.tit b/leim/CXTERM-DIC/SW.tit
index f87ae53e34..f95e24032e 100644
--- a/leim/CXTERM-DIC/SW.tit
+++ b/leim/CXTERM-DIC/SW.tit
@@ -749,4 +749,3 @@ zy °±´Ôµª¶Ì·Õ·ú¸×º¤ºÐÂÈÄÊÆóÆøÇâÇèÉÏЩÐéÑõÕ½Ö¹ÙÚÙÝÙÞê¨
zy ë­ë®ë¯ë°ë±ë²ë³ë´ëµõºö´÷ª
zz ´Ó¿¨Áì­ƵÇêÈËÌ°Õ§ÕêÖÚêßì£ì¨ò¢ò¥
-# arch-tag: 0e108249-9190-46f4-884f-6af10a9aeb89
diff --git a/leim/CXTERM-DIC/TONEPY.tit b/leim/CXTERM-DIC/TONEPY.tit
index 586987fd3c..8d7deaeae4 100644
--- a/leim/CXTERM-DIC/TONEPY.tit
+++ b/leim/CXTERM-DIC/TONEPY.tit
@@ -2121,4 +2121,3 @@ zuo3 ´é×ó×ô
zuo4 Ôä×õ×ö×÷×ø×ùÚèßòâôëÑìñõ¡
zuo5
-# arch-tag: 6a2668ac-399a-4504-bb7a-5c641cb8e0ef
diff --git a/leim/CXTERM-DIC/ZOZY.tit b/leim/CXTERM-DIC/ZOZY.tit
index 5c445ffdaf..ed4a702012 100644
--- a/leim/CXTERM-DIC/ZOZY.tit
+++ b/leim/CXTERM-DIC/ZOZY.tit
@@ -1580,4 +1580,3 @@ zp4 ¥÷©Á¾Ä¼«¤ÀÁTàóô\Ê®ÏýèßéÃêëðx
zp6 ¼XµI¨WÌÞÙÈÓÇóFñãånåýóVï´Ê·ÍZÓbãËøtÊÒêýöc
zul4 ßú
-# arch-tag: e40a2740-dae5-4fd9-a32e-bedf6503dc65
diff --git a/leim/ChangeLog b/leim/ChangeLog
index f55fc71288..c76f1af594 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -2128,4 +2128,3 @@
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: 4b364045-a476-4ff7-92ad-dde58dbd45b4
diff --git a/leim/MISC-DIC/CTLau-b5.html b/leim/MISC-DIC/CTLau-b5.html
index 56994dd71e..b7d33b0e31 100644
--- a/leim/MISC-DIC/CTLau-b5.html
+++ b/leim/MISC-DIC/CTLau-b5.html
@@ -682,6 +682,3 @@ YUNG ´é±eó`¥Î«i¿Ä®e¦¥¯ñ»Tº²·»µ³¤¾¶ä¯Î¾Ö¶ÄÁs÷ê¹l¿ã¸º±v«MØq°oº_¨i
\YOO èÛø[¡¼¡¼ì{ì|ÂDïjÂCïlù\ÂBóÐñÇùÎÅ¿÷®ö­÷²ÃXÄJóÈóÖóËÄI¡¼óÍóÎÄK¡¼óÏ¡¼õkÆsÄÏõnõv¡¼¡¼¡¼ö®Å`ö¯÷¯ÅÀ÷«¡¼¡¼ÅíÅëøWø×
\YUK êé³bߢ×L×K×E§¿¡¼µËµÍ¡¼¡¼ßs¡¼ã¦¡¼¡¼ÜæÜù»Mæý¡¼íêí衼¦G¡¼Ëx¡¼ÌÒ¡¼ªÐªÒÍ°¡¼¡¼¡¼Ä¤Ð[Ð_ÐgÐeÎú­O×H¯Ö¡¼¡¼¯â®Ó¡¼
<hr></pre></body></html>
-
-<!-- arch-tag: bae78679-a82a-442d-a0cc-07d8f7f72c53
- (do not change this comment) -->
diff --git a/leim/MISC-DIC/CTLau.html b/leim/MISC-DIC/CTLau.html
index 77db00d26b..36e3581a38 100644
--- a/leim/MISC-DIC/CTLau.html
+++ b/leim/MISC-DIC/CTLau.html
@@ -682,6 +682,3 @@ YUNG Ó¿Ó¹ïÞÓÃÓÂÈÚÈÝÈÖÈ×ÈØÈÛÈÜÈÞÈßÎËÎÌÓµÓ¶Ó·Ó¸ÓºÓ»Ó¼ÓÁÙ¸à¯çßéÅð®
\YOO öÐöÑöÒöÓöÖöØöÙöÚöÛöÜöÝöÞößöáöâöãöäöåöæöçöëöíöîöïöðöñöòöóöôöõööö÷öøöùöúöûöüöýöþ÷Ý÷£÷¤÷¥÷¦÷§÷¨÷ª÷«÷¬÷­÷®÷¯
\YUK ì¢ëàëáëâëãëäÄòëæëçëéëêëëëíëïëðëñëòëóëôëöëùëúëûëþì¡ë¾ë¿ëÀëÂëÃëÄëÅëÆëÇëÉëËëÌëÍëÏëÑëÒëÓëÔëÕëÖë×ëÛëÜëÝëÞëß
<hr></pre></body></html>
-
-<!-- arch-tag: 31cf695a-5f79-4a94-be79-54c38c444946
- (do not change this comment) -->
diff --git a/leim/leim-ext.el b/leim/leim-ext.el
index 04687e41ff..dd0c818935 100644
--- a/leim/leim-ext.el
+++ b/leim/leim-ext.el
@@ -89,4 +89,3 @@ HELP-TEXT is a text set in `hangul-input-method-help-text'.")
'hangul390-input-method
"Input method: korean-hangul390 (mode line indicator:한390)\n\nHangul 3-Bulsik 390 input method.")
-;; arch-tag: 75cfdfc7-de85-44f9-b408-ff67d1ec664e
diff --git a/leim/quail/.gitignore b/leim/quail/.gitignore
index c19128664e..c3f9e36f0d 100644
--- a/leim/quail/.gitignore
+++ b/leim/quail/.gitignore
@@ -20,4 +20,3 @@ quick-cns.el
tsang-b5.el
tsang-cns.el
-# arch-tag: 51d8b13a-24b5-45fb-8451-7bef7f101f26
diff --git a/leim/quail/arabic.el b/leim/quail/arabic.el
index e08c23806c..9e65aa8f24 100644
--- a/leim/quail/arabic.el
+++ b/leim/quail/arabic.el
@@ -112,5 +112,4 @@ Based on Arabic table in X Keyboard Configuration DB.
("." ?ز)
("/" ?ظ))
-;; arch-tag: 7e81e2af-5ea5-417f-bfe7-dfa6fd955cb5
;;; arabic.el ends here
diff --git a/leim/quail/croatian.el b/leim/quail/croatian.el
index 6dadb804fd..e015dbaa14 100644
--- a/leim/quail/croatian.el
+++ b/leim/quail/croatian.el
@@ -197,5 +197,4 @@ dd -> ð"
("DD" ?Ð)
("Dd" ?Ð))
-;; arch-tag: 8cb44078-9c51-4e81-9ef8-7d5b89f62e31
;;; croatian.el ends here
diff --git a/leim/quail/cyril-jis.el b/leim/quail/cyril-jis.el
index f9916a3206..9f9cff4105 100644
--- a/leim/quail/cyril-jis.el
+++ b/leim/quail/cyril-jis.el
@@ -143,5 +143,4 @@
;; coding: iso-2022-7bit
;; End:
-;; arch-tag: 3a0cc2ac-de48-42fe-9e80-05d8aa6faa36
;;; cyril-jis.el ends here
diff --git a/leim/quail/cyrillic.el b/leim/quail/cyrillic.el
index 8a09083593..f89d64a92c 100644
--- a/leim/quail/cyrillic.el
+++ b/leim/quail/cyrillic.el
@@ -1405,5 +1405,4 @@ keys as being transformed into ( and ) respectively. For ( and ), use
;; coding: iso-2022-7bit
;; End:
-;; arch-tag: e6d34b16-8710-4181-a17e-819a1df0334f
;;; cyrillic.el ends here
diff --git a/leim/quail/czech.el b/leim/quail/czech.el
index a14e3fe140..35d7d60571 100644
--- a/leim/quail/czech.el
+++ b/leim/quail/czech.el
@@ -566,5 +566,4 @@ All other keys are the same as on standard US keyboard."
([kp-0] ?0)
([kp-add] ?+))
-;; arch-tag: 0a27dffc-a5e1-479f-9da2-a9eb91b34d8a
;;; czech.el ends here
diff --git a/leim/quail/ethiopic.el b/leim/quail/ethiopic.el
index 7a299512d7..bdbb214723 100644
--- a/leim/quail/ethiopic.el
+++ b/leim/quail/ethiopic.el
@@ -1146,5 +1146,4 @@ C-' or `M-x ethio-gemination'
(if (ethio-prefer-amharic-p) ?$(3"c(B ?$(3"f(B)
"ethiopic"))
-;; arch-tag: 66c182a8-d802-40fa-9c0d-d8ebe2f909d5
;;; ethiopic.el ends here
diff --git a/leim/quail/georgian.el b/leim/quail/georgian.el
index 82520e35c8..a6e853b6cd 100644
--- a/leim/quail/georgian.el
+++ b/leim/quail/georgian.el
@@ -81,5 +81,4 @@
("e1" ?) ;; Letter not in Unicode (private use code).
)
-;; arch-tag: 7b26f205-7091-435e-a2cf-8778f899dc8a
;;; georgian.el ends here
diff --git a/leim/quail/greek.el b/leim/quail/greek.el
index 90f446c4b5..6c498e3059 100644
--- a/leim/quail/greek.el
+++ b/leim/quail/greek.el
@@ -1429,5 +1429,4 @@ e.g.
(">>" ?$(Q)2(B))
-;; arch-tag: 2a37e042-db1b-4ecf-b755-117775a3c150
;;; greek.el ends here
diff --git a/leim/quail/hangul.el b/leim/quail/hangul.el
index 14b43ea62a..95a22d4b13 100644
--- a/leim/quail/hangul.el
+++ b/leim/quail/hangul.el
@@ -539,5 +539,4 @@ HELP-TEXT is a text set in `hangul-input-method-help-text'."
(provide 'hangul)
-;; arch-tag: 26bc93fc-64ee-4fb1-b26d-22220d132dbe
;;; hangul.el ends here
diff --git a/leim/quail/hanja-jis.el b/leim/quail/hanja-jis.el
index 6ed70a9e5c..2c7eebb834 100644
--- a/leim/quail/hanja-jis.el
+++ b/leim/quail/hanja-jis.el
@@ -524,5 +524,4 @@
("glf" "$B5Merk#pvs\(B")
("unknown" "$B4#<5DNFJFdFuJ=KsL]QeRIRpS&S9SuS{T*T+T8T:T>TBTCTKTNTQTWT\T_UNU~V&V,V-V.V/V0V2V4V8VNW;WjWnWpY0YKY^Z1Zs[=[b[n\)\-\.\/\0\1\O\S\j\n\o\p\q\x]&]6]B]i^<^L^c_&_1`<a:a<a>b<bBbXbmbpbsc%c5cNcdc}d&d1d=dIdLdYdddfdhdte9eaebemenevf$g3g\h4h6hHhMhWhhiFi[ibj,jQj^jmk\lCmZmhmimzn%n}o'oZo]p#p-pXp]p`q;qIqRr;r@rGrOrZr_rer~s#s%(B"))
-;; arch-tag: 06336a2c-696e-45f1-9990-aff251e7493a
;;; hanja-jis.el ends here
diff --git a/leim/quail/hanja.el b/leim/quail/hanja.el
index 84d8662a60..f82f38c7b2 100644
--- a/leim/quail/hanja.el
+++ b/leim/quail/hanja.el
@@ -514,5 +514,4 @@
("gml" "$(C}j}k}l}m}n}o}p}q}r}s}t}u}v}w}x}y}z}{}|}}(B")
("glf" "$(C}~(B"))
-;; arch-tag: f83c4a34-ee8a-4d7f-95a2-e18816c57182
;;; hanja.el ends here
diff --git a/leim/quail/hanja3.el b/leim/quail/hanja3.el
index 6f102849ea..aea50afa4b 100644
--- a/leim/quail/hanja3.el
+++ b/leim/quail/hanja3.el
@@ -612,5 +612,4 @@
("m8" "$(C}j}k}l}m}n}o}p}q}r}s}t}u}v}w}x}y}z}{}|}}(B")
("mdw" "$(C}~(B"))
-;; arch-tag: 2dda6492-e6e3-47a0-aa88-8d9bdf3a200f
;;; hanja3.el ends here
diff --git a/leim/quail/hebrew.el b/leim/quail/hebrew.el
index c58d0882a3..828532040e 100644
--- a/leim/quail/hebrew.el
+++ b/leim/quail/hebrew.el
@@ -75,5 +75,4 @@ Hebrew letters are assigned to lowercases.
("/" ?.)
("'" ?,))
-;; arch-tag: 771b887d-15af-4a4d-b4ce-a4a86f5ca0cf
;;; hebrew.el ends here
diff --git a/leim/quail/indian.el b/leim/quail/indian.el
index 7a32101f7f..60f7371312 100644
--- a/leim/quail/indian.el
+++ b/leim/quail/indian.el
@@ -294,5 +294,4 @@
"tamil-inscript" "Tamil" "TmlIS"
"Tamil keyboard Inscript.")
-;; arch-tag: 9e5a621e-f7d5-4fce-9543-0a51b407c940
;;; indian.el ends here
diff --git a/leim/quail/ipa.el b/leim/quail/ipa.el
index 1d533b6e7c..543d718637 100644
--- a/leim/quail/ipa.el
+++ b/leim/quail/ipa.el
@@ -516,5 +516,4 @@ displays them, incorrectly, as separate from the modified glyphs.")
(quail-defrule (format "%s_" implosive-x-sampa)
'ipa-x-sampa-underscore-implosive))
-;; arch-tag: cf2614cc-ecce-4ef5-ba51-37faeed41691
;;; ipa.el ends here
diff --git a/leim/quail/japanese.el b/leim/quail/japanese.el
index 517ade37ad..092fd9c095 100644
--- a/leim/quail/japanese.el
+++ b/leim/quail/japanese.el
@@ -550,5 +550,4 @@ qq: toggle between this input method and the input method `japanese-ascii'.
(vector (japanese-katakana (aref trans 0))))
(t trans)))))
-;; arch-tag: 47e0bfd4-6ecc-4d01-89a8-d687c5e01ff7
;;; japanese.el ends here
diff --git a/leim/quail/lao.el b/leim/quail/lao.el
index 66882043e3..268ee9c2b5 100644
--- a/leim/quail/lao.el
+++ b/leim/quail/lao.el
@@ -210,5 +210,4 @@ you need to re-load it to properly re-initialize related alists.")
(v-state (lao-vowel-key-alist . t-state))
(t-state lao-tone-key-alist))))
-;; arch-tag: 23863a30-a8bf-402c-b7ce-c517a7aa8570
;;; lao.el ends here
diff --git a/leim/quail/latin-alt.el b/leim/quail/latin-alt.el
index 0f79aa0fb3..242bd2498f 100644
--- a/leim/quail/latin-alt.el
+++ b/leim/quail/latin-alt.el
@@ -1713,5 +1713,4 @@ Doubling the postfix separates the letter and postfix: e.g. a'' -> a'
("z~~" ["z~"])
)
-;; arch-tag: 722466a6-363d-431c-9161-879e16e2da5d
;;; latin-alt.el ends here
diff --git a/leim/quail/latin-ltx.el b/leim/quail/latin-ltx.el
index 488d28d2d8..15b683f012 100644
--- a/leim/quail/latin-ltx.el
+++ b/leim/quail/latin-ltx.el
@@ -991,5 +991,4 @@ system, including many technical ones. Examples:
("\\textreferencemark" ?※)
)
-;; arch-tag: 3daae613-2c53-446e-a0a1-ee2e1ebed15f
;;; latin-ltx.el ends here
diff --git a/leim/quail/latin-post.el b/leim/quail/latin-post.el
index 70e0569f4f..bec526decf 100644
--- a/leim/quail/latin-post.el
+++ b/leim/quail/latin-post.el
@@ -2490,5 +2490,4 @@ Doubling the postfix separates the letter and postfix: e.g. a'' -> a'
("s<" ?Å¡)
("z<" ?ž))
-;; arch-tag: 170180fb-9617-4d58-9d51-65ca23c05d94
;;; latin-post.el ends here
diff --git a/leim/quail/latin-pre.el b/leim/quail/latin-pre.el
index 23a52656e1..7306a25c65 100644
--- a/leim/quail/latin-pre.el
+++ b/leim/quail/latin-pre.el
@@ -1189,5 +1189,4 @@ of characters from a single Latin-N charset.
("~~" ?¸)
)
-;; arch-tag: 83017837-6b84-4366-b183-e0577e3ed838
;;; latin-pre.el ends here
diff --git a/leim/quail/lrt.el b/leim/quail/lrt.el
index e208f729f9..845498ab7c 100644
--- a/leim/quail/lrt.el
+++ b/leim/quail/lrt.el
@@ -78,5 +78,4 @@
lao-transcription-tone-alist)
(t-state lao-transcription-tone-alist))))
-;; arch-tag: f65e4038-e187-4906-997b-d2de7ed813d2
;;; lrt.el ends here
diff --git a/leim/quail/py-punct.el b/leim/quail/py-punct.el
index a94b9af5e9..5988f674ba 100644
--- a/leim/quail/py-punct.el
+++ b/leim/quail/py-punct.el
@@ -75,5 +75,4 @@ For instance, typing `v' and `%' insert `$A#%(B'.
(quail-defrule "v" (nth 2 (assoc "chinese-punct" quail-package-alist)))
-;; arch-tag: 941fd2ac-2d26-4b0e-8458-b5e485c5aa7d
;;; py-punct.el ends here
diff --git a/leim/quail/pypunct-b5.el b/leim/quail/pypunct-b5.el
index c01a667865..cc1f4f535e 100644
--- a/leim/quail/pypunct-b5.el
+++ b/leim/quail/pypunct-b5.el
@@ -53,5 +53,4 @@ For instance, typing `v' and `%' insert `$(0"h(B'.
(quail-defrule "v" (nth 2 (assoc "chinese-punct-b5" quail-package-alist)))
-;; arch-tag: fe8176d3-b467-47d5-9ed9-75b6e27cf29b
;;; pypunct-b5.el ends here
diff --git a/leim/quail/rfc1345.el b/leim/quail/rfc1345.el
index b98b4244c3..5866885725 100644
--- a/leim/quail/rfc1345.el
+++ b/leim/quail/rfc1345.el
@@ -2062,5 +2062,4 @@ E.g. &a' -> á"
(provide 'rfc1345)
-;; arch-tag: a951cfd9-1d19-44a7-aa98-04515fc4e502
;;; rfc1345.el ends here
diff --git a/leim/quail/sgml-input.el b/leim/quail/sgml-input.el
index 602e9fbac8..f8989b6d53 100644
--- a/leim/quail/sgml-input.el
+++ b/leim/quail/sgml-input.el
@@ -1059,5 +1059,4 @@ E.g.: &aacute; -> á"
("&zwnj;" ?\‌) ;; ZERO WIDTH NON-JOINER
)
-;; arch-tag: ad2a65ea-f903-423b-b3bd-08d0912ae41f
;;; sgml-input.el ends here
diff --git a/leim/quail/sisheng.el b/leim/quail/sisheng.el
index e2d424ab3e..1cd86a7029 100644
--- a/leim/quail/sisheng.el
+++ b/leim/quail/sisheng.el
@@ -290,5 +290,4 @@ Example: nve5 -> nüe
;; coding: utf-8
;; End:
-;; arch-tag: 1fa6ba5f-6747-44bc-bf12-30628ad3e8ad
;;; sisheng.el ends here
diff --git a/leim/quail/slovak.el b/leim/quail/slovak.el
index 7854e87c40..31380a8413 100644
--- a/leim/quail/slovak.el
+++ b/leim/quail/slovak.el
@@ -477,5 +477,4 @@ All other keys are the same as on standard US keyboard."
([kp-0] ?0)
([kp-add] ?+))
-;; arch-tag: 8aedb992-e191-4eec-ad0d-71a352e02a3d
;;; slovak.el ends here
diff --git a/leim/quail/symbol-ksc.el b/leim/quail/symbol-ksc.el
index 1d3d622e4d..fab94cdb18 100644
--- a/leim/quail/symbol-ksc.el
+++ b/leim/quail/symbol-ksc.el
@@ -200,5 +200,4 @@
("Russ" "$(C,!,",#,$,%,&,',(,),*,+,,,-,.,/,0,1,2,3,4,5,6,7,8,9,:,;,<,=,>,?,@,A(B")
("russ" "$(C,Q,R,S,T,U,V,W,X,Y,Z,[,\,],^,_,`,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q(B"))
-;; arch-tag: a77d89b9-9847-41d2-8e3a-7cce841ebb3b
;;; symbol-ksc.el ends here
diff --git a/leim/quail/thai.el b/leim/quail/thai.el
index f9bdc4b5fe..6514b6ab2a 100644
--- a/leim/quail/thai.el
+++ b/leim/quail/thai.el
@@ -109,5 +109,4 @@ The difference from the ordinal Thai keyboard:
",T;(B" ",Th(B" ",T:(B" ",TO(B" ",Tm(B" ",TF(B" ",T%(B" 0 ; x .. DEL
])
-;; arch-tag: fed6c468-0616-44b0-88bf-47347bf64825
;;; thai.el ends here
diff --git a/leim/quail/tibetan.el b/leim/quail/tibetan.el
index b6af5d29ce..54be542bf9 100644
--- a/leim/quail/tibetan.el
+++ b/leim/quail/tibetan.el
@@ -453,5 +453,4 @@
(tibetan-vowel-tibkey-alist . m-state))
(m-state tibetan-modifier-tibkey-alist))))
-;; arch-tag: 828fdb1a-733f-4c7b-b882-a19d2449ac99
;;; tibetan.el ends here
diff --git a/leim/quail/uni-input.el b/leim/quail/uni-input.el
index a68456e497..eca6b96b2d 100644
--- a/leim/quail/uni-input.el
+++ b/leim/quail/uni-input.el
@@ -127,5 +127,4 @@ Input as Unicode: U<hex> or u<hex>, where <hex> is a four-digit hex number.")))
(provide 'uni-input)
-;; arch-tag: e0d91c7c-19a1-43d3-8f2b-28c0e031efaa
;;; uni-input.el ends here
diff --git a/leim/quail/viqr.el b/leim/quail/viqr.el
index 0352d2c559..a182c6c94c 100644
--- a/leim/quail/viqr.el
+++ b/leim/quail/viqr.el
@@ -68,5 +68,4 @@
(viet-quail-define-rules)
-;; arch-tag: d2c29221-5a2e-46b2-898b-0e56bc4eb858
;;; viqr.el ends here
diff --git a/leim/quail/vntelex.el b/leim/quail/vntelex.el
index d4ad8ceac4..e23d010706 100644
--- a/leim/quail/vntelex.el
+++ b/leim/quail/vntelex.el
@@ -426,5 +426,4 @@ and postfix: Eee -> Ee, ajj -> aj, etc.
;; coding: iso-2022-7bit
;; End:
-;; arch-tag: 60db6880-0c9f-4456-b9fe-628de053a5ab
;;; vntelex.el ends here
diff --git a/leim/quail/welsh.el b/leim/quail/welsh.el
index 14bdfc75aa..75feb822ff 100644
--- a/leim/quail/welsh.el
+++ b/leim/quail/welsh.el
@@ -199,5 +199,4 @@
;; ("w\"" ?,A>(B))
-;; arch-tag: aeef0eae-0a50-4606-9120-020d59d5e208
;;; welsh.el ends here
diff --git a/lib-src/.gitignore b/lib-src/.gitignore
index c111257cc9..e1693b13c5 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 fdcd2c028e..ab0057d627 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 bf828b4660..c426a1ff25 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 4a5941f86d..0000000000
--- 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 e3e7376843..1518bc6150 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 ce83428fb4..aa5b370aad 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 3a3cc490af..4260e4c08f 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 16584a89bd..b127c85951 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 811080eb9d..7af503f083 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 f2e5a12daf..6b0e28ea0c 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 4ac55192fd..8888d3af29 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 6915dc8d72..917aadee5c 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 e8832a3d77..a1ddf243d2 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 be3fa1e5b8..3361c23bfb 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 a58d5ee1fe..1f031d74ce 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 6156de672b..0e74182a75 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 4bf751b045..5781229527 100755
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -112,4 +112,3 @@ do
fi
done
-# arch-tag: 4344ba3a-bcbe-4f77-971c-f43c1606953a
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 320335c4e7..3bc9ccfbf2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,173 @@
+2011-01-16 Tassilo Horn <tassilo@member.fsf.org>
+
+ * strokes.el (strokes-read-stroke): Re-fill strokes buffer with
+ spaces if the frame was resized, so that the full visible buffer
+ serves as canvas for strokes.
+
+2011-01-16 Glenn Morris <rgm@gnu.org>
+
+ * info-xref.el (info-xref-docstrings): Replace cl function.
+ Also skip directories.
+
+2011-01-16 Kevin Ryde <user42@zip.com.au>
+
+ * info-xref.el: Version 3.
+ (info-xref-check, info-xref-check-all): Move commentary details
+ into docstrings for better visibility.
+ Use compilation-mode for the results buffer.
+ (info-xref-output, info-xref-output-error, info-xref-with-output)
+ (info-xref-filename, info-xref-in-progress):
+ New internals for this.
+ (info-xref-check-list, info-xref-check-buffer)
+ (info-xref-check-all-custom): Use those.
+ (info-xref-output-buffer): Rename from info-xref-results-buffer.
+ (info-xref-output-heading): Rename from info-xref-filename-heading.
+ (info-xref-good, info-xref-bad, info-xref-xfile-alist)
+ (info-xref-filename-heading): Move to output managing section.
+ (info-xref-docstrings): New command checking "Info node `(foo)Bar'"
+ (info-xref-lock-file-p, info-xref-with-file): New helpers for it.
+ (info-xref-subfile-p): Move to generic section with those two.
+ (info-xref-check-node): New function split from
+ info-xref-check-buffer, shared by info-xref-docstrings.
+ (info-xref-goto-node-p): Move to a checking section with that func.
+ (info-xref-unavail): New counter.
+ (info-xref-check-node): Use it.
+ (info-xref-with-output): Show count of unavailables at end of output.
+ (info-xref-all-info-files): Exclude ".*" dotfiles. Ignore broken
+ symlinks. Exclude .texi files. Exclude Emacs backup files.
+ (info-xref-check-all-custom): Fix quietening viper-mode and
+ gnus-registry-install -- use setq not let so as not to unbind
+ after load.
+
+2011-01-16 Juri Linkov <juri@jurta.org>
+
+ * isearch.el (isearch-abort): Don't quit if search has
+ an incomplete regexp (isearch-error is non-nil). (Bug#7534)
+
+2011-01-15 Mark Diekhans <markd@soe.ucsc.edu>
+
+ * files.el (backup-buffer): Make last-resort backup file in
+ .emacs.d (Bug#6953).
+
+ * subr.el (locate-user-emacs-file): If .emacs.d does not exist,
+ make it with permission 700.
+
+2011-01-15 Kenichi Handa <handa@m17n.org>
+
+ * mail/rmailmm.el (rmail-mime-insert-header): Set
+ rmail-mime-coding-system to a cons whose car is the last coding
+ system used to decode the header.
+ (rmail-mime-find-header-encoding): New function.
+ (rmail-mime-insert-decoded-text): Override
+ rmail-mime-coding-system if it is a cons.
+ (rmail-show-mime): If only a header part was decoded, find the
+ coding system while ignoring mm-charset-override-alist.
+
+2011-01-15 Chong Yidong <cyd@stupidchicken.com>
+
+ * subr.el (event-start, event-end): Doc fix (Bug#7826).
+
+2011-01-15 Kenichi Handa <handa@m17n.org>
+
+ * mail/rmailmm.el (rmail-mime-next-item)
+ (rmail-mime-previous-item): Delete them.
+ (rmail-mime-shown-mode): Recursively call for children.
+ (rmail-mime-hidden-mode): Delete the 2nd arg TOP. Callers
+ changed.
+ (rmail-mime-raw-mode): Recursively call for children.
+ (rmail-mode-map): Change mapping of tab and backtab to
+ forward-button and backward-button respectively.
+ (rmail-mime-insert-tagline): Always insert "Hide" or "Show"
+ button.
+ (rmail-mime-update-tagline): New function.
+ (rmail-mime-insert-text): Call rmail-mime-update-tagline if the
+ body display is changed.
+ (rmail-mime-toggle-button): Renamed from rmail-mime-image.
+ (rmail-mime-image): Delete this button type.
+ (rmail-mime-toggle): New button type.
+ (rmail-mime-insert-bulk): Call rmail-mime-update-tagline if the
+ body display is changed. Change the save button label to "Save".
+ Don't process show/hide button here.
+ (rmail-mime-insert-multipart): Call rmail-mime-update-tagline if
+ the body display is changed. Unconditionally call
+ rmail-mime-insert for children.
+ (rmail-mime-handle): Update `display' vector of the just inserted
+ entity.
+ (rmail-mime-process): If mail-header-parse-content-type returns
+ nil, use "text/plain" as the fallback type.
+ (rmail-mime-insert): For raw-mode, recursively call
+ rmail-mim-insert for children.
+ (rmail-mime): Handle the case that the current buffer is not rmail
+ buffer (e.g. in summary buffer).
+
+2011-01-15 Kenichi Handa <handa@m17n.org>
+
+ * mail/rmailmm.el (rmail-mime-next-item)
+ (rmail-mime-previous-item): Skip the body of a non-multipart
+ entity if a tagline is shown.
+
+2011-01-15 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * tmm.el (tmm-get-keymap): Skip bindings without labels (bug#7721).
+ (tmm-prompt): Simplify.
+ (tmm-add-prompt): Remove unused var `win'.
+
+ * whitespace.el (global-whitespace-newline-mode): Fix call (bug#7810)
+ to minor mode which used nil accidentally to mean "turn off".
+
+2011-01-15 Michael Albinus <michael.albinus@gmx.de>
+
+ * net/tramp-sh.el (tramp-find-inline-compress)
+ (tramp-get-inline-coding): Quote command after pipe symbol for
+ local calls under W32. (Bug#6784)
+
+2011-01-15 Michael Albinus <michael.albinus@gmx.de>
+
+ * net/tramp.el (tramp-default-method): Initialize with pscp/plink
+ only when running under W32.
+
+2011-01-15 Eli Zaretskii <eliz@gnu.org>
+
+ * progmodes/grep.el (grep-compute-defaults): Quote the program
+ file name after the pipe symbol in Grep templates. (Bug#6784)
+ * jka-compr.el (jka-compr-partial-uncompress): Likewise.
+
+2011-01-15 Lennart Borgman <lennart.borgman@gmail.com>
+
+ * buff-menu.el (Buffer-menu-buffer-list): New var.
+ (Buffer-menu-revert-function, list-buffers-noselect): Use it, so a
+ restricted buffer list is not lost on revert (Bug#7749).
+
+2011-01-15 Eric Hanchrow <eric.hanchrow@gmail.com>
+
+ * net/ldap.el (ldap-search-internal): Discard stderr output.
+
+2011-01-15 Eli Zaretskii <eliz@gnu.org>
+
+ * files.el (directory-abbrev-alist): Doc fix. (Bug#7777)
+
+2011-01-15 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * vc-bzr.el (vc-bzr-annotate-time): Tweak previous change.
+
+2011-01-15 Kenichi Handa <handa@m17n.org>
+
+ * mail/rmailmm.el (rmail-mime-insert-bulk): Display an unknown
+ part as a plain text.
+ (rmail-mime-process-multipart): Set the default content-type to
+ nil for unknown multipart subtypes (bug#7651).
+
2011-01-14 Stefan Monnier <monnier@iro.umontreal.ca>
+ * hexl.el (hexl-mode-old-*): Remove.
+ (hexl-mode--old-var-vals): New var to replace them.
+ (hexl-mode--minor-mode-p, hexl-mode--setq-local): New funs.
+ (hexl-mode, hexl-follow-line, hexl-activate-ruler):
+ Use them to set local vars (bug#7846).
+ (hexl-mode-exit): Use hexl-mode--old-var-vals to restore state.
+ (hexl-backward-short, hexl-backward-word, hexl-scroll-down)
+ (hexl-scroll-up, hexl-end-of-1k-page, hexl-end-of-512b-page): Simplify.
+
* vc/smerge-mode.el: Resolve comment conflicts more aggressively.
(smerge-resolve--normalize-re): New var.
(smerge-resolve--extract-comment, smerge-resolve--normalize): New funs.
diff --git a/lisp/ChangeLog.1 b/lisp/ChangeLog.1
index 922c5c9d33..8f73a76fb8 100644
--- a/lisp/ChangeLog.1
+++ b/lisp/ChangeLog.1
@@ -3265,4 +3265,3 @@
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: b6060738-7fac-4c9c-80ae-67995bae78a7
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index b9eda9a6ba..f316431c1d 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -23552,4 +23552,3 @@ See ChangeLog.9 for earlier changes.
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: 5fcf8004-6f58-452a-b9d6-6950323a19c1
diff --git a/lisp/ChangeLog.11 b/lisp/ChangeLog.11
index 2fd903b49d..80f6c55c24 100644
--- a/lisp/ChangeLog.11
+++ b/lisp/ChangeLog.11
@@ -14354,4 +14354,3 @@ See ChangeLog.10 for earlier changes.
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: 2fe8d7b0-27e3-4634-a0b7-db70ff071825
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index e591dab293..46a5ce4f0d 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -33366,4 +33366,3 @@ See ChangeLog.11 for earlier changes.
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: e39939be-dab3-400e-86f5-0e2701a883c1
diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14
index 2919d6f655..3788dcaf31 100644
--- a/lisp/ChangeLog.14
+++ b/lisp/ChangeLog.14
@@ -20568,4 +20568,3 @@ See ChangeLog.13 for earlier changes.
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: c241c1f9-d668-48bf-920a-2897ed0340bc
diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2
index 57ae07d0f1..babeda746c 100644
--- a/lisp/ChangeLog.2
+++ b/lisp/ChangeLog.2
@@ -4010,4 +4010,3 @@ See ChangeLog.1 for earlier changes.
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: c315ba16-14ba-4b07-86e6-013a18f11be7
diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3
index 07b5e8ed6f..a8d9580f16 100644
--- a/lisp/ChangeLog.3
+++ b/lisp/ChangeLog.3
@@ -12456,4 +12456,3 @@ See ChangeLog.2 for earlier changes.
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: f07a3446-5672-464a-8fdc-2ca92e8e7b2a
diff --git a/lisp/ChangeLog.4 b/lisp/ChangeLog.4
index f0e9ea6a60..79214a5db8 100644
--- a/lisp/ChangeLog.4
+++ b/lisp/ChangeLog.4
@@ -8954,4 +8954,3 @@ See ChangeLog.3 for earlier changes.
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: 91035822-35c7-44a9-8417-2454b88c3db2
diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5
index 247f22936a..5a5e5d3699 100644
--- a/lisp/ChangeLog.5
+++ b/lisp/ChangeLog.5
@@ -9283,4 +9283,3 @@ See ChangeLog.4 for earlier changes.
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: 1a8fbb45-25d0-48e2-a926-29ca4e3d343a
diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index 3626be96a1..4f42e191fc 100644
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -8040,4 +8040,3 @@ See ChangeLog.5 for earlier changes.
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: f90e8ffe-6bd0-4423-97d9-637ac4382520
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index 649ebb2c4b..fdbae2c289 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -23125,4 +23125,3 @@ See ChangeLog.6 for earlier changes.
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: 0995d517-13da-45ab-9c2d-7911aa25512b
diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8
index 5ff7885d2f..d93e9ddec5 100644
--- a/lisp/ChangeLog.8
+++ b/lisp/ChangeLog.8
@@ -10011,4 +10011,3 @@ See ChangeLog.7 for earlier changes.
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: efdc1531-ed46-4e14-be59-bee4b23088f3
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index d3a7b391a0..1e9b3d16f9 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -20711,4 +20711,3 @@ See ChangeLog.8 for earlier changes.
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: a7cd2b86-43eb-409b-883f-3700fa85334f
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index ccea4894e8..2dd3cd0632 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -1,7 +1,7 @@
;;; abbrev.el --- abbrev mode commands for Emacs
-;; Copyright (C) 1985, 1986, 1987, 1992, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1987, 1992, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: abbrev convenience
diff --git a/lisp/abbrevlist.el b/lisp/abbrevlist.el
index b22b2afdd1..9d34ae2ef1 100644
--- a/lisp/abbrevlist.el
+++ b/lisp/abbrevlist.el
@@ -53,5 +53,4 @@
(provide 'abbrevlist)
-;; arch-tag: 178f0638-6597-4c16-bcee-576c3d8e9217
;;; abbrevlist.el ends here
diff --git a/lisp/align.el b/lisp/align.el
index 72c12e14ab..0dff2873e9 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -1605,5 +1605,4 @@ aligner would have dealt with are."
(run-hooks 'align-load-hook)
-;; arch-tag: ef79cccf-1db8-4888-a8a1-d7ce2d1532f7
;;; align.el ends here
diff --git a/lisp/allout.el b/lisp/allout.el
index 3415012218..63af7457d9 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -1,7 +1,7 @@
;;; allout.el --- extensive outline mode for use alone and with other modes
-;; Copyright (C) 1992, 1993, 1994, 2001, 2002, 2003, 2004, 2005,
-;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006,
+;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Ken Manheimer <ken dot manheimer at gmail dot com>
;; Maintainer: Ken Manheimer <ken dot manheimer at gmail dot com>
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index 8321edb21b..8b12d737f4 100644
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -594,5 +594,4 @@ ESCAPE-SEQ is a SGR control sequences such as \\033[34m. The parameter
(provide 'ansi-color)
-;; arch-tag: 00726118-9432-44fd-b72d-d2af7591c99c
;;; ansi-color.el ends here
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 21b9ef6409..696d5de9b0 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -1137,5 +1137,4 @@ If non-nil TEXT is a string that will be printed as a heading."
(provide 'apropos)
-;; arch-tag: d56fa2ac-e56b-4ce3-84ff-852f9c0dc66e
;;; apropos.el ends here
diff --git a/lisp/autoarg.el b/lisp/autoarg.el
index 693163d0db..3b596b7ef2 100644
--- a/lisp/autoarg.el
+++ b/lisp/autoarg.el
@@ -144,5 +144,4 @@ which invoked this function, excluding the Autoarg keymap."
(provide 'autoarg)
-;; arch-tag: 2ba2ab4f-d60e-402a-ae4d-37e29af723c2
;;; autoarg.el ends here
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index e096fb5107..a5634dde5a 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -410,5 +410,4 @@ insert a template for the file depending on the mode of the buffer."
(provide 'autoinsert)
-;; arch-tag: 5b6630ac-c735-43cf-b097-b78c622af909
;;; autoinsert.el ends here
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index 5abe12fae6..4caf0cafc5 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -576,5 +576,4 @@ the timer when no buffers need to be checked."
(run-hooks 'auto-revert-load-hook)
-;; arch-tag: f6bcb07b-4841-477e-9e44-b18678e58876
;;; autorevert.el ends here
diff --git a/lisp/avoid.el b/lisp/avoid.el
index 7c87282bed..853567d366 100644
--- a/lisp/avoid.el
+++ b/lisp/avoid.el
@@ -409,5 +409,4 @@ definition of \"random distance\".)"
(if mouse-avoidance-mode
(mouse-avoidance-mode mouse-avoidance-mode))
-;; arch-tag: 64ad4ef8-a870-4183-8d96-3aa93b7a6800
;;; avoid.el ends here
diff --git a/lisp/battery.el b/lisp/battery.el
index 3acb467a2d..1b13f46691 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -553,5 +553,4 @@ MATCH-NUM in the match. Otherwise, return nil."
(provide 'battery)
-;; arch-tag: 65916f50-4754-4b6b-ac21-0b510f545a37
;;; battery.el ends here
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 040b1afea8..c1df92b2e9 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -1214,5 +1214,4 @@ if `inhibit-field-text-motion' is non-nil."
;; no-update-autoloads: t
;; End:
-;; arch-tag: 23b5c7e6-e47b-49ed-8c6c-ed213c5fffe0
;;; bindings.el ends here
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 60bed24ce1..2ce63fb637 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1,7 +1,8 @@
;;; bookmark.el --- set bookmarks, maybe annotate them, jump to them later
-;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 2001, 2002, 2003, 2004,
+;; 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Karl Fogel <kfogel@red-bean.com>
;; Maintainer: Karl Fogel <kfogel@red-bean.com>
diff --git a/lisp/bs.el b/lisp/bs.el
index 03780dea9a..4b6812aeaf 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -1486,5 +1486,4 @@ name of buffer configuration."
;; Now provide feature bs
(provide 'bs)
-;; arch-tag: c0d9ab34-bf06-4368-ae9d-af88878e6802
;;; bs.el ends here
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 4eac52ac4a..679d0fe8ff 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -1,7 +1,8 @@
;;; buff-menu.el --- buffer menu main function and support functions -*- coding:utf-8 -*-
-;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 2000, 2001, 2002,
+;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: convenience
@@ -112,9 +113,15 @@ A nil value means sort by visited order (the default).")
This variable determines whether reverting the buffer lists only
file buffers. It affects both manual reverting and reverting by
Auto Revert Mode.")
-
(make-variable-buffer-local 'Buffer-menu-files-only)
+(defvar Buffer-menu--buffers nil
+ "If non-nil, list of buffers shown in the current buffer-menu.
+This variable determines whether reverting the buffer lists only
+this buffers. It affects both manual reverting and reverting by
+Auto Revert Mode.")
+(make-variable-buffer-local 'Buffer-menu--buffers)
+
(defvar Info-current-file) ;; from info.el
(defvar Info-current-node) ;; from info.el
@@ -282,7 +289,7 @@ Letters do not insert themselves; instead, they are commands.
;; interactively current buffer is correctly identified with a `.'
;; by `list-buffers-noselect'.
(with-current-buffer (window-buffer)
- (list-buffers-noselect Buffer-menu-files-only))
+ (list-buffers-noselect Buffer-menu-files-only Buffer-menu--buffers))
(if oline
(while (setq prop (next-single-property-change prop 'buffer))
(when (eq (get-text-property prop 'buffer) oline)
@@ -919,6 +926,7 @@ For more information, see the function `buffer-menu'."
(and desired-point
(goto-char desired-point))
(setq Buffer-menu-files-only files-only)
+ (setq Buffer-menu--buffers buffer-list)
(set-buffer-modified-p nil)
(current-buffer))))
diff --git a/lisp/button.el b/lisp/button.el
index d2ab92b02e..c52e3d8e37 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -477,5 +477,4 @@ Returns the button found."
(provide 'button)
-;; arch-tag: 5f2c7627-413b-4097-b282-630f89d9c5e9
;;; button.el ends here
diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el
index 7732c1c7f2..ba8b0ac7ef 100644
--- a/lisp/calc/calc-aent.el
+++ b/lisp/calc/calc-aent.el
@@ -1,7 +1,7 @@
;;; calc-aent.el --- algebraic entry functions for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Dave Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
@@ -1271,5 +1271,4 @@ If the current Calc language does not use placeholders, return nil."
;; generated-autoload-file: "calc-loaddefs.el"
;; End:
-;; arch-tag: 5599e45d-e51e-44bb-9a20-9f4ed8c96c32
;;; calc-aent.el ends here
diff --git a/lisp/calc/calc-alg.el b/lisp/calc/calc-alg.el
index 2f1b4cc4ad..f0348d7453 100644
--- a/lisp/calc/calc-alg.el
+++ b/lisp/calc/calc-alg.el
@@ -1914,5 +1914,4 @@
(provide 'calc-alg)
-;; arch-tag: 52e7dcdf-9688-464d-a02b-4bbe789348d0
;;; calc-alg.el ends here
diff --git a/lisp/calc/calc-arith.el b/lisp/calc/calc-arith.el
index bec3c0661c..cf395e79b3 100644
--- a/lisp/calc/calc-arith.el
+++ b/lisp/calc/calc-arith.el
@@ -3067,5 +3067,4 @@
(provide 'calc-arith)
-;; arch-tag: 6c396b5b-14c6-40ed-bb2a-7cc2e8111465
;;; calc-arith.el ends here
diff --git a/lisp/calc/calc-bin.el b/lisp/calc/calc-bin.el
index 3cd5b7af30..fb09c3305c 100644
--- a/lisp/calc/calc-bin.el
+++ b/lisp/calc/calc-bin.el
@@ -854,5 +854,4 @@ the size of a Calc bignum digit.")
(provide 'calc-bin)
-;; arch-tag: f6dba7bc-53b2-41ae-919c-c266ab0ca8b3
;;; calc-bin.el ends here
diff --git a/lisp/calc/calc-comb.el b/lisp/calc/calc-comb.el
index a282a4fbf2..5f0c733a91 100644
--- a/lisp/calc/calc-comb.el
+++ b/lisp/calc/calc-comb.el
@@ -1027,5 +1027,4 @@
(provide 'calc-comb)
-;; arch-tag: 1d75ee9b-0815-42bd-a321-bb3dc001cc02
;;; calc-comb.el ends here
diff --git a/lisp/calc/calc-cplx.el b/lisp/calc/calc-cplx.el
index 88df0c385f..fdc9372ddc 100644
--- a/lisp/calc/calc-cplx.el
+++ b/lisp/calc/calc-cplx.el
@@ -355,5 +355,4 @@
(provide 'calc-cplx)
-;; arch-tag: de73a331-941c-4507-ae76-46c76adc70dd
;;; calc-cplx.el ends here
diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el
index 74ab819de3..b6685b6182 100644
--- a/lisp/calc/calc-embed.el
+++ b/lisp/calc/calc-embed.el
@@ -1382,5 +1382,4 @@ The command \\[yank] can retrieve it from there."
;; generated-autoload-file: "calc-loaddefs.el"
;; End:
-;; arch-tag: 1b8f311e-fba1-40d3-b8c3-1d6f68fd26fc
;;; calc-embed.el ends here
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 21ca02728b..7042c40790 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -1,7 +1,7 @@
;;; calc-ext.el --- various extension functions for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
@@ -3504,5 +3504,4 @@ A key may contain additional specs for Inverse, Hyperbolic, and Inv+Hyp.")
;; coding: utf-8
;; End:
-;; arch-tag: 1814ba7f-a390-49dc-9e25-a5adc205e97e
;;; calc-ext.el ends here
diff --git a/lisp/calc/calc-fin.el b/lisp/calc/calc-fin.el
index 78eb1447ec..6ab96d12da 100644
--- a/lisp/calc/calc-fin.el
+++ b/lisp/calc/calc-fin.el
@@ -410,5 +410,4 @@
(provide 'calc-fin)
-;; arch-tag: 82f30ca8-d02f-4b33-84b4-bb6ecd84597b
;;; calc-fin.el ends here
diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el
index 2d94455cb9..24fc05282e 100644
--- a/lisp/calc/calc-forms.el
+++ b/lisp/calc/calc-forms.el
@@ -1922,5 +1922,4 @@ and ends on the last Sunday of October at 2 a.m."
(provide 'calc-forms)
-;; arch-tag: a3d8f33b-9508-4043-8060-d02b8c9c750c
;;; calc-forms.el ends here
diff --git a/lisp/calc/calc-frac.el b/lisp/calc/calc-frac.el
index ca6030328a..ca9d4e6f8e 100644
--- a/lisp/calc/calc-frac.el
+++ b/lisp/calc/calc-frac.el
@@ -234,5 +234,4 @@
(provide 'calc-frac)
-;; arch-tag: 89d65274-0b3b-42d8-aacd-eaf86da5b4ea
;;; calc-frac.el ends here
diff --git a/lisp/calc/calc-funcs.el b/lisp/calc/calc-funcs.el
index 780dc2acfc..7509749b32 100644
--- a/lisp/calc/calc-funcs.el
+++ b/lisp/calc/calc-funcs.el
@@ -1009,5 +1009,4 @@
(provide 'calc-funcs)
-;; arch-tag: 421ddb7a-550f-4dda-a31c-06638ebfc43a
;;; calc-funcs.el ends here
diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el
index e98fe5745a..37db8ebbd7 100644
--- a/lisp/calc/calc-graph.el
+++ b/lisp/calc/calc-graph.el
@@ -1506,5 +1506,4 @@ This \"dumb\" driver will be present in Gnuplot 3.0."
(provide 'calc-graph)
-;; arch-tag: e4b06a52-c386-4d54-a2bb-7c0a0ef533c2
;;; calc-graph.el ends here
diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el
index 066785fc8f..847eccf658 100644
--- a/lisp/calc/calc-help.el
+++ b/lisp/calc/calc-help.el
@@ -688,5 +688,4 @@ C-w Describe how there is no warranty for Calc."
(provide 'calc-help)
-;; arch-tag: 2d347593-7591-449e-a64a-93dab5f2f686
;;; calc-help.el ends here
diff --git a/lisp/calc/calc-incom.el b/lisp/calc/calc-incom.el
index 07b5702bcc..4c3a37a76d 100644
--- a/lisp/calc/calc-incom.el
+++ b/lisp/calc/calc-incom.el
@@ -230,5 +230,4 @@
(provide 'calc-incom)
-;; arch-tag: b8001270-4dc7-481b-a3e3-a952e19b390d
;;; calc-incom.el ends here
diff --git a/lisp/calc/calc-keypd.el b/lisp/calc/calc-keypd.el
index 71946421dc..47297c6d45 100644
--- a/lisp/calc/calc-keypd.el
+++ b/lisp/calc/calc-keypd.el
@@ -1,7 +1,7 @@
;;; calc-keypd.el --- mouse-capable keypad input for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
diff --git a/lisp/calc/calc-lang.el b/lisp/calc/calc-lang.el
index 8b55fabe7b..c761c73a3e 100644
--- a/lisp/calc/calc-lang.el
+++ b/lisp/calc/calc-lang.el
@@ -1,7 +1,7 @@
;;; calc-lang.el --- calc language functions
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
@@ -2497,5 +2497,4 @@ order to Calc's."
;; coding: utf-8
;; End:
-;; arch-tag: 483bfe15-f290-4fef-bb7d-ce65be687f2e
;;; calc-lang.el ends here
diff --git a/lisp/calc/calc-macs.el b/lisp/calc/calc-macs.el
index 8da071276f..e7a2b149ab 100644
--- a/lisp/calc/calc-macs.el
+++ b/lisp/calc/calc-macs.el
@@ -207,5 +207,4 @@
(provide 'calc-macs)
-;; arch-tag: 08ba8ec2-fcff-4b80-a079-ec661bdb057e
;;; calc-macs.el ends here
diff --git a/lisp/calc/calc-map.el b/lisp/calc/calc-map.el
index 0ffc15d6a4..a37fe5375f 100644
--- a/lisp/calc/calc-map.el
+++ b/lisp/calc/calc-map.el
@@ -1274,5 +1274,4 @@
(provide 'calc-map)
-;; arch-tag: 980eac49-00e0-4870-b72a-e726b74c7990
;;; calc-map.el ends here
diff --git a/lisp/calc/calc-math.el b/lisp/calc/calc-math.el
index cd1b86d6b9..047f3d24d7 100644
--- a/lisp/calc/calc-math.el
+++ b/lisp/calc/calc-math.el
@@ -2165,5 +2165,4 @@ If this can't be done, return NIL."
(provide 'calc-math)
-;; arch-tag: c7367e8e-d0b8-4f70-8577-2fb3f31dbb4c
;;; calc-math.el ends here
diff --git a/lisp/calc/calc-menu.el b/lisp/calc/calc-menu.el
index 40f8ff9987..78d7ac5981 100644
--- a/lisp/calc/calc-menu.el
+++ b/lisp/calc/calc-menu.el
@@ -1461,4 +1461,3 @@
(provide 'calc-menu)
-;; arch-tag: 9612c86a-cd4f-4baa-ab0b-40af7344d21f
diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el
index 14968834cd..aea4f1b068 100644
--- a/lisp/calc/calc-misc.el
+++ b/lisp/calc/calc-misc.el
@@ -963,5 +963,4 @@ doing 'M-x toggle-debug-on-error', then reproducing the bug.
;; generated-autoload-file: "calc-loaddefs.el"
;; End:
-;; arch-tag: 7984d9d0-62e5-41dc-afb8-e904b975f250
;;; calc-misc.el ends here
diff --git a/lisp/calc/calc-mode.el b/lisp/calc/calc-mode.el
index e9edd0c172..caee8997a5 100644
--- a/lisp/calc/calc-mode.el
+++ b/lisp/calc/calc-mode.el
@@ -677,5 +677,4 @@
(provide 'calc-mode)
-;; arch-tag: ecc70eea-c712-43f2-9085-4205e58d6ddf
;;; calc-mode.el ends here
diff --git a/lisp/calc/calc-mtx.el b/lisp/calc/calc-mtx.el
index 1c2a74d2a8..1dc160cc1e 100644
--- a/lisp/calc/calc-mtx.el
+++ b/lisp/calc/calc-mtx.el
@@ -365,5 +365,4 @@
(provide 'calc-mtx)
-;; arch-tag: fc0947b1-90e1-4a23-8950-d8ead9c3a306
;;; calc-mtx.el ends here
diff --git a/lisp/calc/calc-nlfit.el b/lisp/calc/calc-nlfit.el
index 985d9326fc..68c4da24ce 100644
--- a/lisp/calc/calc-nlfit.el
+++ b/lisp/calc/calc-nlfit.el
@@ -818,4 +818,3 @@
(provide 'calc-nlfit)
-;; arch-tag: 6eba3cd6-f48b-4a84-8174-10c15a024928
diff --git a/lisp/calc/calc-poly.el b/lisp/calc/calc-poly.el
index c06ce9be46..40da9bd12e 100644
--- a/lisp/calc/calc-poly.el
+++ b/lisp/calc/calc-poly.el
@@ -1200,5 +1200,4 @@ If no partial fraction representation can be found, return nil."
(provide 'calc-poly)
-;; arch-tag: d2566c51-2ccc-45f1-8c50-f3462c2953ff
;;; calc-poly.el ends here
diff --git a/lisp/calc/calc-prog.el b/lisp/calc/calc-prog.el
index a1463634fe..efdb8fc88e 100644
--- a/lisp/calc/calc-prog.el
+++ b/lisp/calc/calc-prog.el
@@ -2365,5 +2365,4 @@ Redefine the corresponding command."
(provide 'calc-prog)
-;; arch-tag: 4c5a183b-c9e5-4632-bb3f-e41a764518b0
;;; calc-prog.el ends here
diff --git a/lisp/calc/calc-rewr.el b/lisp/calc/calc-rewr.el
index f7c5727a0c..86bb340f4a 100644
--- a/lisp/calc/calc-rewr.el
+++ b/lisp/calc/calc-rewr.el
@@ -2108,5 +2108,4 @@
(provide 'calc-rewr)
-;; arch-tag: ca8d7b7d-bff1-4535-90f3-e2241f5e786b
;;; calc-rewr.el ends here
diff --git a/lisp/calc/calc-rules.el b/lisp/calc/calc-rules.el
index d5ebe715c8..8199449759 100644
--- a/lisp/calc/calc-rules.el
+++ b/lisp/calc/calc-rules.el
@@ -445,5 +445,4 @@ fitparam(n) = x := x ]"))
(provide 'calc-rules)
-;; arch-tag: 0ed54a52-38f3-4ed7-9ca7-b8ecf8f2febe
;;; calc-rules.el ends here
diff --git a/lisp/calc/calc-sel.el b/lisp/calc/calc-sel.el
index f2d82612e7..46442dd68c 100644
--- a/lisp/calc/calc-sel.el
+++ b/lisp/calc/calc-sel.el
@@ -876,5 +876,4 @@
(provide 'calc-sel)
-;; arch-tag: e5169792-777d-428f-bff5-acca66813fa2
;;; calc-sel.el ends here
diff --git a/lisp/calc/calc-stat.el b/lisp/calc/calc-stat.el
index 9605a059f1..f3d4e08ee1 100644
--- a/lisp/calc/calc-stat.el
+++ b/lisp/calc/calc-stat.el
@@ -583,5 +583,4 @@
(provide 'calc-stat)
-;; arch-tag: 423858e9-8513-489c-9f35-710cd9d9c307
;;; calc-stat.el ends here
diff --git a/lisp/calc/calc-store.el b/lisp/calc/calc-store.el
index ccef6f745d..35f1fa0c95 100644
--- a/lisp/calc/calc-store.el
+++ b/lisp/calc/calc-store.el
@@ -1,7 +1,7 @@
;;; calc-store.el --- value storage functions for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
@@ -681,5 +681,4 @@
;; coding: utf-8
;; End:
-;; arch-tag: 2fbfec82-a521-42ca-bcd8-4f254ae6313e
;;; calc-store.el ends here
diff --git a/lisp/calc/calc-stuff.el b/lisp/calc/calc-stuff.el
index 2078080d6f..c1fdea5770 100644
--- a/lisp/calc/calc-stuff.el
+++ b/lisp/calc/calc-stuff.el
@@ -295,5 +295,4 @@ With a prefix, push that prefix as a number onto the stack."
(provide 'calc-stuff)
-;; arch-tag: 789332ef-a178-49d3-8fb7-5d7ed7e21f56
;;; calc-stuff.el ends here
diff --git a/lisp/calc/calc-trail.el b/lisp/calc/calc-trail.el
index 5e490dfc7c..16ee4835d7 100644
--- a/lisp/calc/calc-trail.el
+++ b/lisp/calc/calc-trail.el
@@ -181,5 +181,4 @@
(provide 'calc-trail)
-;; arch-tag: 59b76655-d882-4aab-a3ee-b83870e530d0
;;; calc-trail.el ends here
diff --git a/lisp/calc/calc-undo.el b/lisp/calc/calc-undo.el
index 72cc2e62f7..508385be39 100644
--- a/lisp/calc/calc-undo.el
+++ b/lisp/calc/calc-undo.el
@@ -148,5 +148,4 @@
(provide 'calc-undo)
-;; arch-tag: eeb485d2-fb3d-454a-9d79-450af1f50d6c
;;; calc-undo.el ends here
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index 0c622b15a7..cab4c1f8e4 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -1,7 +1,7 @@
;;; calc-units.el --- unit conversion functions for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
@@ -1557,5 +1557,4 @@ If EXPR is nil, return nil."
;; coding: utf-8
;; End:
-;; arch-tag: e993314f-3adc-4191-be61-4ef8874881c4
;;; calc-units.el ends here
diff --git a/lisp/calc/calc-vec.el b/lisp/calc/calc-vec.el
index 504e8c426a..a645b7611b 100644
--- a/lisp/calc/calc-vec.el
+++ b/lisp/calc/calc-vec.el
@@ -1675,5 +1675,4 @@ of two matrices is a matrix."
(provide 'calc-vec)
-;; arch-tag: 7902a7af-ec69-440a-8635-ebb4db263402
;;; calc-vec.el ends here
diff --git a/lisp/calc/calc-yank.el b/lisp/calc/calc-yank.el
index ec801c7e59..29f0fafc2d 100644
--- a/lisp/calc/calc-yank.el
+++ b/lisp/calc/calc-yank.el
@@ -1,7 +1,7 @@
;;; calc-yank.el --- kill-ring functionality for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index e03295f811..0006fb0f33 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -3838,5 +3838,4 @@ See Info node `(calc)Defining Functions'."
;; coding: utf-8
;; End:
-;; arch-tag: 0c3b170c-4ce6-4eaf-8d9b-5834d1fe938f
;;; calc.el ends here
diff --git a/lisp/calc/calcalg2.el b/lisp/calc/calcalg2.el
index 9f8df92a0f..22a134706f 100644
--- a/lisp/calc/calcalg2.el
+++ b/lisp/calc/calcalg2.el
@@ -3669,5 +3669,4 @@
(provide 'calcalg2)
-;; arch-tag: f2932ec8-dd63-418b-a542-11a644b9d4c4
;;; calcalg2.el ends here
diff --git a/lisp/calc/calcalg3.el b/lisp/calc/calcalg3.el
index 600d21303c..5c7632d40e 100644
--- a/lisp/calc/calcalg3.el
+++ b/lisp/calc/calcalg3.el
@@ -1928,5 +1928,4 @@
(provide 'calcalg3)
-;; arch-tag: ff9f2920-8111-48b5-b3fa-b0682c3e44a6
;;; calcalg3.el ends here
diff --git a/lisp/calc/calccomp.el b/lisp/calc/calccomp.el
index c083b6605f..645ecf020b 100644
--- a/lisp/calc/calccomp.el
+++ b/lisp/calc/calccomp.el
@@ -1,7 +1,7 @@
;;; calccomp.el --- composition functions for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: David Gillespie <daveg@synaptics.com>
;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
@@ -1675,5 +1675,4 @@
;; coding: utf-8
;; End:
-;; arch-tag: 7c45d10a-a286-4dab-af49-7ae8989fbf78
;;; calccomp.el ends here
diff --git a/lisp/calc/calcsel2.el b/lisp/calc/calcsel2.el
index dfe79d07a8..41d61e634e 100644
--- a/lisp/calc/calcsel2.el
+++ b/lisp/calc/calcsel2.el
@@ -300,5 +300,4 @@
(provide 'calcsel2)
-;; arch-tag: 7c5b8d65-b8f0-45d9-820d-9930f8ee114b
;;; calcsel2.el ends here
diff --git a/lisp/calculator.el b/lisp/calculator.el
index 0a4e5d7ae6..1e9bb68906 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -1824,5 +1824,4 @@ To use this, apply a binary operator (evaluate it), then call this."
(provide 'calculator)
-;; arch-tag: a1b9766c-af8a-4a74-b466-65ad8eeb0c73
;;; calculator.el ends here
diff --git a/lisp/calendar/cal-bahai.el b/lisp/calendar/cal-bahai.el
index aabaffeb34..d95136b421 100644
--- a/lisp/calendar/cal-bahai.el
+++ b/lisp/calendar/cal-bahai.el
@@ -361,5 +361,4 @@ Prefix argument ARG will make the entry nonmarking."
;; coding: utf-8
;; End:
-;; arch-tag: c1cb1d67-862a-4264-a01c-41cb4df01f14
;;; cal-bahai.el ends here
diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el
index 3c3148aca3..c91669d578 100644
--- a/lisp/calendar/cal-china.el
+++ b/lisp/calendar/cal-china.el
@@ -686,5 +686,4 @@ Echo Chinese date unless NOECHO is non-nil."
(provide 'cal-china)
-;; arch-tag: 7e5b7e0d-676c-47e3-8696-93e7ea0ab644
;;; cal-china.el ends here
diff --git a/lisp/calendar/cal-coptic.el b/lisp/calendar/cal-coptic.el
index 68841b9342..7030b0bd93 100644
--- a/lisp/calendar/cal-coptic.el
+++ b/lisp/calendar/cal-coptic.el
@@ -269,5 +269,4 @@ Echo Ethiopic date unless NOECHO is t."
(provide 'cal-coptic)
-;; arch-tag: 72d49161-25df-4072-9312-b182cdca7627
;;; cal-coptic.el ends here
diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el
index bb98da1668..1481d650e7 100644
--- a/lisp/calendar/cal-dst.el
+++ b/lisp/calendar/cal-dst.el
@@ -474,5 +474,4 @@ Conversion to daylight saving time is done according to
(provide 'cal-dst)
-;; arch-tag: a141d204-213c-4ca5-bdc6-f9df3aa92aad
;;; cal-dst.el ends here
diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el
index c18d55529f..1279dd2910 100644
--- a/lisp/calendar/cal-french.el
+++ b/lisp/calendar/cal-french.el
@@ -1,7 +1,8 @@
;;; cal-french.el --- calendar functions for the French Revolutionary calendar
;; Copyright (C) 1988, 1989, 1992, 1994, 1995, 1997, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
;; Maintainer: Glenn Morris <rgm@gnu.org>
@@ -269,5 +270,4 @@ Echo French Revolutionary date unless NOECHO is non-nil."
;; coding: utf-8
;; End:
-;; arch-tag: 7e8045a3-8609-46b5-9cde-cf40ce541cf9
;;; cal-french.el ends here
diff --git a/lisp/calendar/cal-html.el b/lisp/calendar/cal-html.el
index 89b1e89a3b..ef9f3a4ad9 100644
--- a/lisp/calendar/cal-html.el
+++ b/lisp/calendar/cal-html.el
@@ -443,5 +443,4 @@ specified by EVENT. Note that any existing output files are overwritten."
(provide 'cal-html)
-;; arch-tag: 4e73377d-d2c1-46ea-a103-02c111da5f57
;;; cal-html.el ends here
diff --git a/lisp/calendar/cal-islam.el b/lisp/calendar/cal-islam.el
index 4e8488000e..02550b751b 100644
--- a/lisp/calendar/cal-islam.el
+++ b/lisp/calendar/cal-islam.el
@@ -345,5 +345,4 @@ Prefix argument ARG makes the entry nonmarking."
(provide 'cal-islam)
-;; arch-tag: a951b6c1-6f47-48d5-bac3-1b505cd719f7
;;; cal-islam.el ends here
diff --git a/lisp/calendar/cal-iso.el b/lisp/calendar/cal-iso.el
index f95049ead3..8b896a4dee 100644
--- a/lisp/calendar/cal-iso.el
+++ b/lisp/calendar/cal-iso.el
@@ -155,5 +155,4 @@ Interactively, goes to the first day of the specified week."
(provide 'cal-iso)
-;; arch-tag: 3c0154cc-d30f-4981-9f60-42bdf7a468f6
;;; cal-iso.el ends here
diff --git a/lisp/calendar/cal-julian.el b/lisp/calendar/cal-julian.el
index 0713d235f2..bbc4b11332 100644
--- a/lisp/calendar/cal-julian.el
+++ b/lisp/calendar/cal-julian.el
@@ -218,5 +218,4 @@ Echo astronomical (Julian) day number unless NOECHO is non-nil."
(provide 'cal-julian)
-;; arch-tag: 0520acdd-1c60-4188-9aa8-9b8c24d856ae
;;; cal-julian.el ends here
diff --git a/lisp/calendar/cal-mayan.el b/lisp/calendar/cal-mayan.el
index 0fd9a628c7..8165748949 100644
--- a/lisp/calendar/cal-mayan.el
+++ b/lisp/calendar/cal-mayan.el
@@ -390,5 +390,4 @@ Echo Mayan date unless NOECHO is non-nil."
(provide 'cal-mayan)
-;; arch-tag: 54f35144-cd0f-4873-935a-a60129de07df
;;; cal-mayan.el ends here
diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el
index e15211cd77..cd90877248 100644
--- a/lisp/calendar/cal-menu.el
+++ b/lisp/calendar/cal-menu.el
@@ -281,5 +281,4 @@ is non-nil."
(provide 'cal-menu)
-;; arch-tag: aa81cf73-ce89-48a4-97ec-9ef861e87fe9
;;; cal-menu.el ends here
diff --git a/lisp/calendar/cal-move.el b/lisp/calendar/cal-move.el
index a6a1ae7a47..e919146864 100644
--- a/lisp/calendar/cal-move.el
+++ b/lisp/calendar/cal-move.el
@@ -406,5 +406,4 @@ Negative DAY counts backward from end of year."
(provide 'cal-move)
-;; arch-tag: d0883c46-7e16-4914-8ff8-8f67e699b781
;;; cal-move.el ends here
diff --git a/lisp/calendar/cal-persia.el b/lisp/calendar/cal-persia.el
index 646b14e3da..fe18160307 100644
--- a/lisp/calendar/cal-persia.el
+++ b/lisp/calendar/cal-persia.el
@@ -218,5 +218,4 @@ Echo Persian date unless NOECHO is non-nil."
(provide 'cal-persia)
-;; arch-tag: 2832383c-e4b4-4dc2-8ee9-cfbdd53e5e2d
;;; cal-persia.el ends here
diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el
index f4d39167ba..a0134241ad 100644
--- a/lisp/calendar/cal-tex.el
+++ b/lisp/calendar/cal-tex.el
@@ -1832,5 +1832,4 @@ Add trailing COMMENT if present."
(provide 'cal-tex)
-;; arch-tag: ca8168a4-5a00-4508-a565-17e3bccce6d0
;;; cal-tex.el ends here
diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el
index e4e4db1ee6..30e1ea5447 100644
--- a/lisp/calendar/cal-x.el
+++ b/lisp/calendar/cal-x.el
@@ -189,5 +189,4 @@ See `calendar-frame-setup' for more information."
(provide 'cal-x)
-;; arch-tag: c6dbddca-ae84-442d-87fc-244b76e38e17
;;; cal-x.el ends here
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index c19e6f5ffd..78ba115638 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -1,7 +1,8 @@
;;; holidays.el --- holiday functions for the calendar package
;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1997, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
;; Maintainer: Glenn Morris <rgm@gnu.org>
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index 680a2ee91e..3daa807faf 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -2295,5 +2295,4 @@ the entry."
(provide 'icalendar)
-;; arch-tag: 74fdbe8e-0451-4e38-bb61-4416e822f4fc
;;; icalendar.el ends here
diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el
index 53c7f9b1a6..e60437c560 100644
--- a/lisp/calendar/lunar.el
+++ b/lisp/calendar/lunar.el
@@ -408,5 +408,4 @@ as governed by the values of `calendar-daylight-savings-starts',
(provide 'lunar)
-;; arch-tag: 72f0b8a4-7bcc-4a1b-b67a-ff53c4a1d222
;;; lunar.el ends here
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index bcaf4ac57e..4f1e4557e5 100644
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -1065,5 +1065,4 @@ Requires floating point."
(provide 'solar)
-;; arch-tag: bc0ff693-df58-4666-bde4-2a7837ccb8fe
;;; solar.el ends here
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index 3e47485aad..48e68842d5 100644
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -973,5 +973,4 @@ If INCLUDE-SEP is non-nil, return point after the separator."
(provide 'todo-mode)
-;; arch-tag: 6fd91be5-776e-4464-a109-da4ea0e4e497
;;; todo-mode.el ends here
diff --git a/lisp/case-table.el b/lisp/case-table.el
index ab4f83e810..75b51582ea 100644
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@@ -175,5 +175,4 @@ SYNTAX should be \" \", \"w\", \".\" or \"_\"."
(provide 'case-table)
-;; arch-tag: 3c2cf885-2c9a-449a-9972-2e269191896d
;;; case-table.el ends here
diff --git a/lisp/cdl.el b/lisp/cdl.el
index ca7ea59ed5..6a99f66e56 100644
--- a/lisp/cdl.el
+++ b/lisp/cdl.el
@@ -45,5 +45,4 @@
(provide 'cdl)
-;; arch-tag: b8e95a6e-2387-4077-ad9a-af54b09b8615
;;; cdl.el ends here
diff --git a/lisp/cedet/cedet-cscope.el b/lisp/cedet/cedet-cscope.el
index afb06044f2..09ad5bd027 100644
--- a/lisp/cedet/cedet-cscope.el
+++ b/lisp/cedet/cedet-cscope.el
@@ -173,5 +173,4 @@ there is already a database in DIR."
(provide 'cedet-cscope)
-;; arch-tag: 9973f1ad-f13b-4399-bc67-7f488478d78d
;;; cedet-cscope.el ends here
diff --git a/lisp/cedet/cedet-files.el b/lisp/cedet/cedet-files.el
index b20cb3a172..c48a1c36a7 100644
--- a/lisp/cedet/cedet-files.el
+++ b/lisp/cedet/cedet-files.el
@@ -90,5 +90,4 @@ specific conversions during tests."
(provide 'cedet-files)
-;; arch-tag: 4884c616-82c3-475d-ac9f-039e3431a702
;;; cedet-files.el ends here
diff --git a/lisp/cedet/cedet-global.el b/lisp/cedet/cedet-global.el
index 8ac4ba1d0b..3fe8256125 100644
--- a/lisp/cedet/cedet-global.el
+++ b/lisp/cedet/cedet-global.el
@@ -186,5 +186,4 @@ If a database already exists, then just update it."
(provide 'cedet-global)
-;; arch-tag: 0d0d3ac2-91ef-4820-bb2b-1d59ccf38392
;;; cedet-global.el ends here
diff --git a/lisp/cedet/cedet-idutils.el b/lisp/cedet/cedet-idutils.el
index 1f8470ac20..71773d1461 100644
--- a/lisp/cedet/cedet-idutils.el
+++ b/lisp/cedet/cedet-idutils.el
@@ -200,5 +200,4 @@ IDUtils must start from scratch when updating a database."
(provide 'cedet-idutils)
-;; arch-tag: 663ca082-5b3d-4384-8710-cc74f990b501
;;; cedet-idutils.el ends here
diff --git a/lisp/cedet/cedet.el b/lisp/cedet/cedet.el
index 7abc5c543f..600aac2faa 100644
--- a/lisp/cedet/cedet.el
+++ b/lisp/cedet/cedet.el
@@ -132,5 +132,4 @@ if the package has not been loaded."
(provide 'cedet)
-;; arch-tag: ad4b0b63-d1f9-4a41-b003-9bbb2feb5226
;;; cedet.el ends here
diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el
index ad5f5ca01a..36f64aa567 100644
--- a/lisp/cedet/data-debug.el
+++ b/lisp/cedet/data-debug.el
@@ -1083,5 +1083,4 @@ If the result is a list or vector, then use the data debugger to display it."
(if (featurep 'eieio)
(require 'eieio-datadebug))
-;; arch-tag: 4807227d-08e7-45c4-8ea5-9e4595c3bfb1
;;; data-debug.el ends here
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 84d56bcdb5..b57585567a 100644
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -1,7 +1,7 @@
;;; ede.el --- Emacs Development Environment gloss
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; Keywords: project, make
diff --git a/lisp/cedet/ede/autoconf-edit.el b/lisp/cedet/ede/autoconf-edit.el
index 0f7ea3fea2..16d860e257 100644
--- a/lisp/cedet/ede/autoconf-edit.el
+++ b/lisp/cedet/ede/autoconf-edit.el
@@ -1,6 +1,7 @@
;;; ede/autoconf-edit.el --- Keymap for autoconf
-;; Copyright (C) 1998, 1999, 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; Keywords: project
diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el
index 5665d28384..002d3d4027 100644
--- a/lisp/cedet/ede/cpp-root.el
+++ b/lisp/cedet/ede/cpp-root.el
@@ -538,5 +538,4 @@ Note: This needs some work."
;; generated-autoload-load-name: "ede/cpp-root"
;; End:
-;; arch-tag: c3ac8160-cba6-447e-8b9c-accb7e2d942e
;;; ede/cpp-root.el ends here
diff --git a/lisp/cedet/ede/dired.el b/lisp/cedet/ede/dired.el
index 68a2899f3a..a107dab665 100644
--- a/lisp/cedet/ede/dired.el
+++ b/lisp/cedet/ede/dired.el
@@ -84,5 +84,4 @@ negative, force off."
(provide 'ede/dired)
-;; arch-tag: 95d3e0a7-a8b7-43a9-b7df-ba647e4c56f6
;;; ede/dired.el ends here
diff --git a/lisp/cedet/ede/emacs.el b/lisp/cedet/ede/emacs.el
index 1ea35ea8c2..fc02bdc5a9 100644
--- a/lisp/cedet/ede/emacs.el
+++ b/lisp/cedet/ede/emacs.el
@@ -299,5 +299,4 @@ Knows about how the Emacs source tree is organized."
;; generated-autoload-load-name: "ede/emacs"
;; End:
-;; arch-tag: 7cd0be95-663d-4101-8799-2f8216fd8233
;;; ede/emacs.el ends here
diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el
index 595845a190..c92275c583 100644
--- a/lisp/cedet/ede/files.el
+++ b/lisp/cedet/ede/files.el
@@ -501,5 +501,4 @@ Argument DIR is the directory to trim upwards."
;; generated-autoload-load-name: "ede/files"
;; End:
-;; arch-tag: 28e17358-0208-4678-828c-23fb0e783fd6
;;; ede/files.el ends here
diff --git a/lisp/cedet/ede/linux.el b/lisp/cedet/ede/linux.el
index a9f87f3dcf..ac70191434 100644
--- a/lisp/cedet/ede/linux.el
+++ b/lisp/cedet/ede/linux.el
@@ -245,5 +245,4 @@ Knows about how the Linux source tree is organized."
;; generated-autoload-load-name: "ede/linux"
;; End:
-;; arch-tag: 41f310c8-b169-4259-8a2d-0ff4bd0a736d
;;; ede/linux.el ends here
diff --git a/lisp/cedet/ede/locate.el b/lisp/cedet/ede/locate.el
index 79f6d63615..1acf436308 100644
--- a/lisp/cedet/ede/locate.el
+++ b/lisp/cedet/ede/locate.el
@@ -348,5 +348,4 @@ that created this EDE locate object."
;; generated-autoload-load-name: "ede/locate"
;; End:
-;; arch-tag: a04cb356-d11c-4f69-bd72-5a8a2aff708c
;;; ede/locate.el ends here
diff --git a/lisp/cedet/ede/make.el b/lisp/cedet/ede/make.el
index fc1e7cc8a1..66ba721206 100644
--- a/lisp/cedet/ede/make.el
+++ b/lisp/cedet/ede/make.el
@@ -105,5 +105,4 @@ If NOERROR is nil, then throw an error on failure. Return t otherwise."
;; generated-autoload-load-name: "ede/make"
;; End:
-;; arch-tag: cc54abdb-7ca5-4902-9735-eda3c6a77852
;;; ede/make.el ends here
diff --git a/lisp/cedet/ede/makefile-edit.el b/lisp/cedet/ede/makefile-edit.el
index 56c4c07236..562f346cce 100644
--- a/lisp/cedet/ede/makefile-edit.el
+++ b/lisp/cedet/ede/makefile-edit.el
@@ -126,5 +126,4 @@ Return nil if it isn't a variable."
(provide 'ede/makefile-edit)
-;; arch-tag: aba26b5f-4306-40d9-b63c-84a9590ac986
;;; ede/makefile-edit.el ends here
diff --git a/lisp/cedet/ede/pconf.el b/lisp/cedet/ede/pconf.el
index a2258c1d16..add7da03e9 100644
--- a/lisp/cedet/ede/pconf.el
+++ b/lisp/cedet/ede/pconf.el
@@ -184,5 +184,4 @@ Results in --add-missing being passed to automake."
(provide 'ede/pconf)
-;; arch-tag: 8d514f68-2abe-4b35-8b4e-bea4fd0c3eab
;;; ede/pconf.el ends here
diff --git a/lisp/cedet/ede/pmake.el b/lisp/cedet/ede/pmake.el
index a9575b6924..0212ee5c02 100644
--- a/lisp/cedet/ede/pmake.el
+++ b/lisp/cedet/ede/pmake.el
@@ -1,7 +1,7 @@
;;; ede-pmake.el --- EDE Generic Project Makefile code generator.
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; Keywords: project, make
diff --git a/lisp/cedet/ede/proj-archive.el b/lisp/cedet/ede/proj-archive.el
index 58499dfe8e..0f4bbc943c 100644
--- a/lisp/cedet/ede/proj-archive.el
+++ b/lisp/cedet/ede/proj-archive.el
@@ -61,5 +61,4 @@ This makes sure that the archive is removed with 'make clean'."
(provide 'ede/proj-archive)
-;; arch-tag: a0b2cfe8-0d11-4a4f-8e47-ebfb11b6ac33
;;; ede/proj-archive.el ends here
diff --git a/lisp/cedet/ede/proj-aux.el b/lisp/cedet/ede/proj-aux.el
index 7d469fe097..bcec712d0e 100644
--- a/lisp/cedet/ede/proj-aux.el
+++ b/lisp/cedet/ede/proj-aux.el
@@ -44,5 +44,4 @@
(provide 'ede/proj-aux)
-;; arch-tag: 668e96e0-2b30-474e-ba3c-9fa4fa696922
;;; ede/proj-aux.el ends here
diff --git a/lisp/cedet/ede/proj-comp.el b/lisp/cedet/ede/proj-comp.el
index 9ec5cc6430..bdcaa1cdbb 100644
--- a/lisp/cedet/ede/proj-comp.el
+++ b/lisp/cedet/ede/proj-comp.el
@@ -355,5 +355,4 @@ compiler it decides to use after inserting in the rule."
(provide 'ede/proj-comp)
-;; arch-tag: ade67766-1a5d-467a-826a-93e95594d717
;;; ede/proj-comp.el ends here
diff --git a/lisp/cedet/ede/proj-elisp.el b/lisp/cedet/ede/proj-elisp.el
index 8e964d5379..f442b1a071 100644
--- a/lisp/cedet/ede/proj-elisp.el
+++ b/lisp/cedet/ede/proj-elisp.el
@@ -1,7 +1,7 @@
;;; ede-proj-elisp.el --- EDE Generic Project Emacs Lisp support
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; Keywords: project, make
diff --git a/lisp/cedet/ede/proj-info.el b/lisp/cedet/ede/proj-info.el
index da2264ffe8..e0084f91e5 100644
--- a/lisp/cedet/ede/proj-info.el
+++ b/lisp/cedet/ede/proj-info.el
@@ -183,5 +183,4 @@ files in the project."
(provide 'ede/proj-info)
-;; arch-tag: e4b7ce51-ae46-4d7c-a5fb-073f435cdcbf
;;; ede/proj-info.el ends here
diff --git a/lisp/cedet/ede/proj-misc.el b/lisp/cedet/ede/proj-misc.el
index 9b35d44daa..5833e37c10 100644
--- a/lisp/cedet/ede/proj-misc.el
+++ b/lisp/cedet/ede/proj-misc.el
@@ -93,5 +93,4 @@ All listed sources are included in the distribution.")
(provide 'ede/proj-misc)
-;; arch-tag: e5e5f8d2-9897-4a1b-8a29-5944ec5a892d
;;; ede/proj-misc.el ends here
diff --git a/lisp/cedet/ede/proj-obj.el b/lisp/cedet/ede/proj-obj.el
index 897f373185..fbca97a08a 100644
--- a/lisp/cedet/ede/proj-obj.el
+++ b/lisp/cedet/ede/proj-obj.el
@@ -320,5 +320,4 @@ Optional argument MORESOURCE is not used."
(provide 'ede/proj-obj)
-;; arch-tag: f521b89f-1a3f-4910-ba81-65de3f421698
;;; ede/proj-obj.el ends here
diff --git a/lisp/cedet/ede/proj-prog.el b/lisp/cedet/ede/proj-prog.el
index e68606f33a..436b8f3503 100644
--- a/lisp/cedet/ede/proj-prog.el
+++ b/lisp/cedet/ede/proj-prog.el
@@ -141,5 +141,4 @@ Optional COMMAND is the command to run in place of asking the user."
(provide 'ede/proj-prog)
-;; arch-tag: 0bfa9364-f385-4745-a846-462146a79a25
;;; ede/proj-prog.el ends here
diff --git a/lisp/cedet/ede/proj-scheme.el b/lisp/cedet/ede/proj-scheme.el
index 64a1750368..2ab9c85c6e 100644
--- a/lisp/cedet/ede/proj-scheme.el
+++ b/lisp/cedet/ede/proj-scheme.el
@@ -46,5 +46,4 @@
(provide 'ede/proj-scheme)
-;; arch-tag: 451081e6-0d45-4560-9821-8ee03e8401ab
;;; ede/proj-scheme.el ends here
diff --git a/lisp/cedet/ede/proj-shared.el b/lisp/cedet/ede/proj-shared.el
index 2e422c640f..ea8b919ef8 100644
--- a/lisp/cedet/ede/proj-shared.el
+++ b/lisp/cedet/ede/proj-shared.el
@@ -207,5 +207,4 @@ We need to override -program which has an LDADD element."
(provide 'ede/proj-shared)
-;; arch-tag: 05f22c3e-b269-4411-9425-65e8fe4ab74a
;;; ede/proj-shared.el ends here
diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index 36a73e02e7..1a3574c00f 100644
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -676,5 +676,4 @@ Optional argument FORCE will force items to be regenerated."
(provide 'ede/proj)
-;; arch-tag: eb8a40f8-0d2c-41c4-b273-af04101d1cdf
;;; ede/proj.el ends here
diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el
index ac3e8bfc6e..c4fd938f11 100644
--- a/lisp/cedet/ede/project-am.el
+++ b/lisp/cedet/ede/project-am.el
@@ -1020,5 +1020,4 @@ per file or in .dir-locals.el or similar."
(provide 'ede/project-am)
-;; arch-tag: 528db935-f186-4240-b647-e305c5b784a2
;;; ede/project-am.el ends here
diff --git a/lisp/cedet/ede/shell.el b/lisp/cedet/ede/shell.el
index c13ce392da..039198b92b 100644
--- a/lisp/cedet/ede/shell.el
+++ b/lisp/cedet/ede/shell.el
@@ -79,5 +79,4 @@ COMMAND is a text string representing the thing to be run."
;; generated-autoload-load-name: "ede/shell"
;; End:
-;; arch-tag: 71bb9dc4-ad1c-4ba3-a95e-531a90500ca9
;;; ede/shell.el ends here
diff --git a/lisp/cedet/ede/simple.el b/lisp/cedet/ede/simple.el
index 14b3a043a6..bea08178e3 100644
--- a/lisp/cedet/ede/simple.el
+++ b/lisp/cedet/ede/simple.el
@@ -117,5 +117,4 @@ Each directory needs a project file to control it.")
(provide 'ede/simple)
-;; arch-tag: a0c4264a-89ce-4364-afab-2512acd3b22a
;;; ede/simple.el ends here
diff --git a/lisp/cedet/ede/source.el b/lisp/cedet/ede/source.el
index fa555c13fa..5e55f4df3b 100644
--- a/lisp/cedet/ede/source.el
+++ b/lisp/cedet/ede/source.el
@@ -170,5 +170,4 @@ Used to guess header files, but uses the auxsource regular expression."
(provide 'ede/source)
-;; arch-tag: 60165fe2-920e-4adf-8531-25655388467d
;;; ede/source.el ends here
diff --git a/lisp/cedet/ede/speedbar.el b/lisp/cedet/ede/speedbar.el
index c7ea005e6c..12637b35d3 100644
--- a/lisp/cedet/ede/speedbar.el
+++ b/lisp/cedet/ede/speedbar.el
@@ -1,7 +1,7 @@
;;; ede/speedbar.el --- Speedbar viewing of EDE projects
-;; Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005, 2007, 2008,
+;; 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; Keywords: project, make, tags
diff --git a/lisp/cedet/ede/srecode.el b/lisp/cedet/ede/srecode.el
index 6cd288b534..63fc5adcc8 100644
--- a/lisp/cedet/ede/srecode.el
+++ b/lisp/cedet/ede/srecode.el
@@ -91,5 +91,4 @@ Note: Just like `srecode-insert', but templates found in 'ede app."
(provide 'ede/srecode)
-;; arch-tag: 75bec542-7cc8-41a4-b5a0-8fb247609f03
;;; ede/srecode.el ends here
diff --git a/lisp/cedet/ede/system.el b/lisp/cedet/ede/system.el
index e10e4686fd..8e1513930f 100644
--- a/lisp/cedet/ede/system.el
+++ b/lisp/cedet/ede/system.el
@@ -143,5 +143,4 @@ Download tramp, and use /r:machine: for names on remote sites w/out FTP access."
;; generated-autoload-load-name: "ede/system"
;; End:
-;; arch-tag: a974ea44-151e-488b-b5d4-df2c05be6fe6
;;; ede/system.el ends here
diff --git a/lisp/cedet/ede/util.el b/lisp/cedet/ede/util.el
index 749fbd51fa..27b2833023 100644
--- a/lisp/cedet/ede/util.el
+++ b/lisp/cedet/ede/util.el
@@ -101,5 +101,4 @@ If BUFFER isn't specified, use the current buffer."
;; generated-autoload-load-name: "ede/util"
;; End:
-;; arch-tag: 3cddf449-7f6a-4c76-86dd-04142c60eba2
;;; ede/util.el ends here
diff --git a/lisp/cedet/inversion.el b/lisp/cedet/inversion.el
index 24f87ff322..a52e91e1d2 100644
--- a/lisp/cedet/inversion.el
+++ b/lisp/cedet/inversion.el
@@ -538,5 +538,4 @@ The package should have VERSION available for download."
(provide 'inversion)
-;; arch-tag: 7239729c-3051-4d85-bb09-dcf92363aa3b
;;; inversion.el ends here
diff --git a/lisp/cedet/pulse.el b/lisp/cedet/pulse.el
index f74cd5d2f3..a7664453eb 100644
--- a/lisp/cedet/pulse.el
+++ b/lisp/cedet/pulse.el
@@ -255,5 +255,4 @@ Only pulses the line if `pulse-command-advice-flag' is non-nil."
(provide 'pulse)
-;; arch-tag: 6e2f78c1-65b3-4164-a141-872cb1552959
;;; pulse.el ends here
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 889b12da05..a83a9a4280 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -1153,5 +1153,4 @@ minor mode is enabled." t nil)
;; (require 'semantic/load)
-;; arch-tag: 31583e10-6508-41a9-be40-f83d0ae0a4ed
;;; semantic.el ends here
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index a6b8af5af2..92bb0898c6 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -795,5 +795,4 @@ CONTEXT's content is described in `semantic-analyze-current-context'."
;; generated-autoload-load-name: "semantic/analyze"
;; End:
-;; arch-tag: 1102143a-1c05-4631-83e8-45aafc6b4a59
;;; semantic/analyze.el ends here
diff --git a/lisp/cedet/semantic/analyze/complete.el b/lisp/cedet/semantic/analyze/complete.el
index 66d923d579..e22e2e7d9b 100644
--- a/lisp/cedet/semantic/analyze/complete.el
+++ b/lisp/cedet/semantic/analyze/complete.el
@@ -276,5 +276,4 @@ FLAGS can be any number of:
;; generated-autoload-load-name: "semantic/analyze/complete"
;; End:
-;; arch-tag: 97071c7e-2459-4e7a-8875-8cc5bbbc1f4d
;;; semantic/analyze/complete.el ends here
diff --git a/lisp/cedet/semantic/analyze/fcn.el b/lisp/cedet/semantic/analyze/fcn.el
index 9542c32899..4d307e7069 100644
--- a/lisp/cedet/semantic/analyze/fcn.el
+++ b/lisp/cedet/semantic/analyze/fcn.el
@@ -334,5 +334,4 @@ SCOPE is the current scope."
(provide 'semantic/analyze/fcn)
-;; arch-tag: 32525305-515e-4b96-ad11-216d3a99f829
;;; semantic/analyze/fcn.el ends here
diff --git a/lisp/cedet/semantic/analyze/refs.el b/lisp/cedet/semantic/analyze/refs.el
index 65cea0e52f..de82133915 100644
--- a/lisp/cedet/semantic/analyze/refs.el
+++ b/lisp/cedet/semantic/analyze/refs.el
@@ -350,5 +350,4 @@ Only works for tags in the global namespace."
;; generated-autoload-load-name: "semantic/analyze/refs"
;; End:
-;; arch-tag: f8c59a91-1829-42b3-b083-437c6881841c
;;; semantic/analyze/refs.el ends here
diff --git a/lisp/cedet/semantic/bovine.el b/lisp/cedet/semantic/bovine.el
index 82f9108c2c..0b33aaeff3 100644
--- a/lisp/cedet/semantic/bovine.el
+++ b/lisp/cedet/semantic/bovine.el
@@ -293,5 +293,4 @@ list of semantic tokens found."
;; generated-autoload-load-name: "semantic/bovine"
;; End:
-;; arch-tag: 1e820899-2a26-499a-b0c0-57301365a6b0
;;; semantic/bovine.el ends here
diff --git a/lisp/cedet/semantic/bovine/c-by.el b/lisp/cedet/semantic/bovine/c-by.el
index 0308ace619..83ce85c5f0 100644
--- a/lisp/cedet/semantic/bovine/c-by.el
+++ b/lisp/cedet/semantic/bovine/c-by.el
@@ -2194,5 +2194,4 @@
(provide 'semantic/bovine/c-by)
-;; arch-tag: 27da9f71-d2ef-473f-92a7-b0006b1a8491
;;; semantic/bovine/c-by.el ends here
diff --git a/lisp/cedet/semantic/bovine/debug.el b/lisp/cedet/semantic/bovine/debug.el
index 7b2affe151..c5db370f67 100644
--- a/lisp/cedet/semantic/bovine/debug.el
+++ b/lisp/cedet/semantic/bovine/debug.el
@@ -144,5 +144,4 @@ Argument CONDITION is the thrown error condition."
(provide 'semantic/bovine/debug)
-;; arch-tag: d1bf98b3-faeb-4dc3-ac34-cac6264fd94e
;;; semantic/bovine/debug.el ends here
diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el
index 6216915605..c27434f414 100644
--- a/lisp/cedet/semantic/bovine/el.el
+++ b/lisp/cedet/semantic/bovine/el.el
@@ -963,5 +963,4 @@ ELisp variables can be pretty long, so track this one too.")
(provide 'semantic/bovine/el)
-;; arch-tag: d634cbab-9610-4510-9fce-048ae1eb7aa6
;;; semantic/bovine/el.el ends here
diff --git a/lisp/cedet/semantic/bovine/gcc.el b/lisp/cedet/semantic/bovine/gcc.el
index 8c1f6f52f1..c04d4fdb11 100644
--- a/lisp/cedet/semantic/bovine/gcc.el
+++ b/lisp/cedet/semantic/bovine/gcc.el
@@ -221,5 +221,4 @@ It should also include other symbols GCC was compiled with.")
;; generated-autoload-load-name: "semantic/bovine/gcc"
;; End:
-;; arch-tag: 7086f4a0-1ce8-48e2-9783-d750d3765186
;;; semantic/bovine/gcc.el ends here
diff --git a/lisp/cedet/semantic/bovine/make-by.el b/lisp/cedet/semantic/bovine/make-by.el
index 1db454f6ea..ce775f90d5 100644
--- a/lisp/cedet/semantic/bovine/make-by.el
+++ b/lisp/cedet/semantic/bovine/make-by.el
@@ -384,5 +384,4 @@
(provide 'semantic/bovine/make-by)
-;; arch-tag: 8c3749b8-7b19-46e0-af01-2a4d02fd0352
;;; semantic/bovine/make-by.el ends here
diff --git a/lisp/cedet/semantic/bovine/make.el b/lisp/cedet/semantic/bovine/make.el
index d51f9e2140..d3ac80afa1 100644
--- a/lisp/cedet/semantic/bovine/make.el
+++ b/lisp/cedet/semantic/bovine/make.el
@@ -238,5 +238,4 @@ Uses default implementation, and also gets a list of filenames."
;; generated-autoload-load-name: "semantic/bovine/make"
;; End:
-;; arch-tag: 8122d1f5-d4b7-4f6e-b909-d61ac65ef118
;;; semantic/bovine/make.el ends here
diff --git a/lisp/cedet/semantic/bovine/scm-by.el b/lisp/cedet/semantic/bovine/scm-by.el
index ac8211bfc8..7ceffda0eb 100644
--- a/lisp/cedet/semantic/bovine/scm-by.el
+++ b/lisp/cedet/semantic/bovine/scm-by.el
@@ -188,5 +188,4 @@
(provide 'semantic/bovine/scm-by)
-;; arch-tag: 945749cc-a039-434f-bf95-bf2480a506c3
;;; semantic/bovine/scm-by.el ends here
diff --git a/lisp/cedet/semantic/bovine/scm.el b/lisp/cedet/semantic/bovine/scm.el
index 92b61129fb..84eab2e314 100644
--- a/lisp/cedet/semantic/bovine/scm.el
+++ b/lisp/cedet/semantic/bovine/scm.el
@@ -115,5 +115,4 @@ syntax as specified by the syntax table."
;; generated-autoload-load-name: "semantic/bovine/scm"
;; End:
-;; arch-tag: 4f929838-b817-447d-848c-d47789ff140f
;;; semantic/bovine/scm.el ends here
diff --git a/lisp/cedet/semantic/chart.el b/lisp/cedet/semantic/chart.el
index f4d08a7c6c..9c9a8f3633 100644
--- a/lisp/cedet/semantic/chart.el
+++ b/lisp/cedet/semantic/chart.el
@@ -171,5 +171,4 @@ items are charted. TAGTABLE is passed to
(provide 'semantic/chart)
-;; arch-tag: 026573b1-f4f1-4dda-ae77-b6451283ff23
;;; semantic/chart.el ends here
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index f9f7d4b8de..9f8bb2502e 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -2159,5 +2159,4 @@ use `semantic-complete-analyze-inline' to complete."
;; generated-autoload-load-name: "semantic/complete"
;; End:
-;; arch-tag: a07c8f71-e53b-416e-9704-3a99ef101b09
;;; semantic/complete.el ends here
diff --git a/lisp/cedet/semantic/ctxt.el b/lisp/cedet/semantic/ctxt.el
index 2608dfb092..31aa7dc4c3 100644
--- a/lisp/cedet/semantic/ctxt.el
+++ b/lisp/cedet/semantic/ctxt.el
@@ -619,5 +619,4 @@ means that the first symbol might be:
;; generated-autoload-load-name: "semantic/ctxt"
;; End:
-;; arch-tag: 04f3ae3c-78bb-40ca-b112-ba77f5e4ea88
;;; semantic/ctxt.el ends here
diff --git a/lisp/cedet/semantic/db-debug.el b/lisp/cedet/semantic/db-debug.el
index 09e7064069..e866811b57 100644
--- a/lisp/cedet/semantic/db-debug.el
+++ b/lisp/cedet/semantic/db-debug.el
@@ -107,5 +107,4 @@
(provide 'semantic/db-debug)
-;; arch-tag: 9bdc11bd-fb76-4a32-9545-78ed143b7184
;;; semantic/db-debug.el ends here
diff --git a/lisp/cedet/semantic/db-ebrowse.el b/lisp/cedet/semantic/db-ebrowse.el
index e931c40aff..430f85ea88 100644
--- a/lisp/cedet/semantic/db-ebrowse.el
+++ b/lisp/cedet/semantic/db-ebrowse.el
@@ -661,5 +661,4 @@ Return a list of tags."
(provide 'semantic/db-ebrowse)
-;; arch-tag: e7d15223-6074-4c87-baf0-98fdd22ff873
;;; semantic/db-ebrowse.el ends here
diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el
index c842ff61d7..af77362e7f 100644
--- a/lisp/cedet/semantic/db-el.el
+++ b/lisp/cedet/semantic/db-el.el
@@ -343,5 +343,4 @@ Return a list of tags."
(provide 'semantic/db-el)
-;; arch-tag: e54f556e-fa3f-4bc5-9b15-744a659a6e65
;;; semantic/db-el.el ends here
diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el
index 35281c5190..03c39515a1 100644
--- a/lisp/cedet/semantic/db-file.el
+++ b/lisp/cedet/semantic/db-file.el
@@ -452,5 +452,4 @@ Optional NOERROR prevents errors from being displayed."
;; generated-autoload-load-name: "semantic/db-file"
;; End:
-;; arch-tag: f4a0d9de-6c25-4bf3-aff3-a10c58fd575d
;;; semantic/db-file.el ends here
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index 47182bd8a0..8c093b12de 100644
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -1369,5 +1369,4 @@ Return a table of all matching tags."
;; generated-autoload-load-name: "semantic/db-find"
;; End:
-;; arch-tag: 5d4162f5-5092-46d7-beed-55c78aab4116
;;; semantic/db-find.el ends here
diff --git a/lisp/cedet/semantic/db-global.el b/lisp/cedet/semantic/db-global.el
index ddcfde8668..2046a4ce76 100644
--- a/lisp/cedet/semantic/db-global.el
+++ b/lisp/cedet/semantic/db-global.el
@@ -220,5 +220,4 @@ Like `semanticdb-find-tags-for-completion-method' for global."
;; generated-autoload-load-name: "semantic/db-global"
;; End:
-;; arch-tag: ec0edab2-26c2-438f-a3d2-0d953364f8cc
;;; semantic/db-global.el ends here
diff --git a/lisp/cedet/semantic/db-javascript.el b/lisp/cedet/semantic/db-javascript.el
index 40b49195d8..587708afd6 100644
--- a/lisp/cedet/semantic/db-javascript.el
+++ b/lisp/cedet/semantic/db-javascript.el
@@ -307,5 +307,4 @@ Return a list of tags."
(provide 'semantic/db-javascript)
-;; arch-tag: 69cf8ad1-7ea9-41af-851c-41f24c873374
;;; semantic/db-javascript.el ends here
diff --git a/lisp/cedet/semantic/db-mode.el b/lisp/cedet/semantic/db-mode.el
index bbe117a25a..0ec00d3a6c 100644
--- a/lisp/cedet/semantic/db-mode.el
+++ b/lisp/cedet/semantic/db-mode.el
@@ -217,5 +217,4 @@ Argument NEW-TABLE is the new table of tags."
;; generated-autoload-load-name: "semantic/db-mode"
;; End:
-;; arch-tag: f5da903d-2d34-4adf-8572-e60340e1ad59
;;; semantic/db-mode.el ends here
diff --git a/lisp/cedet/semantic/db-ref.el b/lisp/cedet/semantic/db-ref.el
index 0ca49510d3..6330834f56 100644
--- a/lisp/cedet/semantic/db-ref.el
+++ b/lisp/cedet/semantic/db-ref.el
@@ -171,5 +171,4 @@ refreshed before dumping the result."
(provide 'semantic/db-ref)
-;; arch-tag: bea73e70-dbbe-4c30-a58d-289dc3a40172
;;; semantic/db-ref.el ends here
diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el
index b4308674b8..2d2a70caa6 100644
--- a/lisp/cedet/semantic/db-typecache.el
+++ b/lisp/cedet/semantic/db-typecache.el
@@ -622,5 +622,4 @@ If there isn't one, create it.
;; generated-autoload-load-name: "semantic/db-typecache"
;; End:
-;; arch-tag: cd7c37a8-2006-4ead-a037-977ffe7e7624
;;; semanticdb-typecache.el ends here
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index 1d54d2df4f..a4858fe840 100644
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -1040,5 +1040,4 @@ If file does not have tags available, then load the file, and create them."
;; generated-autoload-load-name: "semantic/db"
;; End:
-;; arch-tag: d9f75280-737d-494f-9f70-09a649d27433
;;; semantic/db.el ends here
diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el
index 2271c602b0..5d267c3e38 100644
--- a/lisp/cedet/semantic/debug.el
+++ b/lisp/cedet/semantic/debug.el
@@ -566,5 +566,4 @@ A frame is of the form:
;; generated-autoload-load-name: "semantic/debug"
;; End:
-;; arch-tag: 6f189d2d-8a65-45a5-a7f0-9894625eb860
;;; semantic/debug.el ends here
diff --git a/lisp/cedet/semantic/decorate.el b/lisp/cedet/semantic/decorate.el
index 8690e08806..3bf61f801b 100644
--- a/lisp/cedet/semantic/decorate.el
+++ b/lisp/cedet/semantic/decorate.el
@@ -296,5 +296,4 @@ OVERLAY is passed in by isearch."
(provide 'semantic/decorate)
-;; arch-tag: 30e5b6cb-dba0-41cd-920a-bc1dce267ad8
;;; semantic/decorate.el ends here
diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el
index af4e4463fd..4a2d675f77 100644
--- a/lisp/cedet/semantic/decorate/include.el
+++ b/lisp/cedet/semantic/decorate/include.el
@@ -773,5 +773,4 @@ If TABLE is not in a buffer, do nothing."
;; generated-autoload-load-name: "semantic/decorate/include"
;; End:
-;; arch-tag: c3277137-be3f-43e2-af89-3b14b9bd7479
;;; semantic/decorate/include.el ends here
diff --git a/lisp/cedet/semantic/decorate/mode.el b/lisp/cedet/semantic/decorate/mode.el
index a41b043870..f7f33d09fb 100644
--- a/lisp/cedet/semantic/decorate/mode.el
+++ b/lisp/cedet/semantic/decorate/mode.el
@@ -520,5 +520,4 @@ Use a primary decoration."
;; generated-autoload-load-name: "semantic/decorate/mode"
;; End:
-;; arch-tag: c1ac7888-e323-4467-96d6-18eb2820ed58
;;; semantic/decorate/mode.el ends here
diff --git a/lisp/cedet/semantic/dep.el b/lisp/cedet/semantic/dep.el
index 03a0a2b099..f06b0f6fe3 100644
--- a/lisp/cedet/semantic/dep.el
+++ b/lisp/cedet/semantic/dep.el
@@ -231,5 +231,4 @@ provided mode, not from the current major mode."
;; generated-autoload-load-name: "semantic/dep"
;; End:
-;; arch-tag: f6975d6a-845f-44c5-9a22-5dfeee46dce2
;;; semantic/dep.el ends here
diff --git a/lisp/cedet/semantic/doc.el b/lisp/cedet/semantic/doc.el
index c19b1e39bb..2804ab20e2 100644
--- a/lisp/cedet/semantic/doc.el
+++ b/lisp/cedet/semantic/doc.el
@@ -127,5 +127,4 @@ If NOSNARF is 'lex, then return the lex token."
;; generated-autoload-load-name: "semantic/doc"
;; End:
-;; arch-tag: fe6e965b-4a81-4304-aab8-22ca113194ca
;;; semantic/doc.el ends here
diff --git a/lisp/cedet/semantic/ede-grammar.el b/lisp/cedet/semantic/ede-grammar.el
index a3d901a614..451e15ee3e 100644
--- a/lisp/cedet/semantic/ede-grammar.el
+++ b/lisp/cedet/semantic/ede-grammar.el
@@ -1,6 +1,7 @@
;;; semantic/ede-grammar.el --- EDE support for Semantic Grammar Files
-;; Copyright (C) 2003, 2004, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; Keywords: project, make
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index ff4064195b..3e7ccd387d 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -966,5 +966,4 @@ lost if not transferred into NEWTAG."
;; generated-autoload-load-name: "semantic/edit"
;; End:
-;; arch-tag: 91c7fbf0-a418-4220-a90a-b58c74b450e3
;;; semantic/edit.el ends here
diff --git a/lisp/cedet/semantic/find.el b/lisp/cedet/semantic/find.el
index 207c8b0561..c58a6c2648 100644
--- a/lisp/cedet/semantic/find.el
+++ b/lisp/cedet/semantic/find.el
@@ -700,5 +700,4 @@ details are available of findable."
;; generated-autoload-load-name: "semantic/find"
;; End:
-;; arch-tag: db00c93e-e561-4bd6-942b-96eca5aaa9a6
;;; semantic/find.el ends here
diff --git a/lisp/cedet/semantic/format.el b/lisp/cedet/semantic/format.el
index 86059de86f..7d4748684b 100644
--- a/lisp/cedet/semantic/format.el
+++ b/lisp/cedet/semantic/format.el
@@ -720,5 +720,4 @@ Optional argument COLOR means highlight the prototype with font-lock colors."
;; generated-autoload-load-name: "semantic/format"
;; End:
-;; arch-tag: deae500e-20b6-437e-8856-884f6c46bc3e
;;; semantic/format.el ends here
diff --git a/lisp/cedet/semantic/fw.el b/lisp/cedet/semantic/fw.el
index 5e0eac28a3..db76530f9a 100644
--- a/lisp/cedet/semantic/fw.el
+++ b/lisp/cedet/semantic/fw.el
@@ -395,5 +395,4 @@ FILE, NOWARN, RAWFILE, and WILDCARDS are passed into `find-file-noselect'"
(provide 'semantic/fw)
-;; arch-tag: e7eeffbf-112b-4665-92fc-5f69479ca2c4
;;; semantic/fw.el ends here
diff --git a/lisp/cedet/semantic/grammar-wy.el b/lisp/cedet/semantic/grammar-wy.el
index 58f7f9900e..ef5b67c361 100644
--- a/lisp/cedet/semantic/grammar-wy.el
+++ b/lisp/cedet/semantic/grammar-wy.el
@@ -475,5 +475,4 @@
(provide 'semantic/grammar-wy)
-;; arch-tag: dd050eb7-84a8-421c-b734-478dd2bd55bc
;;; semantic/grammar-wy.el ends here
diff --git a/lisp/cedet/semantic/html.el b/lisp/cedet/semantic/html.el
index 7da4d409ff..a0dbf9685c 100644
--- a/lisp/cedet/semantic/html.el
+++ b/lisp/cedet/semantic/html.el
@@ -262,5 +262,4 @@ tag with greater section value than LEVEL is found."
;; generated-autoload-load-name: "semantic/html"
;; End:
-;; arch-tag: 2a088b99-4585-46d5-bce8-3a5a8ec5eb2e
;;; semantic/html.el ends here
diff --git a/lisp/cedet/semantic/ia-sb.el b/lisp/cedet/semantic/ia-sb.el
index 0e9c6456ac..08f2357eab 100644
--- a/lisp/cedet/semantic/ia-sb.el
+++ b/lisp/cedet/semantic/ia-sb.el
@@ -367,5 +367,4 @@ TEXT TAG and INDENT are the details."
;; generated-autoload-load-name: "semantic/ia-sb"
;; End:
-;; arch-tag: 4ab9f509-6978-415f-9938-9266edad9886
;;; semantic/ia-sb.el ends here
diff --git a/lisp/cedet/semantic/ia.el b/lisp/cedet/semantic/ia.el
index feb6abe5ee..44f2db382a 100644
--- a/lisp/cedet/semantic/ia.el
+++ b/lisp/cedet/semantic/ia.el
@@ -445,5 +445,4 @@ parts of the parent classes are displayed."
;; generated-autoload-load-name: "semantic/ia"
;; End:
-;; arch-tag: ceeed1f2-e5b6-4f7c-a85a-a2f8ee0193ca
;;; semantic/ia.el ends here
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index a545eb469e..865315ebe0 100644
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -1315,5 +1315,4 @@ mouse-3: popup context menu"
;; generated-autoload-load-name: "semantic/idle"
;; End:
-;; arch-tag: 4bfd54da-5023-4cc1-91ae-e1fefc1a8d1b
;;; semantic-idle.el ends here
diff --git a/lisp/cedet/semantic/java.el b/lisp/cedet/semantic/java.el
index f0c6b44c10..c280c9668d 100644
--- a/lisp/cedet/semantic/java.el
+++ b/lisp/cedet/semantic/java.el
@@ -459,5 +459,4 @@ removed from the result list."
(provide 'semantic/java)
-;; arch-tag: ca14cb88-9343-48a9-9aa0-14d05be8d49f
;;; semantic/java.el ends here
diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el
index 9c4d4ecff1..cad85b1f42 100644
--- a/lisp/cedet/semantic/lex-spp.el
+++ b/lisp/cedet/semantic/lex-spp.el
@@ -1230,5 +1230,4 @@ If BUFFER is not provided, use the current buffer."
;; generated-autoload-load-name: "semantic/lex-spp"
;; End:
-;; arch-tag: 8877d83e-07ea-4d86-a960-e3562138d8a5
;;; semantic-lex-spp.el ends here
diff --git a/lisp/cedet/semantic/mru-bookmark.el b/lisp/cedet/semantic/mru-bookmark.el
index 0f2a3f87dd..5ad1ce736e 100644
--- a/lisp/cedet/semantic/mru-bookmark.el
+++ b/lisp/cedet/semantic/mru-bookmark.el
@@ -401,5 +401,4 @@ Useful for debugging mrub problems."
;; generated-autoload-load-name: "semantic/mru-bookmark"
;; End:
-;; arch-tag: 297fa190-2942-460b-941d-f117db4e1fbf
;;; semantic/mru-bookmark.el ends here
diff --git a/lisp/cedet/semantic/sb.el b/lisp/cedet/semantic/sb.el
index b6efb03094..8f8217aa2d 100644
--- a/lisp/cedet/semantic/sb.el
+++ b/lisp/cedet/semantic/sb.el
@@ -416,5 +416,4 @@ Returns the tag list, or t for an error."
(provide 'semantic/sb)
-;; arch-tag: 82aa0570-9e27-41a3-a834-2641dbb2f829
;;; semantic/sb.el ends here
diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el
index 8e121264d6..d0f0a8460c 100644
--- a/lisp/cedet/semantic/scope.el
+++ b/lisp/cedet/semantic/scope.el
@@ -814,5 +814,4 @@ hits in order, with the first tag being in the closest scope."
;; generated-autoload-load-name: "semantic/scope"
;; End:
-;; arch-tag: 056ab514-3e28-4d6e-84ed-9283dce5a01e
;;; semantic/scope.el ends here
diff --git a/lisp/cedet/semantic/senator.el b/lisp/cedet/semantic/senator.el
index fd2989adbe..4ba0de9816 100644
--- a/lisp/cedet/semantic/senator.el
+++ b/lisp/cedet/semantic/senator.el
@@ -861,5 +861,4 @@ Use a senator search function when semantic isearch mode is enabled."
;; generated-autoload-load-name: "semantic/senator"
;; End:
-;; arch-tag: 397100d0-e2db-467e-8c19-d8d4d99d51f1
;;; semantic/senator.el ends here
diff --git a/lisp/cedet/semantic/sort.el b/lisp/cedet/semantic/sort.el
index 9ac87187c9..8583c1bac9 100644
--- a/lisp/cedet/semantic/sort.el
+++ b/lisp/cedet/semantic/sort.el
@@ -566,5 +566,4 @@ See `semantic-tag-external-class' for details."
;; generated-autoload-load-name: "semantic/sort"
;; End:
-;; arch-tag: 9231c8e7-ac7f-4b35-9302-651a02e5fef0
;;; semantic-sort.el ends here
diff --git a/lisp/cedet/semantic/symref/filter.el b/lisp/cedet/semantic/symref/filter.el
index 068f859512..260e9e7fd3 100644
--- a/lisp/cedet/semantic/symref/filter.el
+++ b/lisp/cedet/semantic/symref/filter.el
@@ -137,5 +137,4 @@ Depends on the SRecode Field editing API."
(provide 'semantic/symref/filter)
-;; arch-tag: 14b9e795-02bf-408b-b375-c3f8ff6a4e38
;;; semantic/symref/filter.el ends here
diff --git a/lisp/cedet/semantic/symref/global.el b/lisp/cedet/semantic/symref/global.el
index 7658ed7db0..b290a0f3c3 100644
--- a/lisp/cedet/semantic/symref/global.el
+++ b/lisp/cedet/semantic/symref/global.el
@@ -70,5 +70,4 @@ Moves cursor to end of the match."
;; generated-autoload-load-name: "semantic/symref/global"
;; End:
-;; arch-tag: 1f061cc0-d8dd-44b1-9de3-3d00cb6e8abe
;;; semantic/symref/global.el ends here
diff --git a/lisp/cedet/semantic/symref/grep.el b/lisp/cedet/semantic/symref/grep.el
index f7f1834a59..6fa2d65eba 100644
--- a/lisp/cedet/semantic/symref/grep.el
+++ b/lisp/cedet/semantic/symref/grep.el
@@ -187,5 +187,4 @@ Moves cursor to end of the match."
;; generated-autoload-load-name: "semantic/symref/grep"
;; End:
-;; arch-tag: 43d4469d-963c-4094-ac6f-99f7490973ce
;;; semantic/symref/grep.el ends here
diff --git a/lisp/cedet/semantic/symref/idutils.el b/lisp/cedet/semantic/symref/idutils.el
index b859db073e..0fc940708e 100644
--- a/lisp/cedet/semantic/symref/idutils.el
+++ b/lisp/cedet/semantic/symref/idutils.el
@@ -72,5 +72,4 @@ Moves cursor to end of the match."
;; generated-autoload-load-name: "semantic/symref/idutils"
;; End:
-;; arch-tag: 7e872652-cbe2-4083-a4d3-2a7c88c4c65c
;;; semantic/symref/idutils.el ends here
diff --git a/lisp/cedet/semantic/tag-ls.el b/lisp/cedet/semantic/tag-ls.el
index 7127a7c206..15d51ebd3f 100644
--- a/lisp/cedet/semantic/tag-ls.el
+++ b/lisp/cedet/semantic/tag-ls.el
@@ -251,5 +251,4 @@ Return the name of TAG found in the toplevel STREAM."
;; generated-autoload-load-name: "semantic/tag-ls"
;; End:
-;; arch-tag: 06041439-e4bf-46f9-ab30-7805888d4464
;;; semantic/tag-ls.el ends here
diff --git a/lisp/cedet/semantic/tag-write.el b/lisp/cedet/semantic/tag-write.el
index 737cd79664..0c3118cc9b 100644
--- a/lisp/cedet/semantic/tag-write.el
+++ b/lisp/cedet/semantic/tag-write.el
@@ -175,5 +175,4 @@ The VALUE is a list of tags."
;; generated-autoload-load-name: "semantic/tag-write"
;; End:
-;; arch-tag: aa2301b3-f0c5-4d73-b456-43eaba5b2198
;;; semantic/tag-write.el ends here
diff --git a/lisp/cedet/semantic/tag.el b/lisp/cedet/semantic/tag.el
index 267f3b9351..15cbcdaadf 100644
--- a/lisp/cedet/semantic/tag.el
+++ b/lisp/cedet/semantic/tag.el
@@ -1369,5 +1369,4 @@ and `semantic-tag-type-interfaces' instead" "23.2")
;; generated-autoload-load-name: "semantic/tag"
;; End:
-;; arch-tag: f7813634-c4f0-4817-a487-cbaa84333353
;;; semantic/tag.el ends here
diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el
index 4959f06507..881d0c6dc4 100644
--- a/lisp/cedet/semantic/texi.el
+++ b/lisp/cedet/semantic/texi.el
@@ -688,5 +688,4 @@ If TAG is nil, it is derived from the deffn under POINT."
(provide 'semantic/texi)
-;; arch-tag: a8649049-46da-407b-a620-d175c1fedca6
;;; semantic/texi.el ends here
diff --git a/lisp/cedet/semantic/util-modes.el b/lisp/cedet/semantic/util-modes.el
index f2798f0d90..36d1479ac6 100644
--- a/lisp/cedet/semantic/util-modes.el
+++ b/lisp/cedet/semantic/util-modes.el
@@ -1011,5 +1011,4 @@ function was called, move the overlay."
;; generated-autoload-load-name: "semantic/util-modes"
;; End:
-;; arch-tag: 18f5a3d8-1fd7-4c17-b149-a313c126987d
;;; semantic/util-modes.el ends here
diff --git a/lisp/cedet/semantic/util.el b/lisp/cedet/semantic/util.el
index 2775153e55..0c0334dcdc 100644
--- a/lisp/cedet/semantic/util.el
+++ b/lisp/cedet/semantic/util.el
@@ -436,5 +436,4 @@ determining which symbols are considered."
;;
(require 'semantic/util-modes)
-;; arch-tag: eaa7808d-83b9-43fe-adf0-4fb742dcb956
;;; semantic/util.el ends here
diff --git a/lisp/cedet/semantic/wisent.el b/lisp/cedet/semantic/wisent.el
index 36c3698943..5135ca0668 100644
--- a/lisp/cedet/semantic/wisent.el
+++ b/lisp/cedet/semantic/wisent.el
@@ -343,5 +343,4 @@ the standard function `semantic-parse-region'."
(provide 'semantic/wisent)
-;; arch-tag: c24ddd69-d41c-4604-8221-29a93fc4fa79
;;; semantic/wisent.el ends here
diff --git a/lisp/cedet/semantic/wisent/comp.el b/lisp/cedet/semantic/wisent/comp.el
index 62b42c9a27..908bb35ee5 100644
--- a/lisp/cedet/semantic/wisent/comp.el
+++ b/lisp/cedet/semantic/wisent/comp.el
@@ -1,7 +1,8 @@
;;; semantic/wisent/comp.el --- GNU Bison for Emacs - Grammar compiler
;; Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; 2004, 2005, 2006, 2007, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: David Ponce <david@dponce.com>
;; Maintainer: David Ponce <david@dponce.com>
diff --git a/lisp/cedet/semantic/wisent/java-tags.el b/lisp/cedet/semantic/wisent/java-tags.el
index b8362c3c55..d7c1b1e7d9 100644
--- a/lisp/cedet/semantic/wisent/java-tags.el
+++ b/lisp/cedet/semantic/wisent/java-tags.el
@@ -121,5 +121,4 @@ Use the alternate LALR(1) parser."
;; generated-autoload-load-name: "semantic/wisent/java-tags"
;; End:
-;; arch-tag: 4125e018-58db-4456-b878-e58c602f4add
;;; semantic/wisent/java-tags.el ends here
diff --git a/lisp/cedet/semantic/wisent/javascript.el b/lisp/cedet/semantic/wisent/javascript.el
index 6731715d12..e5c43f73a2 100644
--- a/lisp/cedet/semantic/wisent/javascript.el
+++ b/lisp/cedet/semantic/wisent/javascript.el
@@ -102,5 +102,4 @@ This function overrides `get-local-variables'."
;; generated-autoload-load-name: "semantic/wisent/javascript"
;; End:
-;; arch-tag: 15416a3a-84ca-4b3b-a13c-e7a1891ec3ea
;;; semantic/wisent/javascript-jv.el ends here
diff --git a/lisp/cedet/semantic/wisent/javat-wy.el b/lisp/cedet/semantic/wisent/javat-wy.el
index 258b1ac4af..5b59fef160 100644
--- a/lisp/cedet/semantic/wisent/javat-wy.el
+++ b/lisp/cedet/semantic/wisent/javat-wy.el
@@ -679,5 +679,4 @@ It ignores whitespaces, newlines and comments."
(provide 'semantic/wisent/javat-wy)
-;; arch-tag: b035ba00-e014-4c71-9bc7-a9dbf3d5b911
;;; semantic/wisent/javat-wy.el ends here
diff --git a/lisp/cedet/semantic/wisent/js-wy.el b/lisp/cedet/semantic/wisent/js-wy.el
index 021002059f..2fd48bbc1a 100644
--- a/lisp/cedet/semantic/wisent/js-wy.el
+++ b/lisp/cedet/semantic/wisent/js-wy.el
@@ -488,5 +488,4 @@
(provide 'semantic/wisent/js-wy)
-;; arch-tag: ff9ecf05-18e6-46a6-a3bb-e7f43f04640f
;;; semantic/wisent/js-wy.el ends here
diff --git a/lisp/cedet/semantic/wisent/wisent.el b/lisp/cedet/semantic/wisent/wisent.el
index 32eb638548..ac73b5f60a 100644
--- a/lisp/cedet/semantic/wisent/wisent.el
+++ b/lisp/cedet/semantic/wisent/wisent.el
@@ -476,5 +476,4 @@ automaton has only one entry point."
(provide 'semantic/wisent/wisent)
-;; arch-tag: c299c5a4-d96f-4f1c-8307-ef2af3c8bdcb
;;; semantic/wisent/wisent.el ends here
diff --git a/lisp/cedet/srecode.el b/lisp/cedet/srecode.el
index 3bc17f0dbf..00fe612f9d 100644
--- a/lisp/cedet/srecode.el
+++ b/lisp/cedet/srecode.el
@@ -52,5 +52,4 @@
(provide 'srecode)
-;; arch-tag: 6c671a1c-40e5-4ed3-ab05-84249c3afdaf
;;; srecode.el ends here
diff --git a/lisp/cedet/srecode/args.el b/lisp/cedet/srecode/args.el
index 0d2f017e6b..43e5d14ee3 100644
--- a/lisp/cedet/srecode/args.el
+++ b/lisp/cedet/srecode/args.el
@@ -186,4 +186,3 @@ do not contain any text from preceding or following text."
;;; srecode/args.el ends here
-;; arch-tag: 645fc31e-30a9-469b-9215-fb320a46ee96
diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el
index b404c4a812..0abbcb3ac6 100644
--- a/lisp/cedet/srecode/compile.el
+++ b/lisp/cedet/srecode/compile.el
@@ -654,5 +654,4 @@ Argument INDENT specifies the indentation level for the list."
;; generated-autoload-load-name: "srecode/compile"
;; End:
-;; arch-tag: d993ffab-2704-4bb2-bd92-eafe803af3be
;;; srecode/compile.el ends here
diff --git a/lisp/cedet/srecode/cpp.el b/lisp/cedet/srecode/cpp.el
index ab9d4a5fe6..62ee6be42e 100644
--- a/lisp/cedet/srecode/cpp.el
+++ b/lisp/cedet/srecode/cpp.el
@@ -213,5 +213,4 @@ special behavior for tag of classes include, using and function."
;; generated-autoload-load-name: "srecode/cpp"
;; End:
-;; arch-tag: 4659755c-88b4-405e-818f-bb1f776a8e82
;;; srecode/cpp.el ends here
diff --git a/lisp/cedet/srecode/ctxt.el b/lisp/cedet/srecode/ctxt.el
index b951788bec..ad42e1b500 100644
--- a/lisp/cedet/srecode/ctxt.el
+++ b/lisp/cedet/srecode/ctxt.el
@@ -244,5 +244,4 @@ This might add the following:
(provide 'srecode/ctxt)
-;; arch-tag: 5a004702-28e5-4e26-9b14-8a78eae49865
;;; srecode/ctxt.el ends here
diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el
index e04aad3306..30052c0749 100644
--- a/lisp/cedet/srecode/dictionary.el
+++ b/lisp/cedet/srecode/dictionary.el
@@ -708,5 +708,4 @@ STATE is the current compiler state."
(provide 'srecode/dictionary)
-;; arch-tag: c664179c-171c-4709-9b56-d5a2fd30e457
;;; srecode/dictionary.el ends here
diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el
index 6d4231f396..210c303055 100644
--- a/lisp/cedet/srecode/document.el
+++ b/lisp/cedet/srecode/document.el
@@ -837,5 +837,4 @@ not account for verb parts."
;; generated-autoload-load-name: "srecode/document"
;; End:
-;; arch-tag: 5ce9b30b-7862-4ab8-b3f8-a4df37a2e0fe
;;; srecode/document.el ends here
diff --git a/lisp/cedet/srecode/el.el b/lisp/cedet/srecode/el.el
index e8c585cca6..9d051d6d20 100644
--- a/lisp/cedet/srecode/el.el
+++ b/lisp/cedet/srecode/el.el
@@ -109,5 +109,4 @@ Calls `srecode-semantic-apply-tag-to-dict-default' first."
;; generated-autoload-load-name: "srecode/el"
;; End:
-;; arch-tag: c1852a36-d45b-4263-8f3e-03f4f3c795d9
;;; srecode/el.el ends here
diff --git a/lisp/cedet/srecode/expandproto.el b/lisp/cedet/srecode/expandproto.el
index 92c5326a85..9ff766ad52 100644
--- a/lisp/cedet/srecode/expandproto.el
+++ b/lisp/cedet/srecode/expandproto.el
@@ -129,5 +129,4 @@
;; generated-autoload-load-name: "srecode/expandproto"
;; End:
-;; arch-tag: f0371b5f-9bec-46a1-9b5d-8dff0e897426
;;; srecode/expandproto.el ends here
diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el
index df556b29e0..4d3f533a35 100644
--- a/lisp/cedet/srecode/extract.el
+++ b/lisp/cedet/srecode/extract.el
@@ -239,5 +239,4 @@ Return nil if nothing was extracted."
(provide 'srecode/extract)
-;; arch-tag: 051f5901-46ae-4319-8c84-16daf971e226
;;; srecode/extract.el ends here
diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el
index 817bb93d2f..ae9bf3502f 100644
--- a/lisp/cedet/srecode/fields.el
+++ b/lisp/cedet/srecode/fields.el
@@ -447,5 +447,4 @@ PRE-LEN is used in the after mode for the length of the changed text."
(provide 'srecode/fields)
-;; arch-tag: 00cea6f0-42ac-4b15-b778-46e6db0bfcb5
;;; srecode/fields.el ends here
diff --git a/lisp/cedet/srecode/filters.el b/lisp/cedet/srecode/filters.el
index 0afd32bbb4..4b8a8abfec 100644
--- a/lisp/cedet/srecode/filters.el
+++ b/lisp/cedet/srecode/filters.el
@@ -54,4 +54,3 @@
;;; srecode/filters.el ends here
-;; arch-tag: fcc95ddc-8d9a-4b15-bb51-2707ead986c7
diff --git a/lisp/cedet/srecode/find.el b/lisp/cedet/srecode/find.el
index 39b7656d00..888e4b6bd9 100644
--- a/lisp/cedet/srecode/find.el
+++ b/lisp/cedet/srecode/find.el
@@ -278,5 +278,4 @@ DEFAULT is what to use if the user presses RET."
(provide 'srecode/find)
-;; arch-tag: 49d18e58-45a0-48f5-92e1-4a1dcd4e36a6
;;; srecode/find.el ends here
diff --git a/lisp/cedet/srecode/getset.el b/lisp/cedet/srecode/getset.el
index bf1a684c19..b865b5ec62 100644
--- a/lisp/cedet/srecode/getset.el
+++ b/lisp/cedet/srecode/getset.el
@@ -363,5 +363,4 @@ Base selection on the field related to POINT."
;; generated-autoload-load-name: "srecode/getset"
;; End:
-;; arch-tag: c2098b7a-df7f-4e8a-a9e3-2be8798a7554
;;; srecode/getset.el ends here
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 1df08d2c74..f69706370d 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -1020,5 +1020,4 @@ template where a ^ inserter occurs."
;; generated-autoload-load-name: "srecode/insert"
;; End:
-;; arch-tag: a5aa3401-924a-4617-8513-2f0f01256872
;;; srecode/insert.el ends here
diff --git a/lisp/cedet/srecode/java.el b/lisp/cedet/srecode/java.el
index 97f4eb3459..5393b83aa6 100644
--- a/lisp/cedet/srecode/java.el
+++ b/lisp/cedet/srecode/java.el
@@ -58,5 +58,4 @@ FILENAME_AS_CLASS - file converted to a Java class name."
;; generated-autoload-load-name: "srecode/java"
;; End:
-;; arch-tag: d796b86c-3a0e-457c-a346-9f1ccfdc5e2c
;;; srecode/java.el ends here
diff --git a/lisp/cedet/srecode/map.el b/lisp/cedet/srecode/map.el
index e3f78ed997..d6da232bd3 100644
--- a/lisp/cedet/srecode/map.el
+++ b/lisp/cedet/srecode/map.el
@@ -415,5 +415,4 @@ Return non-nil if the map changed."
;; generated-autoload-load-name: "srecode/map"
;; End:
-;; arch-tag: dc90c737-1e87-455a-bbd1-6b72cdbfb7fd
;;; srecode/map.el ends here
diff --git a/lisp/cedet/srecode/mode.el b/lisp/cedet/srecode/mode.el
index bdb8172eb5..30797453fb 100644
--- a/lisp/cedet/srecode/mode.el
+++ b/lisp/cedet/srecode/mode.el
@@ -396,5 +396,4 @@ programming modes."
;; generated-autoload-load-name: "srecode/mode"
;; End:
-;; arch-tag: 56ad9d6b-899b-4a68-8636-1432b6bc149b
;;; srecode/mode.el ends here
diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el
index 0926ccf4da..5991b0f9b6 100644
--- a/lisp/cedet/srecode/semantic.el
+++ b/lisp/cedet/srecode/semantic.el
@@ -428,5 +428,4 @@ as `function' will leave point where code might be inserted."
(provide 'srecode/semantic)
-;; arch-tag: b87ccbd6-bd87-48bc-8182-1043a9052d79
;;; srecode/semantic.el ends here
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el
index 7df06a608f..5e16303425 100644
--- a/lisp/cedet/srecode/srt-mode.el
+++ b/lisp/cedet/srecode/srt-mode.el
@@ -740,5 +740,4 @@ When optional BUFFER is provided, search that buffer."
;; generated-autoload-load-name: "srecode/srt-mode"
;; End:
-;; arch-tag: 9c613c25-d885-417a-8f0d-1824b26b22a5
;;; srecode/srt-mode.el ends here
diff --git a/lisp/cedet/srecode/srt-wy.el b/lisp/cedet/srecode/srt-wy.el
index 3dde065c2a..9281451694 100644
--- a/lisp/cedet/srecode/srt-wy.el
+++ b/lisp/cedet/srecode/srt-wy.el
@@ -274,5 +274,4 @@ It ignores whitespace, newlines and comments."
(provide 'srecode/srt-wy)
-;; arch-tag: 1be4c0bc-2a79-4f75-a07a-1ac518f41271
;;; srecode/srt-wy.el ends here
diff --git a/lisp/cedet/srecode/srt.el b/lisp/cedet/srecode/srt.el
index 3fc5f4cb90..e070e59fd9 100644
--- a/lisp/cedet/srecode/srt.el
+++ b/lisp/cedet/srecode/srt.el
@@ -104,5 +104,4 @@ MODE - The mode of this buffer. If not declared yet, guess."
(provide 'srecode/srt)
-;; arch-tag: fb69da04-0bd6-48fe-b935-f8668420ecaf
;;; srecode/srt.el ends here
diff --git a/lisp/cedet/srecode/table.el b/lisp/cedet/srecode/table.el
index 8cba7aff7f..c80c88c8fb 100644
--- a/lisp/cedet/srecode/table.el
+++ b/lisp/cedet/srecode/table.el
@@ -259,4 +259,3 @@ Use PREDICATE is the same as for the `sort' function."
;;; srecode/table.el ends here
-;; arch-tag: 547d2f1d-2694-49b3-ab13-b2cda6b25b4d
diff --git a/lisp/cedet/srecode/template.el b/lisp/cedet/srecode/template.el
index d127375fbf..d61146e164 100644
--- a/lisp/cedet/srecode/template.el
+++ b/lisp/cedet/srecode/template.el
@@ -72,5 +72,4 @@
;; generated-autoload-load-name: "srecode/template"
;; End:
-;; arch-tag: 037fbca7-e846-4521-b801-3463f50c3080
;;; srecode/template.el ends here
diff --git a/lisp/cedet/srecode/texi.el b/lisp/cedet/srecode/texi.el
index 2ac2a240c0..e581a185cd 100644
--- a/lisp/cedet/srecode/texi.el
+++ b/lisp/cedet/srecode/texi.el
@@ -285,5 +285,4 @@ that class.
;; generated-autoload-load-name: "srecode/texi"
;; End:
-;; arch-tag: 6f0e7f45-2281-49e4-b73c-680cba477094
;;; srecode/texi.el ends here
diff --git a/lisp/chistory.el b/lisp/chistory.el
index 9cc6d86605..bd3539b2e9 100644
--- a/lisp/chistory.el
+++ b/lisp/chistory.el
@@ -189,5 +189,4 @@ and runs the normal hook `command-history-hook'."
(provide 'chistory)
-;; arch-tag: c201a0cd-89f2-4d39-a532-4cb309391dbd
;;; chistory.el ends here
diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el
index be3401ce5b..c319ecf135 100644
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@@ -523,5 +523,4 @@ This is a good place to put keybindings."
(provide 'cmuscheme)
-;; arch-tag: e8795f4a-c496-45a2-97b4-8e0f2a2c57d2
;;; cmuscheme.el ends here
diff --git a/lisp/color.el b/lisp/color.el
index 07044333c4..690cf4fe99 100644
--- a/lisp/color.el
+++ b/lisp/color.el
@@ -1,6 +1,6 @@
;;; color.el --- Color manipulation laboratory routines -*- coding: utf-8; -*-
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Julien Danjou <julien@danjou.info>
;; Keywords: html
diff --git a/lisp/comint.el b/lisp/comint.el
index 4e4ac9f5f9..e45c802127 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1,8 +1,8 @@
;;; comint.el --- general command interpreter in a window stuff
-;; Copyright (C) 1988, 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+;; 2010, 2011 Free Software Foundation, Inc.
;; Author: Olin Shivers <shivers@cs.cmu.edu>
;; Simon Marshall <simon@gnu.org>
diff --git a/lisp/completion.el b/lisp/completion.el
index b0e2c40448..1f052b6029 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -2470,5 +2470,4 @@ TYPE is the type of the wrapper to be added. Can be :before or :under."
(provide 'completion)
-;; arch-tag: 6990dafe-4abd-4a1f-8c42-ffb25e120f5e
;;; completion.el ends here
diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index 02920f10bc..734a3d3ddf 100644
--- a/lisp/cus-dep.el
+++ b/lisp/cus-dep.el
@@ -172,5 +172,4 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
-;; arch-tag: b7b6421a-bf7a-44fd-a382-6f44976bdf68
;;; cus-dep.el ends here
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 7868de8da2..70686296ad 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -4863,5 +4863,4 @@ if that value is non-nil."
(provide 'cus-edit)
-;; arch-tag: 64533aa4-1b1a-48c3-8812-f9dc718e8a6f
;;; cus-edit.el ends here
diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index befccf8a7e..f669310117 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -378,5 +378,4 @@ This means reset FACE to its value in FROM-THEME."
(provide 'cus-face)
-;; arch-tag: 9a5c4b63-0d27-4c92-a5af-f2c7ed764c2b
;;; cus-face.el ends here
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index fbf8016c6d..63cea87168 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -1,7 +1,7 @@
;;; cus-start.el --- define customization properties of builtins
;;
-;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;;
;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
;; Keywords: internal
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index e38cc823eb..df05a30738 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -663,5 +663,4 @@ Theme files are named *-theme.el in `"))
(widget-toggle-action widget event)
(setq custom-theme-allow-multiple-selections (widget-value widget)))
-;; arch-tag: cd6919bc-63af-410e-bae2-b6702e762344
;;; cus-theme.el ends here
diff --git a/lisp/custom.el b/lisp/custom.el
index 2d8891f0e1..f5da8eb595 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -1409,5 +1409,4 @@ This means reset VARIABLE. (The argument IGNORED is ignored)."
(provide 'custom)
-;; arch-tag: 041b6116-aabe-4f9a-902d-74092bc3dab2
;;; custom.el ends here
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 4bc3a33f4e..063ba40874 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -995,5 +995,4 @@ Leaves point at the location of the start of the expansion."
(provide 'dabbrev)
-;; arch-tag: 29e58596-f080-4306-a409-70296cf9d46f
;;; dabbrev.el ends here
diff --git a/lisp/delim-col.el b/lisp/delim-col.el
index 01791b8fc8..422cfbc81a 100644
--- a/lisp/delim-col.el
+++ b/lisp/delim-col.el
@@ -477,5 +477,4 @@ START and END delimits the corners of text rectangle."
(provide 'delim-col)
-;; arch-tag: 1cc0c5c5-1b2a-43e4-9ba5-bf9441cfd1a9
;;; delim-col.el ends here
diff --git a/lisp/delsel.el b/lisp/delsel.el
index 5f08fd8791..bc89e18e85 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -177,5 +177,4 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(provide 'delsel)
-;; arch-tag: 1e388890-1b50-4ed0-9347-763b1343b6ed
;;; delsel.el ends here
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 65761e752b..65590a737f 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -769,5 +769,4 @@ as well as widgets, buttons, overlays, and text properties."
(provide 'descr-text)
-;; arch-tag: fc55a498-f3e9-4312-b5bd-98cc02480af1
;;; descr-text.el ends here
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 9be0ad74ad..dcb8642734 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1312,5 +1312,4 @@ If there are no buffers left to create, kill the timer."
(provide 'desktop)
-;; arch-tag: 221907c3-1771-4fd3-9c2e-c6f700c6ede9
;;; desktop.el ends here
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 7516564aae..e701d4342b 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1,7 +1,8 @@
;;; dired-aux.el --- less commonly used parts of dired
;; Copyright (C) 1985, 1986, 1992, 1994, 1998, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>.
;; Maintainer: FSF
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 591451d5a8..266308ce0b 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -1830,5 +1830,4 @@ variables `dired-x-variable-list' in the message."
;; generated-autoload-file: "dired.el"
;; End:
-;; arch-tag: 71a43ba2-7a00-4793-a028-0613dd7765ae
;;; dired-x.el ends here
diff --git a/lisp/dired.el b/lisp/dired.el
index 8a7aec6c88..13d0a8ff39 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3562,7 +3562,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command
;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown
;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff
-;;;;;; dired-diff) "dired-aux" "dired-aux.el" "5fc17781c25dbe16b7e170aed0ad4d62")
+;;;;;; dired-diff) "dired-aux" "dired-aux.el" "adcb55a439048f158f47c5c96b3dad09")
;;; Generated autoloads from dired-aux.el
(autoload 'dired-diff "dired-aux" "\
@@ -4021,7 +4021,7 @@ true then the type of the file linked to by FILE is printed instead.
;;;***
;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el"
-;;;;;; "0f63715e54b0d001955bdc3680cadcd0")
+;;;;;; "6d47e23fbd9236014786c50618e99f09")
;;; Generated autoloads from dired-x.el
(autoload 'dired-jump "dired-x" "\
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index af45a70b8d..0cf19577ff 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -281,5 +281,4 @@ in `.emacs'."
(provide 'disp-table)
-;; arch-tag: ffe4c28c-960c-47aa-b8a8-ae89d371ffc7
;;; disp-table.el ends here
diff --git a/lisp/dnd.el b/lisp/dnd.el
index 4f70048097..757fc951b5 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -227,5 +227,4 @@ TEXT is the text as a string, WINDOW is the window where the drop happened."
(provide 'dnd)
-;; arch-tag: 0472f6a5-2e8f-4304-9e44-1a0877c771b7
;;; dnd.el ends here
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 12632e8933..5867c74dbf 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -1481,5 +1481,4 @@ See the command `doc-view-mode' for more information on this mode."
;; mode: outline-minor
;; End:
-;; arch-tag: 5d6e5c5e-095f-489e-b4e4-1ca90a7d79be
;;; doc-view.el ends here
diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el
index 213d436161..eaf6ab02ce 100644
--- a/lisp/dos-fns.el
+++ b/lisp/dos-fns.el
@@ -313,5 +313,4 @@ that your video hardware might not support 50-line mode."
(provide 'dos-fns)
-;; arch-tag: 00b03579-8ebb-4a02-8762-5c5a929774ad
;;; dos-fns.el ends here
diff --git a/lisp/dos-vars.el b/lisp/dos-vars.el
index 03bfc88565..1b769fbd0f 100644
--- a/lisp/dos-vars.el
+++ b/lisp/dos-vars.el
@@ -44,5 +44,4 @@ in `standard-display-table' as appropriate for your codepage, if
:type '(hook)
:version "20.3.3")
-;; arch-tag: dce8a0d9-ab29-413f-84ed-8b89d6190546
;;; dos-vars.el ends here
diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el
index c163aae857..c4c9c20b42 100644
--- a/lisp/dos-w32.el
+++ b/lisp/dos-w32.el
@@ -458,5 +458,4 @@ indicates a specific program should be invoked."
(provide 'dos-w32)
-;; arch-tag: dcfefdd2-362f-4fbc-9141-9634f5f4d6a7
;;; dos-w32.el ends here
diff --git a/lisp/double.el b/lisp/double.el
index 19702c9bef..853ba09e2c 100644
--- a/lisp/double.el
+++ b/lisp/double.el
@@ -169,5 +169,4 @@ when pressed twice. See variable `double-map' for details."
(provide 'double)
-;; arch-tag: 2e170036-44cb-4493-bc32-ada0a4395221
;;; double.el ends here
diff --git a/lisp/dynamic-setting.el b/lisp/dynamic-setting.el
index 3597e8338e..1f6f43e75d 100644
--- a/lisp/dynamic-setting.el
+++ b/lisp/dynamic-setting.el
@@ -107,4 +107,3 @@ Changes can be
(define-key special-event-map [config-changed-event]
'dynamic-setting-handle-config-changed-event)
-;; arch-tag: 3a57e78f-1cd6-48b6-ab75-98f160dcc017
diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el
index 843bdcd912..f0550e0521 100644
--- a/lisp/ebuff-menu.el
+++ b/lisp/ebuff-menu.el
@@ -1,7 +1,7 @@
;;; ebuff-menu.el --- electric-buffer-list mode
-;; Copyright (C) 1985, 1986, 1994, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1994, 2001, 2002, 2003, 2004, 2005, 2006,
+;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Richard Mlynarik <mly@ai.mit.edu>
;; Maintainer: FSF
diff --git a/lisp/echistory.el b/lisp/echistory.el
index 8d69d64228..3c0a4a0b8b 100644
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@@ -150,5 +150,4 @@ The Command History listing is recomputed each time this mode is invoked."
(provide 'echistory)
-;; arch-tag: 1e5018fe-190f-44a7-9109-a895dcac4c50
;;; echistory.el ends here
diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index d4b8c3a4f7..2aa80a000b 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -785,5 +785,4 @@ This function assumes that the events can be stored in a string."
(provide 'edmacro)
-;; arch-tag: 726807b4-3ae6-49de-b0ae-b9590973e0d7
;;; edmacro.el ends here
diff --git a/lisp/ehelp.el b/lisp/ehelp.el
index adaff345bf..d0f620e487 100644
--- a/lisp/ehelp.el
+++ b/lisp/ehelp.el
@@ -426,5 +426,4 @@ will select it.)"
(provide 'ehelp)
-;; arch-tag: e0e3037f-42c0-433e-ba18-322c5d951f46
;;; ehelp.el ends here
diff --git a/lisp/electric.el b/lisp/electric.el
index e1c91e8be3..f777ac1af5 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -383,5 +383,4 @@ one of those symbols.")
(provide 'electric)
-;; arch-tag: dae045eb-dc2d-4fb7-9f27-9cc2ce277be8
;;; electric.el ends here
diff --git a/lisp/elide-head.el b/lisp/elide-head.el
index 085e71ad0b..bc603e068a 100644
--- a/lisp/elide-head.el
+++ b/lisp/elide-head.el
@@ -119,5 +119,4 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks."
(provide 'elide-head)
-;; arch-tag: a00e6b5b-6aeb-45b1-b734-63e23df80928
;;; elide-head.el ends here
diff --git a/lisp/emacs-lisp/.gitignore b/lisp/emacs-lisp/.gitignore
index 88830a1c6e..133e79e817 100644
--- a/lisp/emacs-lisp/.gitignore
+++ b/lisp/emacs-lisp/.gitignore
@@ -1,3 +1,2 @@
!*-loaddefs.el
-# arch-tag: d0a60bce-b886-4817-b4c3-9a81ba0308bc
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index c4cee41dcb..a0aab822cf 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -3966,5 +3966,4 @@ Use only in REAL emergencies."
(provide 'advice)
-;; arch-tag: 29f8c9a1-8c88-471f-95d7-e28541c6b7c0
;;; advice.el ends here
diff --git a/lisp/emacs-lisp/assoc.el b/lisp/emacs-lisp/assoc.el
index e90c9df7f8..c506685dd3 100644
--- a/lisp/emacs-lisp/assoc.el
+++ b/lisp/emacs-lisp/assoc.el
@@ -138,5 +138,4 @@ extra values are ignored. Returns the created alist."
(provide 'assoc)
-;; arch-tag: 3e58bd89-d912-4b74-a0dc-6ed9735922bc
;;; assoc.el ends here
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 4fcf3e994c..240d5d3a60 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -1,7 +1,7 @@
;; autoload.el --- maintain autoloads in loaddefs.el
-;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2001, 2002,
-;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2001, 2002, 2003,
+;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
;; Free Software Foundation, Inc.
;; Author: Roland McGrath <roland@gnu.org>
diff --git a/lisp/emacs-lisp/avl-tree.el b/lisp/emacs-lisp/avl-tree.el
index 63774bc229..3892a94788 100644
--- a/lisp/emacs-lisp/avl-tree.el
+++ b/lisp/emacs-lisp/avl-tree.el
@@ -466,5 +466,4 @@ If there is no such element in the tree, the value is nil."
(provide 'avl-tree)
-;; arch-tag: 47e26701-43c9-4222-bd79-739eac6357a9
;;; avl-tree.el ends here
diff --git a/lisp/emacs-lisp/backquote.el b/lisp/emacs-lisp/backquote.el
index 9d43ad5bc1..9cb0a0cd89 100644
--- a/lisp/emacs-lisp/backquote.el
+++ b/lisp/emacs-lisp/backquote.el
@@ -241,5 +241,4 @@ LEVEL is only used internally and indicates the nesting level:
tail))
(t (cons 'list heads)))))
-;; arch-tag: 1a26206a-6b5e-4c56-8e24-2eef0f7e0e7a
;;; backquote.el ends here
diff --git a/lisp/emacs-lisp/benchmark.el b/lisp/emacs-lisp/benchmark.el
index 8f6d8a5d9d..31d3b61c5a 100644
--- a/lisp/emacs-lisp/benchmark.el
+++ b/lisp/emacs-lisp/benchmark.el
@@ -116,5 +116,4 @@ For non-interactive use see also `benchmark-run' and
(provide 'benchmark)
-;; arch-tag: be570e24-4b51-4784-adf3-fa2b56c31946
;;; benchmark.el ends here
diff --git a/lisp/emacs-lisp/bindat.el b/lisp/emacs-lisp/bindat.el
index 244b838fa2..91a30860b1 100644
--- a/lisp/emacs-lisp/bindat.el
+++ b/lisp/emacs-lisp/bindat.el
@@ -649,5 +649,4 @@ The port (if any) is omitted. IP can be a string, as well."
(provide 'bindat)
-;; arch-tag: 5e6708c3-03e2-4ad7-9885-5041b779c3fb
;;; bindat.el ends here
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index eb80fcf43b..46a5f4d7c1 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -292,5 +292,4 @@ In interpreted code, this is entirely equivalent to `progn'."
;; (file-format emacs19))"
;; nil)
-;; arch-tag: 76f8328a-1f66-4df2-9b6d-5c3666dc05e9
;;; byte-run.el ends here
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 3964439e64..527e22882e 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1,7 +1,8 @@
;;; bytecomp.el --- compilation of Lisp code into byte code
;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1998, 2000, 2001, 2002,
-;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Jamie Zawinski <jwz@lucid.com>
;; Hallvard Furuseth <hbf@ulrik.uio.no>
diff --git a/lisp/emacs-lisp/check-declare.el b/lisp/emacs-lisp/check-declare.el
index a84be94056..f3e13e5d8c 100644
--- a/lisp/emacs-lisp/check-declare.el
+++ b/lisp/emacs-lisp/check-declare.el
@@ -314,5 +314,4 @@ Returns non-nil if any false statements are found."
(provide 'check-declare)
-;; arch-tag: a4d6cdc4-deb7-4502-b327-0e4ef3d82d96
;;; check-declare.el ends here.
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index a496c6081c..00f2df9fe0 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -1,7 +1,7 @@
;;; checkdoc.el --- check documentation strings for style requirements
-;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; Version: 0.6.2
diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index eae4489074..cb58316ebc 100644
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -826,5 +826,4 @@ This also does some trivial optimizations to make the form prettier."
;; generated-autoload-file: "cl-loaddefs.el"
;; End:
-;; arch-tag: bcd03437-0871-43fb-a8f1-ad0e0b5427ed
;;; cl-extra.el ends here
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index 9c021fa70e..59ec8a203b 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -691,5 +691,4 @@ For example, the function `case' has an indent property
;(put 'defclass 'common-lisp-indent-function '((&whole 2 &rest (&whole 2 &rest 1) &rest (&whole 2 &rest 1)))
;(put 'defgeneric 'common-lisp-indent-function 'defun)
-;; arch-tag: 7914d50f-92ec-4476-93fc-0f043a380e03
;;; cl-indent.el ends here
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index 65ca305285..0936dddd67 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -10,7 +10,7 @@
;;;;;; ceiling* floor* isqrt lcm gcd cl-progv-before cl-set-frame-visible-p
;;;;;; cl-map-overlays cl-map-intervals cl-map-keymap-recursively
;;;;;; notevery notany every some mapcon mapcan mapl maplist map
-;;;;;; cl-mapcar-many equalp coerce) "cl-extra" "cl-extra.el" "0fa13e08069009fb44873beae11aab93")
+;;;;;; cl-mapcar-many equalp coerce) "cl-extra" "cl-extra.el" "ff6f0444d029166d2ed5da298f39854e")
;;; Generated autoloads from cl-extra.el
(autoload 'coerce "cl-extra" "\
@@ -754,7 +754,7 @@ surrounded by (block NAME ...).
;;;;;; find nsubstitute-if-not nsubstitute-if nsubstitute substitute-if-not
;;;;;; substitute-if substitute delete-duplicates remove-duplicates
;;;;;; delete-if-not delete-if delete* remove-if-not remove-if remove*
-;;;;;; replace fill reduce) "cl-seq" "cl-seq.el" "06b7f4180b3e40db2e6dae228c3265a8")
+;;;;;; replace fill reduce) "cl-seq" "cl-seq.el" "c17ab899d56f8fa132d0471ce6896a10")
;;; Generated autoloads from cl-seq.el
(autoload 'reduce "cl-seq" "\
diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el
index 31a7eed448..fc73aebe5f 100644
--- a/lisp/emacs-lisp/cl-seq.el
+++ b/lisp/emacs-lisp/cl-seq.el
@@ -1018,5 +1018,4 @@ Atoms are compared by `eql'; cons cells are compared recursively.
;; generated-autoload-file: "cl-loaddefs.el"
;; End:
-;; arch-tag: ec1cc072-9006-4225-b6ba-d6b07ed1710c
;;; cl-seq.el ends here
diff --git a/lisp/emacs-lisp/cl-specs.el b/lisp/emacs-lisp/cl-specs.el
index 9dab72fae4..5224f1aed2 100644
--- a/lisp/emacs-lisp/cl-specs.el
+++ b/lisp/emacs-lisp/cl-specs.el
@@ -469,5 +469,4 @@
(def-edebug-spec loop-d-type-spec
(&or (loop-d-type-spec . [&or nil loop-d-type-spec]) cl-type-spec))
-;; arch-tag: b29aa3c2-cf67-4af8-9ee1-318fea61b478
;;; cl-specs.el ends here
diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index 41be827d67..c01c6f1527 100644
--- a/lisp/emacs-lisp/cl.el
+++ b/lisp/emacs-lisp/cl.el
@@ -676,5 +676,4 @@ If ALIST is non-nil, the new pairs are prepended to it."
;; byte-compile-warnings: (not cl-functions)
;; End:
-;; arch-tag: 5f07fa74-f153-4524-9303-21f5be125851
;;; cl.el ends here
diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index b9071d3f96..8e7fc9a012 100644
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -311,5 +311,4 @@ Uses heuristic: year >= 50 means 19xx, < 50 means 20xx."
;; coding: utf-8
;; End:
-;; arch-tag: b4991afb-b6b1-4590-bebe-e076d9d4aee8
;;; copyright.el ends here
diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el
index 8c7d48d7e0..83dbc40c20 100644
--- a/lisp/emacs-lisp/crm.el
+++ b/lisp/emacs-lisp/crm.el
@@ -321,5 +321,4 @@ INHERIT-INPUT-METHOD."
(provide 'crm)
-;; arch-tag: db1911d9-86c6-4a42-b32a-4910701b15a6
;;; crm.el ends here
diff --git a/lisp/emacs-lisp/cust-print.el b/lisp/emacs-lisp/cust-print.el
index 5b8ce9909b..ff3c881ef9 100644
--- a/lisp/emacs-lisp/cust-print.el
+++ b/lisp/emacs-lisp/cust-print.el
@@ -681,5 +681,4 @@ See `custom-format' for the details."
(provide 'cust-print)
-;; arch-tag: 3a5a8650-622c-48c4-87d8-e01bf72ec580
;;; cust-print.el ends here
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 12189862d6..7cfcaab1d7 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -890,5 +890,4 @@ To specify a nil argument interactively, exit with an empty minibuffer."
(provide 'debug)
-;; arch-tag: b6ec7047-f801-4103-9c63-d69322db9d3b
;;; debug.el ends here
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 7936bc67af..9886c69c81 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -457,5 +457,4 @@ Where the new table already has an entry, nothing is copied from the old one."
(provide 'derived)
-;; arch-tag: 630be248-47d1-4f02-afa0-8207de0ebea0
;;; derived.el ends here
diff --git a/lisp/emacs-lisp/disass.el b/lisp/emacs-lisp/disass.el
index ae69f13143..dc33804213 100644
--- a/lisp/emacs-lisp/disass.el
+++ b/lisp/emacs-lisp/disass.el
@@ -264,5 +264,4 @@ OBJ should be a call to BYTE-CODE generated by the byte compiler."
(provide 'disass)
-;; arch-tag: 89482fe4-a087-4761-8dc6-d771054e763a
;;; disass.el ends here
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index fe096b091d..ac0853a054 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -676,5 +676,4 @@ In some cases we use that to select between the local and global maps."
(provide 'easymenu)
-;; arch-tag: 2a04020d-90d2-476d-a7c6-71e072007a4a
;;; easymenu.el ends here
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 48b6f369f6..1af2252cfa 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -1,8 +1,8 @@
;;; edebug.el --- a source-level debugger for Emacs Lisp
-;; Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1999,
-;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1997,
+;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+;; 2010, 2011 Free Software Foundation, Inc.
;; Author: Daniel LaLiberte <liberte@holonexus.org>
;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el
index 2ed82682ab..71f37188fc 100644
--- a/lisp/emacs-lisp/eieio-base.el
+++ b/lisp/emacs-lisp/eieio-base.el
@@ -329,5 +329,4 @@ a set type."
(provide 'eieio-base)
-;; arch-tag: 6260571e-9e8a-41a0-880f-a937b0c2ea8b
;;; eieio-base.el ends here
diff --git a/lisp/emacs-lisp/eieio-custom.el b/lisp/emacs-lisp/eieio-custom.el
index 6de13cfe31..993a71284d 100644
--- a/lisp/emacs-lisp/eieio-custom.el
+++ b/lisp/emacs-lisp/eieio-custom.el
@@ -461,5 +461,4 @@ Return the symbol for the group, or nil"
(provide 'eieio-custom)
-;; arch-tag: bc122762-a771-48d5-891b-7835b16dd924
;;; eieio-custom.el ends here
diff --git a/lisp/emacs-lisp/eieio-datadebug.el b/lisp/emacs-lisp/eieio-datadebug.el
index 20b129aed1..5baff64a37 100644
--- a/lisp/emacs-lisp/eieio-datadebug.el
+++ b/lisp/emacs-lisp/eieio-datadebug.el
@@ -145,5 +145,4 @@ PREBUTTONTEXT is some text between PREFIX and the object button."
(provide 'eieio-datadebug)
-;; arch-tag: 6c7c2890-7614-41b0-816b-c61f3f6a8130
;;; eieio-datadebug.el ends here
diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el
index db7de6e3f9..73db22d48e 100644
--- a/lisp/emacs-lisp/eieio-opt.el
+++ b/lisp/emacs-lisp/eieio-opt.el
@@ -693,5 +693,4 @@ INDENT is the current indentation level."
(provide 'eieio-opt)
-;; arch-tag: 71eab5f5-462f-4fa1-8ed1-f5ca1bf9adb6
;;; eieio-opt.el ends here
diff --git a/lisp/emacs-lisp/eieio-speedbar.el b/lisp/emacs-lisp/eieio-speedbar.el
index a8d096b60b..e48ce43e00 100644
--- a/lisp/emacs-lisp/eieio-speedbar.el
+++ b/lisp/emacs-lisp/eieio-speedbar.el
@@ -422,5 +422,4 @@ to create a speedbar button."
(provide 'eieio-speedbar)
-;; arch-tag: eaac1283-10b0-4419-a929-982b87e83234
;;; eieio-speedbar.el ends here
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 4c4eddeb8a..4db5e7979b 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -2956,5 +2956,4 @@ Optional argument NOESCAPE is passed to `prin1-to-string' when appropriate."
(provide 'eieio)
-;; arch-tag: c1aeab9c-2938-41a3-842b-1a38bd26e9f2
;;; eieio ends here
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 9f74168815..4dc1ced246 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -540,5 +540,4 @@ The words \"&rest\", \"&optional\" are returned unchanged."
(provide 'eldoc)
-;; arch-tag: c9a58f9d-2055-46c1-9b82-7248b71a8375
;;; eldoc.el ends here
diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el
index 9a66527285..97f96e76f2 100644
--- a/lisp/emacs-lisp/elp.el
+++ b/lisp/emacs-lisp/elp.el
@@ -660,5 +660,4 @@ displayed."
(provide 'elp)
-;; arch-tag: c4eef311-9b3e-4bb2-8a54-3485d41b4eb1
;;; elp.el ends here
diff --git a/lisp/emacs-lisp/ewoc.el b/lisp/emacs-lisp/ewoc.el
index 9928f8f75c..f70fb6955b 100644
--- a/lisp/emacs-lisp/ewoc.el
+++ b/lisp/emacs-lisp/ewoc.el
@@ -578,5 +578,4 @@ Return nil if the buffer has been deleted."
;; eval: (put 'ewoc--set-buffer-bind-dll-let* 'lisp-indent-hook 2)
;; End:
-;; arch-tag: d78915b9-9a07-44bf-aac6-04a1fc1bd6d4
;;; ewoc.el ends here
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 11318aaab5..9f9391a5aa 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -563,5 +563,4 @@ Set mark before moving, if the buffer already existed."
(provide 'find-func)
-;; arch-tag: 43ecd81c-74dc-4d9a-8f63-a61e55670d64
;;; find-func.el ends here
diff --git a/lisp/emacs-lisp/find-gc.el b/lisp/emacs-lisp/find-gc.el
index 00c7c0556b..b78a55242a 100644
--- a/lisp/emacs-lisp/find-gc.el
+++ b/lisp/emacs-lisp/find-gc.el
@@ -159,5 +159,4 @@ Also store it in `find-gc-unsafe'."
(provide 'find-gc)
-;; arch-tag: 4a26a538-a008-40d9-a1ef-23bb6dbecef4
;;; find-gc.el ends here
diff --git a/lisp/emacs-lisp/float-sup.el b/lisp/emacs-lisp/float-sup.el
index b5086e1d13..9b75651c16 100644
--- a/lisp/emacs-lisp/float-sup.el
+++ b/lisp/emacs-lisp/float-sup.el
@@ -1,7 +1,7 @@
;;; float-sup.el --- define some constants useful for floating point numbers.
-;; Copyright (C) 1985, 1986, 1987, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1987, 2001, 2002, 2003, 2004, 2005, 2006,
+;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
diff --git a/lisp/emacs-lisp/generic.el b/lisp/emacs-lisp/generic.el
index 8178cef7a4..507bd0c160 100644
--- a/lisp/emacs-lisp/generic.el
+++ b/lisp/emacs-lisp/generic.el
@@ -316,5 +316,4 @@ regular expression that can be used as an element of
(provide 'generic)
-;; arch-tag: 239c1fc4-1303-48d9-9ac0-657d655669ea
;;; generic.el ends here
diff --git a/lisp/emacs-lisp/gulp.el b/lisp/emacs-lisp/gulp.el
index fe8c6e7fae..43055fb995 100644
--- a/lisp/emacs-lisp/gulp.el
+++ b/lisp/emacs-lisp/gulp.el
@@ -175,5 +175,4 @@ That is a list of elements, each of the form (MAINTAINER PACKAGES...)."
(provide 'gulp)
-;; arch-tag: 42750a11-460a-4efc-829f-342d075530e5
;;; gulp.el ends here
diff --git a/lisp/emacs-lisp/helper.el b/lisp/emacs-lisp/helper.el
index c54e3898e5..5dc9f08a58 100644
--- a/lisp/emacs-lisp/helper.el
+++ b/lisp/emacs-lisp/helper.el
@@ -156,5 +156,4 @@
(provide 'helper)
-;; arch-tag: a0984577-d3e9-4124-ae0d-c46fe740f6a9
;;; helper.el ends here
diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el
index b772c25dcb..809a75db52 100644
--- a/lisp/emacs-lisp/lisp-mnt.el
+++ b/lisp/emacs-lisp/lisp-mnt.el
@@ -616,5 +616,4 @@ Prompts for bug subject TOPIC. Leaves you in a mail buffer."
(provide 'lisp-mnt)
-;; arch-tag: fa3c5ab4-a37b-4e46-b7cf-b6d78b90e69e
;;; lisp-mnt.el ends here
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index 5f81cb42f8..3ad38eb195 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -690,5 +690,4 @@ considered."
(unless (eq predicate 'fboundp)
(lambda (str) (if (fboundp (intern-soft str)) " <f>"))))))))
-;; arch-tag: aa7fa8a4-2e6f-4e9b-9cd9-fef06340e67e
;;; lisp.el ends here
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index 48839936d7..da918c8911 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -182,5 +182,4 @@ definitions to shadow the loaded ones for use in file byte-compilation."
(provide 'macroexp)
-;; arch-tag: af9b8c24-c196-43bc-91e1-a3570790fa5a
;;; macroexp.el ends here
diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el
index aefc631c3b..931cf27a21 100644
--- a/lisp/emacs-lisp/map-ynp.el
+++ b/lisp/emacs-lisp/map-ynp.el
@@ -275,5 +275,4 @@ the current %s and exit."
;; Return the number of actions that were taken.
actions))
-;; arch-tag: 1d0a3201-a151-4c10-b231-4da47c9e6dc3
;;; map-ynp.el ends here
diff --git a/lisp/emacs-lisp/package-x.el b/lisp/emacs-lisp/package-x.el
index 38c4d5bbe3..31ab76cbaf 100644
--- a/lisp/emacs-lisp/package-x.el
+++ b/lisp/emacs-lisp/package-x.el
@@ -1,6 +1,6 @@
;;; package-x.el --- Package extras
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Tom Tromey <tromey@redhat.com>
;; Created: 10 Mar 2007
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index dfe1a4309c..103065de8b 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1,6 +1,6 @@
;;; package.el --- Simple package system for Emacs
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Tom Tromey <tromey@redhat.com>
;; Created: 10 Mar 2007
diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el
index 5ff26b3dbc..641cb31e8e 100644
--- a/lisp/emacs-lisp/pcase.el
+++ b/lisp/emacs-lisp/pcase.el
@@ -1,6 +1,6 @@
;;; pcase.el --- ML-style pattern-matching macro for Elisp
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords:
diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el
index 34ac4f95d5..7846da0060 100644
--- a/lisp/emacs-lisp/pp.el
+++ b/lisp/emacs-lisp/pp.el
@@ -202,5 +202,4 @@ Ignores leading comment characters."
(provide 'pp) ; so (require 'pp) works
-;; arch-tag: b0f7c65b-02c7-42bb-9ee3-508a59b8fbb9
;;; pp.el ends here
diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el
index fa05c190e6..07d5b0e52e 100644
--- a/lisp/emacs-lisp/re-builder.el
+++ b/lisp/emacs-lisp/re-builder.el
@@ -713,5 +713,4 @@ If SUBEXP is non-nil mark only the corresponding sub-expressions."
(provide 're-builder)
-;; arch-tag: 5c5515ac-4085-4524-a421-033f44f032e7
;;; re-builder.el ends here
diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el
index 9c82fa09fc..e2ae390d19 100644
--- a/lisp/emacs-lisp/regexp-opt.el
+++ b/lisp/emacs-lisp/regexp-opt.el
@@ -293,5 +293,4 @@ Merges keywords to avoid backtracking in Emacs' regexp matcher."
(provide 'regexp-opt)
-;; arch-tag: 6c5a66f4-29af-4fd6-8c3b-4b554d5b4370
;;; regexp-opt.el ends here
diff --git a/lisp/emacs-lisp/regi.el b/lisp/emacs-lisp/regi.el
index 53cf21b2f9..7e961a01fb 100644
--- a/lisp/emacs-lisp/regi.el
+++ b/lisp/emacs-lisp/regi.el
@@ -254,5 +254,4 @@ useful information:
(provide 'regi)
-;; arch-tag: 804b4e45-4109-4f76-9a88-21887b881747
;;; regi.el ends here
diff --git a/lisp/emacs-lisp/ring.el b/lisp/emacs-lisp/ring.el
index 91ea5a93aa..41afd5be4f 100644
--- a/lisp/emacs-lisp/ring.el
+++ b/lisp/emacs-lisp/ring.el
@@ -236,5 +236,4 @@ If SEQ is already a ring, return it."
(provide 'ring)
-;; arch-tag: e707682b-ed69-47c9-b20f-cf2c68cc92d2
;;; ring.el ends here
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index f7e0e44b0c..7763d93c97 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -578,5 +578,4 @@ Point is at POS when this function returns."
(provide 'syntax)
-;; arch-tag: 302f1eeb-e77c-4680-a8c5-c543e01161a5
;;; syntax.el ends here
diff --git a/lisp/emacs-lisp/tcover-ses.el b/lisp/emacs-lisp/tcover-ses.el
index ad5234d6f0..2446ac7552 100644
--- a/lisp/emacs-lisp/tcover-ses.el
+++ b/lisp/emacs-lisp/tcover-ses.el
@@ -722,5 +722,4 @@ spreadsheet files with invalid formatting."
;;Could do this here: (testcover-end "ses.el")
(message "Done"))
-;; arch-tag: 87052ba4-5cf8-46cf-9375-fe245f3360b8
;; testcover-ses.el ends here.
diff --git a/lisp/emacs-lisp/tcover-unsafep.el b/lisp/emacs-lisp/tcover-unsafep.el
index 4c75063220..42dc6bc1a5 100644
--- a/lisp/emacs-lisp/tcover-unsafep.el
+++ b/lisp/emacs-lisp/tcover-unsafep.el
@@ -138,5 +138,4 @@
(testcover-end "unsafep.el")
(message "Done"))
-;; arch-tag: a7616c27-1998-47ae-9304-76d1439dbf29
;; testcover-unsafep.el ends here.
diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el
index aeefa1bcca..ce5eb2e70f 100644
--- a/lisp/emacs-lisp/testcover.el
+++ b/lisp/emacs-lisp/testcover.el
@@ -534,5 +534,4 @@ coverage tests. This function creates many overlays."
(goto-char (next-overlay-change (point)))
(end-of-line))
-;; arch-tag: 72324a4a-4a2e-4142-9249-cc56d6757588
;; testcover.el ends here.
diff --git a/lisp/emacs-lisp/tq.el b/lisp/emacs-lisp/tq.el
index f310609ec1..2e3f56af4d 100644
--- a/lisp/emacs-lisp/tq.el
+++ b/lisp/emacs-lisp/tq.el
@@ -167,5 +167,4 @@ This produces more reliable results with some processes."
(provide 'tq)
-;; arch-tag: 65dea08c-4edd-4cde-83a5-e8a15b993b79
;;; tq.el ends here
diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index 77b8e1e118..df05bc00a7 100644
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -299,5 +299,4 @@ was not traced this is a noop."
(provide 'trace)
-;; arch-tag: cfd170a7-4932-4331-8c8b-b7151942e5a1
;;; trace.el ends here
diff --git a/lisp/emacs-lisp/unsafep.el b/lisp/emacs-lisp/unsafep.el
index d31777ba9d..fb3163455b 100644
--- a/lisp/emacs-lisp/unsafep.el
+++ b/lisp/emacs-lisp/unsafep.el
@@ -261,5 +261,4 @@ If TO-BIND is t, check whether SYM is safe to bind."
(local-variable-p sym)))
`(global-variable ,sym))))
-;; arch-tag: 6216f98b-eb8f-467a-9c33-7a7644f50658
;;; unsafep.el ends here
diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index 28c20cbc79..c14ccbc386 100644
--- a/lisp/emacs-lisp/warnings.el
+++ b/lisp/emacs-lisp/warnings.el
@@ -337,5 +337,4 @@ this is equivalent to `display-warning', using
(provide 'warnings)
-;; arch-tag: faaad1c8-7b2a-4161-af38-5ab4afde0496
;;; warnings.el ends here
diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el
index bf6b4446bf..8cf2e8c839 100644
--- a/lisp/emacs-lock.el
+++ b/lisp/emacs-lock.el
@@ -98,5 +98,4 @@ If the buffer is locked, signal error and display its name."
(provide 'emacs-lock)
-;; arch-tag: 58e6cb43-7cf0-401a-bcb6-4902a0b8bdc1
;;; emacs-lock.el ends here
diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el
index f3145227df..5638f6e5ed 100644
--- a/lisp/emulation/crisp.el
+++ b/lisp/emulation/crisp.el
@@ -1,7 +1,7 @@
;;; crisp.el --- CRiSP/Brief Emacs emulator
-;; Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Gary D. Foster <Gary.Foster@Corp.Sun.COM>
;; Keywords: emulations brief crisp
@@ -381,5 +381,4 @@ With ARG, turn CRiSP mode on if ARG is positive, off otherwise."
(run-hooks 'crisp-load-hook)
(provide 'crisp)
-;; arch-tag: e5369375-fafb-4240-b7ae-4cb460ef05ee
;;; crisp.el ends here
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index cf7d8510d8..08f667b825 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1,7 +1,7 @@
;;; cua-base.el --- emulate CUA key bindings
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Kim F. Storm <storm@cua.dk>
;; Keywords: keyboard emulations convenience cua
diff --git a/lisp/emulation/cua-gmrk.el b/lisp/emulation/cua-gmrk.el
index d02d4b9cdc..701ac0f4ff 100644
--- a/lisp/emulation/cua-gmrk.el
+++ b/lisp/emulation/cua-gmrk.el
@@ -381,5 +381,4 @@ With prefix argument, don't jump to global mark when cancelling it."
(provide 'cua-gmrk)
-;; arch-tag: 553d8076-a91d-48ae-825d-6cb962a5f67f
;;; cua-gmrk.el ends here
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index 1d8fdcd1af..0c825686b1 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -1492,5 +1492,4 @@ With prefix arg, indent to that column."
(provide 'cua-rect)
-;; arch-tag: b730df53-17b9-4a89-bd63-4a71ec196731
;;; cua-rect.el ends here
diff --git a/lisp/emulation/edt-lk201.el b/lisp/emulation/edt-lk201.el
index 6183946ee9..7de9cfbc61 100644
--- a/lisp/emulation/edt-lk201.el
+++ b/lisp/emulation/edt-lk201.el
@@ -57,5 +57,4 @@
("HELP" . [help]) ("DO" . [menu]) ("F17" . [f17]) ("F18" . [f18])
("F19" . [f19]) ("F20" . [f20])))
-;; arch-tag: 36f498cf-c3f6-41b0-911b-83b1348855ec
;;; edt-lk201.el ends here
diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el
index 87359af665..da85e1b073 100644
--- a/lisp/emulation/edt-mapper.el
+++ b/lisp/emulation/edt-mapper.el
@@ -547,5 +547,4 @@
(sit-for 600)
(kill-emacs t)
-;; arch-tag: 9eea59c8-b8b7-4d66-b858-c8920624c518
;;; edt-mapper.el ends here
diff --git a/lisp/emulation/edt-pc.el b/lisp/emulation/edt-pc.el
index f896b7d30b..c635d075a8 100644
--- a/lisp/emulation/edt-pc.el
+++ b/lisp/emulation/edt-pc.el
@@ -87,5 +87,4 @@
("HELP" . "" ) ("DO" . "" ) ("F17" . "" ) ("F18" . "" )
("F19" . "" ) ("F20" . "" )))
-;; arch-tag: 4593d053-183a-4062-97de-57b8877595ce
;;; edt-pc.el ends here
diff --git a/lisp/emulation/edt-vt100.el b/lisp/emulation/edt-vt100.el
index 23c4f4e8f6..3196cb090f 100644
--- a/lisp/emulation/edt-vt100.el
+++ b/lisp/emulation/edt-vt100.el
@@ -48,5 +48,4 @@
"Set terminal width to 132 columns."
(vt100-wide-mode 1))
-;; arch-tag: c9f10c95-915f-44b5-93ff-4654abca4dd4
;;; edt-vt100.el ends here
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index 52b083da6a..7f22567b04 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -1,7 +1,8 @@
;;; edt.el --- enhanced EDT keypad mode emulation for GNU Emacs
;; Copyright (C) 1986, 1992, 1993, 1994, 1995, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com>
;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com>
diff --git a/lisp/emulation/keypad.el b/lisp/emulation/keypad.el
index b634cc21c2..d5824f204c 100644
--- a/lisp/emulation/keypad.el
+++ b/lisp/emulation/keypad.el
@@ -270,5 +270,4 @@ the decimal key on the keypad is mapped to DECIMAL instead of `.'"
(setq i (1+ i)))))
-;; arch-tag: 0899d2bd-9e12-4b4e-9aef-d0014d3b6414
;;; keypad.el ends here
diff --git a/lisp/emulation/pc-mode.el b/lisp/emulation/pc-mode.el
index fb915dbaa6..8306e4b783 100644
--- a/lisp/emulation/pc-mode.el
+++ b/lisp/emulation/pc-mode.el
@@ -53,5 +53,4 @@ C-Escape does list-buffers."
(provide 'pc-mode)
-;; arch-tag: df007c05-f885-4cd0-8c1e-487d0f8dd9c9
;;; pc-mode.el ends here
diff --git a/lisp/emulation/pc-select.el b/lisp/emulation/pc-select.el
index 5e3b8a6d5b..a9ae5aa354 100644
--- a/lisp/emulation/pc-select.el
+++ b/lisp/emulation/pc-select.el
@@ -983,5 +983,4 @@ but before calling PC Selection mode):
(setq pc-select-key-bindings-alist nil
pc-select-saved-settings-alist nil))))
-;; arch-tag: 10697b70-ae07-4f3e-ad23-7814a3f418c2
;;; pc-select.el ends here
diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el
index ea2638b5eb..704d51f21e 100644
--- a/lisp/emulation/tpu-edt.el
+++ b/lisp/emulation/tpu-edt.el
@@ -2465,5 +2465,4 @@ Constrain the cursor to the flow of the text.
(provide 'tpu-edt)
-;; arch-tag: f3dfe61c-2cbd-4f73-b9cc-eb215020b857
;;; tpu-edt.el ends here
diff --git a/lisp/emulation/tpu-mapper.el b/lisp/emulation/tpu-mapper.el
index 6bba1a3c1a..0ca8c2e5fc 100644
--- a/lisp/emulation/tpu-mapper.el
+++ b/lisp/emulation/tpu-mapper.el
@@ -350,5 +350,4 @@ your local X guru can try to figure out why the key is being ignored."
")
(goto-char (point-min)))
-;; arch-tag: bab5872f-cd3a-4c1c-aedb-047b67646f6c
;;; tpu-mapper.el ends here
diff --git a/lisp/emulation/vi.el b/lisp/emulation/vi.el
index a65dd44e39..5bab974164 100644
--- a/lisp/emulation/vi.el
+++ b/lisp/emulation/vi.el
@@ -1488,5 +1488,4 @@ With ARG, inserts that many newlines."
(provide 'vi)
-;; arch-tag: ac9bdac3-8acb-4ddd-bdae-c6dd873153b3
;;; vi.el ends here
diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el
index dcbf9ce2ad..7e1076f9ce 100644
--- a/lisp/emulation/vip.el
+++ b/lisp/emulation/vip.el
@@ -3054,5 +3054,4 @@ vip-s-string"
(provide 'vip)
-;; arch-tag: bff623ef-48f7-41d4-9aa3-2e840c9ab415
;;; vip.el ends here
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index a4df2941b1..cf1e9eafb1 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -1,7 +1,7 @@
;;; viper-cmd.el --- Vi command support for Viper
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Package: viper
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el
index e4cfbe8857..9cbaa2b178 100644
--- a/lisp/emulation/viper-ex.el
+++ b/lisp/emulation/viper-ex.el
@@ -2303,5 +2303,4 @@ Type 'mak ' (including the space) to run make with no args."
-;; arch-tag: 56b80d36-f880-4d10-bd66-85ad91a295db
;;; viper-ex.el ends here
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index f18cd55d7f..4d3a51fe64 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -1,7 +1,7 @@
;;; viper-init.el --- some common definitions for Viper
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Package: viper
diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index 79d7505f51..cdada14ff4 100644
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -673,5 +673,4 @@ form ((key . function) (key . function) ... )."
;; End:
-;; arch-tag: 43af4b2f-0bea-400b-889e-221ebc00acb1
;;; viper-keym.el ends here
diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el
index 3af24a46f9..66e6ea9009 100644
--- a/lisp/emulation/viper-macs.el
+++ b/lisp/emulation/viper-macs.el
@@ -932,5 +932,4 @@ name from there."
(call-last-kbd-macro)))
-;; arch-tag: ecd3cc5c-8cd0-4bbe-b2ec-7e75a4b7d0aa
;;; viper-macs.el ends here
diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el
index 69ad062fc2..dae488320b 100644
--- a/lisp/emulation/viper-mous.el
+++ b/lisp/emulation/viper-mous.el
@@ -663,5 +663,4 @@ This buffer may be different from the one where the click occurred."
;; End:
-;; arch-tag: e56b2390-06c4-4dd1-96f5-c7876e2d8c2f
;;; viper-mous.el ends here
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 70e5466346..ff1dbe53fd 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -1,7 +1,8 @@
;;; viper-util.el --- Utilities used by viper.el
;; Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Package: viper
@@ -1555,5 +1556,4 @@ This option is appropriate if you like Emacs-style words."
;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
;; End:
-;; arch-tag: 7f023fd5-dd9e-4378-a397-9c179553b0e3
;;; viper-util.el ends here
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 9f2247ffc6..e8b471d252 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -1375,5 +1375,4 @@ These two lines must come in the order given.
;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
;; End:
-;; arch-tag: 5f3e844c-c4e6-4bbd-9b73-63bdc14e7d79
;;; viper.el ends here
diff --git a/lisp/emulation/ws-mode.el b/lisp/emulation/ws-mode.el
index 0919fbb9d9..291d8443ac 100644
--- a/lisp/emulation/ws-mode.el
+++ b/lisp/emulation/ws-mode.el
@@ -742,5 +742,4 @@ sWith: " )
(provide 'ws-mode)
-;; arch-tag: 6dd864bf-2ccb-4d59-af6e-492eba2890a3
;;; ws-mode.el ends here
diff --git a/lisp/env.el b/lisp/env.el
index 985bc5a997..585fa5999d 100644
--- a/lisp/env.el
+++ b/lisp/env.el
@@ -210,5 +210,4 @@ in the environment list of the selected frame."
(provide 'env)
-;; arch-tag: b7d6a8f7-bc81-46db-8e39-8d721d4ed0b8
;;; env.el ends here
diff --git a/lisp/epa-dired.el b/lisp/epa-dired.el
index 7f54c99b6b..e0612d4f9a 100644
--- a/lisp/epa-dired.el
+++ b/lisp/epa-dired.el
@@ -74,5 +74,4 @@ If no one is selected, symmetric encryption will be performed. "))
(provide 'epa-dired)
-;; arch-tag: 2025700b-48d0-4684-bc94-228ad1f8e9ff
;;; epa-dired.el ends here
diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index 1f9500ded8..2f29914df1 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -298,5 +298,4 @@ If no one is selected, symmetric encryption will be performed. "))))
(provide 'epa-file)
-;; arch-tag: 5715152f-0eb1-4dbc-9008-07098775314d
;;; epa-file.el ends here
diff --git a/lisp/epa-hook.el b/lisp/epa-hook.el
index 14ad668837..594f482b57 100644
--- a/lisp/epa-hook.el
+++ b/lisp/epa-hook.el
@@ -109,5 +109,4 @@ Return the new status of auto encryption (non-nil means on)."
(provide 'epa-hook)
-;; arch-tag: f75c8a50-d32e-4eb3-9ec6-9e940c1fc8b5
;;; epa-hook.el ends here
diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el
index 43bfbe0853..dbcd47bafa 100644
--- a/lisp/epa-mail.el
+++ b/lisp/epa-mail.el
@@ -197,5 +197,4 @@ Don't use this command in Lisp programs!"
(provide 'epa-mail)
-;; arch-tag: a6f82b3f-d177-4a11-af95-040da55927d2
;;; epa-mail.el ends here
diff --git a/lisp/epa.el b/lisp/epa.el
index 5cb57bc7a3..01fba049f7 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -1,5 +1,7 @@
;;; epa.el --- the EasyPG Assistant
-;; Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+
+;; Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Daiki Ueno <ueno@unixuser.org>
;; Keywords: PGP, GnuPG
diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index b556464e6e..f29bb1ac44 100644
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -147,5 +147,4 @@ Note that the buffer name starts with a space."
(provide 'epg-config)
-;; arch-tag: 9aca7cb8-5f63-4bcb-84ee-46fd2db0763f
;;; epg-config.el ends here
diff --git a/lisp/epg.el b/lisp/epg.el
index e4bd257d0e..bfebdf143b 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -2650,5 +2650,4 @@ Type names are resolved using `epg-dn-type-alist'."
(provide 'epg)
-;; arch-tag: de8f0acc-1bcf-4c14-a09e-bfffe1b579b7
;;; epg.el ends here
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 26e8c9aee2..b03a404380 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -153,4 +153,3 @@ See ChangeLog.08 for earlier changes.
;; add-log-time-zone-rule: t
;; End:
-;; arch-tag: d4703244-4a8d-49b1-ab34-ad0d56600ef8
diff --git a/lisp/erc/ChangeLog.01 b/lisp/erc/ChangeLog.01
index db2cb574b2..30adfeaa85 100644
--- a/lisp/erc/ChangeLog.01
+++ b/lisp/erc/ChangeLog.01
@@ -1056,4 +1056,3 @@
;; coding: utf-8
;; End:
-;; arch-tag: 306c4b58-f9ae-4f3d-9fd9-db2d743f05a6
diff --git a/lisp/erc/ChangeLog.02 b/lisp/erc/ChangeLog.02
index 5785f3a0a4..421399fd55 100644
--- a/lisp/erc/ChangeLog.02
+++ b/lisp/erc/ChangeLog.02
@@ -2617,4 +2617,3 @@ See ChangeLog.01 for earlier changes.
;; coding: utf-8
;; End:
-;; arch-tag: a6779d5e-99fa-442b-98cf-90e73eb2c272
diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03
index 71df66c806..f62d7d5504 100644
--- a/lisp/erc/ChangeLog.03
+++ b/lisp/erc/ChangeLog.03
@@ -2161,4 +2161,3 @@ See ChangeLog.02 for earlier changes.
;; coding: utf-8
;; End:
-;; arch-tag: 808865e1-3cce-4c5b-9997-95a8b7a9d384
diff --git a/lisp/erc/ChangeLog.04 b/lisp/erc/ChangeLog.04
index 39bdfbd8c9..2030a2a163 100644
--- a/lisp/erc/ChangeLog.04
+++ b/lisp/erc/ChangeLog.04
@@ -2093,4 +2093,3 @@ See ChangeLog.03 for earlier changes.
;; coding: utf-8
;; End:
-;; arch-tag: cc606d2d-635b-4b36-829b-a50e3c51e2d1
diff --git a/lisp/erc/ChangeLog.05 b/lisp/erc/ChangeLog.05
index 7facf9c31c..b0f496b86f 100644
--- a/lisp/erc/ChangeLog.05
+++ b/lisp/erc/ChangeLog.05
@@ -1238,4 +1238,3 @@ See ChangeLog.04 for earlier changes.
;; coding: utf-8
;; End:
-;; arch-tag: 70f1733a-3e2f-43c2-91c3-d9ace93f82ba
diff --git a/lisp/erc/ChangeLog.06 b/lisp/erc/ChangeLog.06
index 3f69f164e0..1df6c6190c 100644
--- a/lisp/erc/ChangeLog.06
+++ b/lisp/erc/ChangeLog.06
@@ -1452,4 +1452,3 @@ See ChangeLog.05 for earlier changes.
;; add-log-time-zone-rule: t
;; End:
-;; arch-tag: 865a75f6-2bcb-46df-bf0c-b514dadf688a
diff --git a/lisp/erc/ChangeLog.07 b/lisp/erc/ChangeLog.07
index 050873f835..693e712c58 100644
--- a/lisp/erc/ChangeLog.07
+++ b/lisp/erc/ChangeLog.07
@@ -834,4 +834,3 @@ See ChangeLog.06 for earlier changes.
;; add-log-time-zone-rule: t
;; End:
-;; arch-tag: 3369b6e5-96b1-4b32-96cd-9a905c747496
diff --git a/lisp/erc/ChangeLog.08 b/lisp/erc/ChangeLog.08
index 404b1df8f7..995cc7a182 100644
--- a/lisp/erc/ChangeLog.08
+++ b/lisp/erc/ChangeLog.08
@@ -427,4 +427,3 @@ See ChangeLog.07 for earlier changes.
;; add-log-time-zone-rule: t
;; End:
-;; arch-tag: 15787dfd-e091-4c8c-8b88-747b474e1ac7
diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el
index f77a75f474..a1d6913877 100644
--- a/lisp/erc/erc-autoaway.el
+++ b/lisp/erc/erc-autoaway.el
@@ -286,4 +286,3 @@ activer server buffer available."
;; tab-width: 8
;; End:
-;; arch-tag: 16fc241e-8358-4b56-9fe2-116bdd0ba3bc
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index cb05338208..2e9fa42480 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -1994,4 +1994,3 @@ See `erc-display-error-notice'." nil
;; indent-tabs-mode: nil
;; End:
-;; arch-tag: a64e6bb7-a780-4efd-8f98-083b18c7c84a
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index cf70c2e47f..4595a8e3f4 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -534,4 +534,3 @@ and `apropos' for other symbols."
;; indent-tabs-mode: nil
;; End:
-;; arch-tag: 7d23bed4-2f30-4273-a03f-d7a274c605c4
diff --git a/lisp/erc/erc-capab.el b/lisp/erc/erc-capab.el
index e66170227c..ee6a0979ee 100644
--- a/lisp/erc/erc-capab.el
+++ b/lisp/erc/erc-capab.el
@@ -202,5 +202,4 @@ PARSED is an `erc-parsed' response struct."
(provide 'erc-capab)
-;; arch-tag: 27b6d668-7ee5-4e47-b9f0-27d7a4362062
;;; erc-capab.el ends here
diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el
index f9830f9dae..c80ec5c0b9 100644
--- a/lisp/erc/erc-compat.el
+++ b/lisp/erc/erc-compat.el
@@ -165,4 +165,3 @@ If START or END is negative, it counts from the end."
;; tab-width: 8
;; End:
-;; arch-tag: 8948ffe0-aff8-4ad8-a196-368ebbfd58ff
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index 5578e52791..db9668b510 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -1251,4 +1251,3 @@ other client."
;; indent-tabs-mode: nil
;; End:
-;; arch-tag: cda5a6b3-c510-4dbe-b699-84cccfa04edb
diff --git a/lisp/erc/erc-ezbounce.el b/lisp/erc/erc-ezbounce.el
index fe9e4bec2f..9f39577e2d 100644
--- a/lisp/erc/erc-ezbounce.el
+++ b/lisp/erc/erc-ezbounce.el
@@ -174,5 +174,4 @@ in the alist is `nil', prompt for the appropriate values."
(provide 'erc-ezbounce)
-;; arch-tag: e972aa7b-a9f4-4d16-a489-074ec7a1002e
;;; erc-ezbounce.el ends here
diff --git a/lisp/erc/erc-fill.el b/lisp/erc/erc-fill.el
index c3d6f50b53..6604f73649 100644
--- a/lisp/erc/erc-fill.el
+++ b/lisp/erc/erc-fill.el
@@ -193,4 +193,3 @@ You can put this on `erc-insert-modify-hook' and/or `erc-send-modify-hook'."
;; indent-tabs-mode: nil
;; End:
-;; arch-tag: 89224581-c2c2-4e26-92e5-e3a390dc516a
diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el
index 5d86a2022f..f94d6fc01c 100644
--- a/lisp/erc/erc-goodies.el
+++ b/lisp/erc/erc-goodies.el
@@ -569,5 +569,4 @@ servers. If called from a program, PROC specifies the server process."
(provide 'erc-goodies)
-;; arch-tag: d987ae26-9e28-4c72-9596-e617309fb582
;;; erc-goodies.el ends here
diff --git a/lisp/erc/erc-hecomplete.el b/lisp/erc/erc-hecomplete.el
index 0c03f10c27..ea27a489ed 100644
--- a/lisp/erc/erc-hecomplete.el
+++ b/lisp/erc/erc-hecomplete.el
@@ -220,4 +220,3 @@ Window configurations are stored in
;; tab-width: 8
;; End:
-;; arch-tag: 3be13ee8-8fdb-41ab-83c2-6582c757b91e
diff --git a/lisp/erc/erc-ibuffer.el b/lisp/erc/erc-ibuffer.el
index 42dc37cb03..a483f93a3c 100644
--- a/lisp/erc/erc-ibuffer.el
+++ b/lisp/erc/erc-ibuffer.el
@@ -190,4 +190,3 @@
;; tab-width: 8
;; End:
-;; arch-tag: fbad56a5-8595-45e0-a8c8-d8bb91e26944
diff --git a/lisp/erc/erc-identd.el b/lisp/erc/erc-identd.el
index 2442d5e8aa..47a9a558d7 100644
--- a/lisp/erc/erc-identd.el
+++ b/lisp/erc/erc-identd.el
@@ -118,4 +118,3 @@ The default port is specified by `erc-identd-port'."
;; tab-width: 8
;; End:
-;; arch-tag: e0b5f926-0f35-40b9-8ddb-ca06b62a7544
diff --git a/lisp/erc/erc-imenu.el b/lisp/erc/erc-imenu.el
index 7ab91db33b..ffe48177ac 100644
--- a/lisp/erc/erc-imenu.el
+++ b/lisp/erc/erc-imenu.el
@@ -133,4 +133,3 @@ Don't rely on this function, read it first!"
;; tab-width: 8
;; End:
-;; arch-tag: 35c69082-ca29-43f7-a050-8da5f400de81
diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el
index df676ba6af..d337bcd743 100644
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -202,4 +202,3 @@ This function is run from `erc-nickserv-identified-hook'."
;; tab-width: 8
;; End:
-;; arch-tag: d62d8b15-8e31-49d6-8a73-12f11e717414
diff --git a/lisp/erc/erc-lang.el b/lisp/erc/erc-lang.el
index 13474021fa..5f5b883b4b 100644
--- a/lisp/erc/erc-lang.el
+++ b/lisp/erc/erc-lang.el
@@ -1,6 +1,7 @@
;;; erc-lang.el --- provide the LANG command to ERC
-;; Copyright (C) 2002, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Alex Schroeder <alex@gnu.org>
;; Maintainer: Alex Schroeder <alex@gnu.org>
diff --git a/lisp/erc/erc-list.el b/lisp/erc/erc-list.el
index b86cf4e6c0..73c630f8a6 100644
--- a/lisp/erc/erc-list.el
+++ b/lisp/erc/erc-list.el
@@ -223,4 +223,3 @@ to RFC and send the LIST header (#321) at start of list transmission."
;; tab-width: 8
;; End:
-;; arch-tag: 99c5f9cb-6bac-4224-86bf-e394768cd1d0
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index de6d755eb6..3b5e81d271 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -451,4 +451,3 @@ You can save every individual message by putting this function on
;; tab-width: 8
;; End:
-;; arch-tag: 54072f99-9f0a-4846-8908-2ccde92221de
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index 24170caa12..e0603a6409 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -635,4 +635,3 @@ This function is meant to be called from `erc-text-matched-hook'."
;; tab-width: 8
;; End:
-;; arch-tag: 1f1f595e-abcc-4b0b-83db-598a1d3f0f82
diff --git a/lisp/erc/erc-menu.el b/lisp/erc/erc-menu.el
index 627b0453c8..b5c399278c 100644
--- a/lisp/erc/erc-menu.el
+++ b/lisp/erc/erc-menu.el
@@ -148,4 +148,3 @@ ERC menu yet.")
;; tab-width: 8
;; End:
-;; arch-tag: 671219f2-b082-4753-a185-1d0c7e0c05bd
diff --git a/lisp/erc/erc-netsplit.el b/lisp/erc/erc-netsplit.el
index 4003431f6a..9662c556d4 100644
--- a/lisp/erc/erc-netsplit.el
+++ b/lisp/erc/erc-netsplit.el
@@ -209,4 +209,3 @@ join from that split has been detected or not.")
;; tab-width: 8
;; End:
-;; arch-tag: 61a85cb0-7e7b-4312-a4f6-313c7a25a6e8
diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el
index f20f0b397d..6cb8192273 100644
--- a/lisp/erc/erc-networks.el
+++ b/lisp/erc/erc-networks.el
@@ -865,4 +865,3 @@ VALUE is the options value.")
;; tab-width: 8
;; End:
-;; arch-tag: 68cccabd-f66b-456c-9abe-5f993a2dc91c
diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el
index 80427be16d..7da36b14f1 100644
--- a/lisp/erc/erc-notify.el
+++ b/lisp/erc/erc-notify.el
@@ -251,4 +251,3 @@ with args, toggle notify status of people."
;; tab-width: 8
;; End:
-;; arch-tag: 0fb19dd0-1359-458a-89b7-81dc195a588e
diff --git a/lisp/erc/erc-page.el b/lisp/erc/erc-page.el
index aaaf800956..510cb4af58 100644
--- a/lisp/erc/erc-page.el
+++ b/lisp/erc/erc-page.el
@@ -109,4 +109,3 @@ receive pages if `erc-page-mode' is on."
;; tab-width: 8
;; End:
-;; arch-tag: 82fd2e0e-6060-4dd2-9788-8c1411e844de
diff --git a/lisp/erc/erc-pcomplete.el b/lisp/erc/erc-pcomplete.el
index 0b1071ce79..540fd19365 100644
--- a/lisp/erc/erc-pcomplete.el
+++ b/lisp/erc/erc-pcomplete.el
@@ -279,4 +279,3 @@ up to where point is right now."
;; indent-tabs-mode: nil
;; End:
-;; arch-tag: 32a7703b-be87-45a4-82f3-9eed5a628911
diff --git a/lisp/erc/erc-replace.el b/lisp/erc/erc-replace.el
index df339fec4e..a75099775e 100644
--- a/lisp/erc/erc-replace.el
+++ b/lisp/erc/erc-replace.el
@@ -94,4 +94,3 @@ It replaces text according to `erc-replace-alist'."
;; tab-width: 8
;; End:
-;; arch-tag: dd904a59-d8a6-47f8-ac3a-76b698289a18
diff --git a/lisp/erc/erc-ring.el b/lisp/erc/erc-ring.el
index 6564d1446f..2c958db477 100644
--- a/lisp/erc/erc-ring.el
+++ b/lisp/erc/erc-ring.el
@@ -144,4 +144,3 @@ containing a password."
;; indent-tabs-mode: nil
;; End:
-;; arch-tag: b77924a8-a80e-489d-84cd-b351761ea5c8
diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el
index 582737e724..88716d1e9a 100644
--- a/lisp/erc/erc-services.el
+++ b/lisp/erc/erc-services.el
@@ -445,4 +445,3 @@ When called interactively, read the password using `read-passwd'."
;; tab-width: 8
;; End:
-;; arch-tag: d401c8aa-d938-4255-96a9-3efb64c47e58
diff --git a/lisp/erc/erc-sound.el b/lisp/erc/erc-sound.el
index 9664df90f3..66a4ebc8d1 100644
--- a/lisp/erc/erc-sound.el
+++ b/lisp/erc/erc-sound.el
@@ -147,4 +147,3 @@ See also `play-sound-file'."
;; tab-width: 8
;; End:
-;; arch-tag: 53657d1d-007f-4a20-91c1-588e71cf0cee
diff --git a/lisp/erc/erc-speedbar.el b/lisp/erc/erc-speedbar.el
index aa45230af0..9e59ec9466 100644
--- a/lisp/erc/erc-speedbar.el
+++ b/lisp/erc/erc-speedbar.el
@@ -366,4 +366,3 @@ The INDENT level is ignored."
;; tab-width: 8
;; End:
-;; arch-tag: 7a6558a4-3308-4bf5-a284-e1d042c933c6
diff --git a/lisp/erc/erc-spelling.el b/lisp/erc/erc-spelling.el
index 6e8fe5649d..6cf3d558f6 100644
--- a/lisp/erc/erc-spelling.el
+++ b/lisp/erc/erc-spelling.el
@@ -106,5 +106,4 @@ The cadr is the beginning and the caddr is the end."
(provide 'erc-spelling)
-;; arch-tag: 04ae1c46-0fd1-4e1a-8b80-55bfa471c945
;;; erc-spelling.el ends here
diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index 1efe8983cf..a107598e5c 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -422,4 +422,3 @@ NOW is position of point currently."
;; tab-width: 8
;; End:
-;; arch-tag: 57aefab4-63e0-4c48-91d5-6efa145487e0
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index f07d963cfd..4303a529cb 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -1068,4 +1068,3 @@ switch back to the last non-ERC buffer visited. Next is defined by
;; tab-width: 8
;; End:
-;; arch-tag: 11b439f5-e5d7-4c6c-bb3f-eda98f9b0ac1
diff --git a/lisp/erc/erc-truncate.el b/lisp/erc/erc-truncate.el
index 9ed32b6c6e..6363564661 100644
--- a/lisp/erc/erc-truncate.el
+++ b/lisp/erc/erc-truncate.el
@@ -115,4 +115,3 @@ Meant to be used in hooks, like `erc-insert-post-hook'."
;; tab-width: 8
;; End:
-;; arch-tag: 22a2ea78-871f-4870-8f1e-efe534170311
diff --git a/lisp/erc/erc-xdcc.el b/lisp/erc/erc-xdcc.el
index 80b4afab09..36bb5f4f12 100644
--- a/lisp/erc/erc-xdcc.el
+++ b/lisp/erc/erc-xdcc.el
@@ -136,4 +136,3 @@ being evaluated and should return strings."
;; tab-width: 8
;; End:
-;; arch-tag: a13b62fe-2399-4562-af4e-f18a8dd4b9c8
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index ab3f12a59b..90ed3dbeef 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -6529,4 +6529,3 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL."
;; tab-width: 8
;; End:
-;; arch-tag: d19587f6-627e-48c1-8d86-58595fa3eca3
diff --git a/lisp/eshell/.gitignore b/lisp/eshell/.gitignore
index 8f16f9600f..2abf84ba3e 100644
--- a/lisp/eshell/.gitignore
+++ b/lisp/eshell/.gitignore
@@ -1,3 +1,2 @@
esh-groups.el
-# arch-tag: 270e983f-fee5-4b6d-a00b-c1bafdee8690
diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el
index 11f1bd4e9f..0ed1b298f6 100644
--- a/lisp/eshell/em-alias.el
+++ b/lisp/eshell/em-alias.el
@@ -279,5 +279,4 @@ These are all the command aliases which begin with NAME."
;; generated-autoload-file: "esh-groups.el"
;; End:
-;; arch-tag: 8b018fc1-4e07-4ccc-aa73-c0a1ba361f82
;;; em-alias.el ends here
diff --git a/lisp/eshell/em-banner.el b/lisp/eshell/em-banner.el
index 8600bf4891..14d8eb5d04 100644
--- a/lisp/eshell/em-banner.el
+++ b/lisp/eshell/em-banner.el
@@ -96,5 +96,4 @@ This can be any sexp, and should end with at least two newlines."
;; generated-autoload-file: "esh-groups.el"
;; End:
-;; arch-tag: e738b4ef-8671-42ae-a757-291779b92491
;;; em-banner.el ends here
diff --git a/lisp/eshell/em-basic.el b/lisp/eshell/em-basic.el
index 342521e106..1fff2c1e20 100644
--- a/lisp/eshell/em-basic.el
+++ b/lisp/eshell/em-basic.el
@@ -184,5 +184,4 @@ or `eshell-printn' for display."
;; generated-autoload-file: "esh-groups.el"
;; End:
-;; arch-tag: 385a31b1-cb95-46f0-9829-9d352ee77db8
;;; em-basic.el ends here
diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el
index 0ecf713131..30d8ac5407 100644
--- a/lisp/eshell/em-cmpl.el
+++ b/lisp/eshell/em-cmpl.el
@@ -455,5 +455,4 @@ to writing a completion function."
;; generated-autoload-file: "esh-groups.el"
;; End:
-;; arch-tag: 0e914699-673a-45f8-8cbf-82e1dbc571bc
;;; em-cmpl.el ends here
diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el
index e6ef340cad..3614ad2eca 100644
--- a/lisp/eshell/em-dirs.el
+++ b/lisp/eshell/em-dirs.el
@@ -573,5 +573,4 @@ in the minibuffer:
;; generated-autoload-file: "esh-groups.el"
;; End:
-;; arch-tag: 1e9c5a95-f1bd-45f8-ad36-55aac706e787
;;; em-dirs.el ends here
diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index c687d35e7f..8ee2bfe489 100644
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -998,5 +998,4 @@ If N is negative, search backwards for the -Nth previous match."
;; generated-autoload-file: "esh-groups.el"
;; End:
-;; arch-tag: 1a847333-f864-4b96-9acd-b549d620b6c6
;;; em-hist.el ends here
diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index d7adaac903..4d29413b42 100644
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -177,5 +177,4 @@ If this takes us past the end of the current line, don't skip at all."
;; generated-autoload-file: "esh-groups.el"
;; End:
-;; arch-tag: 01c1574b-ce70-4e89-bc38-e6619f61e208
;;; em-prompt.el ends here
diff --git a/lisp/eshell/em-rebind.el b/lisp/eshell/em-rebind.el
index 8d32688928..2807f9acb4 100644
--- a/lisp/eshell/em-rebind.el
+++ b/lisp/eshell/em-rebind.el
@@ -246,5 +246,4 @@ input."
;; generated-autoload-file: "esh-groups.el"
;; End:
-;; arch-tag: 76d84f12-cc56-4d67-9b7d-c6b44ad20530
;;; em-rebind.el ends here
diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el
index a6fa3ee580..dac8d66dce 100644
--- a/lisp/eshell/em-script.el
+++ b/lisp/eshell/em-script.el
@@ -142,5 +142,4 @@ environment, binding ARGS to $1, $2, etc.")
;; generated-autoload-file: "esh-groups.el"
;; End:
-;; arch-tag: a346439d-5ba8-4faf-ac2b-3aacfeaa4647
;;; em-script.el ends here
diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el
index 46a98b97da..4baeb85f99 100644
--- a/lisp/eshell/em-smart.el
+++ b/lisp/eshell/em-smart.el
@@ -327,5 +327,4 @@ and the end of the buffer are still visible."
;; generated-autoload-file: "esh-groups.el"
;; End:
-;; arch-tag: 8c0112c7-379c-4d54-9a1c-204d68786a4b
;;; em-smart.el ends here
diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index 97a5ac4741..18fc8240b2 100644
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -267,5 +267,4 @@ allowed."
;; generated-autoload-file: "esh-groups.el"
;; End:
-;; arch-tag: ab7c8fe4-3101-4257-925b-1354c6b2fe9d
;;; em-term.el ends here
diff --git a/lisp/eshell/em-xtra.el b/lisp/eshell/em-xtra.el
index e36d3b9aa5..1b61b7cdb9 100644
--- a/lisp/eshell/em-xtra.el
+++ b/lisp/eshell/em-xtra.el
@@ -123,5 +123,4 @@ naturally accessible within Emacs."
;; generated-autoload-file: "esh-groups.el"
;; End:
-;; arch-tag: f944cfda-a118-470c-a0d6-b41a3a5c99c7
;;; em-xtra.el ends here
diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el
index 0485c4f5b9..51265ce121 100644
--- a/lisp/eshell/esh-arg.el
+++ b/lisp/eshell/esh-arg.el
@@ -391,5 +391,4 @@ special character that is not itself a backslash."
(char-to-string (char-after)))))
(goto-char end)))))))
-;; arch-tag: 7f593a2b-8fc1-4def-8f84-8f51ed0198d6
;;; esh-arg.el ends here
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index 53d142537b..20101f7199 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -1434,5 +1434,4 @@ messages, and errors."
(provide 'esh-cmd)
-;; arch-tag: 8e4f3867-a0c5-441f-96ba-ddd142d94366
;;; esh-cmd.el ends here
diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el
index 239a265b52..e49e3c9e8c 100644
--- a/lisp/eshell/esh-ext.el
+++ b/lisp/eshell/esh-ext.el
@@ -1,7 +1,7 @@
;;; esh-ext.el --- commands external to Eshell
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
@@ -306,5 +306,4 @@ line of the form #!<interp>."
(cdr interp)))))
(or interp (list fullname)))))))
-;; arch-tag: 178d4064-7e60-4745-b81f-bab5d8d7c40f
;;; esh-ext.el ends here
diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el
index f6d635b3b3..d35e1ed659 100644
--- a/lisp/eshell/esh-io.el
+++ b/lisp/eshell/esh-io.el
@@ -516,5 +516,4 @@ Returns what was actually sent, or nil if nothing was sent."
(eshell-output-object-to-target object (car target))
(setq target (cdr target))))))
-;; arch-tag: 9ca2080f-d5e0-4b26-aa0b-d59194a905a2
;;; esh-io.el ends here
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index d031b71825..a344b4a00d 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -1083,5 +1083,4 @@ This function could be in the list `eshell-output-filter-functions'."
(custom-add-option 'eshell-output-filter-functions
'eshell-handle-ansi-color)
-;; arch-tag: ec65bc2b-da14-4547-81d3-a32af3a4dc57
;;; esh-mode.el ends here
diff --git a/lisp/eshell/esh-module.el b/lisp/eshell/esh-module.el
index d56e17211d..bb1c920488 100644
--- a/lisp/eshell/esh-module.el
+++ b/lisp/eshell/esh-module.el
@@ -100,5 +100,4 @@ customization group. Example: `eshell-cmpl' for that module."
(unload-feature module)
(message "Unloading %s...done" (symbol-name module))))))
-;; arch-tag: 97a3fa16-9d08-40e6-bc2c-36bd70986507
;;; esh-module.el ends here
diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el
index 040cba66f3..fbd98992c3 100644
--- a/lisp/eshell/esh-proc.el
+++ b/lisp/eshell/esh-proc.el
@@ -1,7 +1,7 @@
;;; esh-proc.el --- process management
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
@@ -527,5 +527,4 @@ See the variable `eshell-kill-processes-on-exit'."
(eshell-send-input nil nil t)
(eshell-process-interact 'process-send-eof))
-;; arch-tag: ac477a3e-ee4d-4b44-8ec6-212010e607bb
;;; esh-proc.el ends here
diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el
index 2d72183fdc..821f0030c7 100644
--- a/lisp/eshell/esh-var.el
+++ b/lisp/eshell/esh-var.el
@@ -1,7 +1,7 @@
;;; esh-var.el --- handling of variables
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
@@ -653,5 +653,4 @@ For example, to retrieve the second element of a user's record in
(setq pcomplete-stub (substring arg pos))
(throw 'pcomplete-completions (pcomplete-entries)))))
-;; arch-tag: 393654fe-bdad-4f27-9a10-b1472ded14cf
;;; esh-var.el ends here
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index 9e0c5b7bdb..404c0db110 100644
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -491,5 +491,4 @@ Emacs."
(provide 'eshell)
-;; arch-tag: 9d4d5214-0e4e-4e02-b349-39add640d63f
;;; eshell.el ends here
diff --git a/lisp/expand.el b/lisp/expand.el
index 25752dd331..447f85d6cf 100644
--- a/lisp/expand.el
+++ b/lisp/expand.el
@@ -504,5 +504,4 @@ This is used only in conjunction with `expand-add-abbrevs'."
;; run load hooks
(run-hooks 'expand-load-hook)
-;; arch-tag: fee53e9e-30e3-4ef3-b191-9785e1f8e885
;;; expand.el ends here
diff --git a/lisp/ezimage.el b/lisp/ezimage.el
index 47fca5fbad..2119b7f6aa 100644
--- a/lisp/ezimage.el
+++ b/lisp/ezimage.el
@@ -350,5 +350,4 @@ See `ezimage-expand-image-button-alist' for details."
(provide 'ezimage)
-;; arch-tag: d4ea2d93-3c7a-4cb3-b5a6-c1b9178183aa
;;; sb-image.el ends here
diff --git a/lisp/face-remap.el b/lisp/face-remap.el
index 3420eea29e..ae4d61f022 100644
--- a/lisp/face-remap.el
+++ b/lisp/face-remap.el
@@ -423,5 +423,4 @@ Besides the choice of face, it is the same as `buffer-face-mode'."
(provide 'face-remap)
-;; arch-tag: 5c5f034b-8d58-4967-82bd-d61fd364e686
;;; face-remap.el ends here
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 76c555da57..99f17ba355 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -910,5 +910,4 @@ Returns the non-nil value it found, or nil if all were nil."
(provide 'facemenu)
-;; arch-tag: 85f6d02b-9085-420e-b651-0678f0e9c7eb
;;; facemenu.el ends here
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 842e693a0c..33b2518d19 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -1960,5 +1960,4 @@ Of course if you do not like these bindings, just roll your own!")
(provide 'ffap)
-;; arch-tag: 9dd3e88a-5dec-4607-bd57-60ae9ede8ebc
;;; ffap.el ends here
diff --git a/lisp/files-x.el b/lisp/files-x.el
index 3ad86deaea..769d586b99 100644
--- a/lisp/files-x.el
+++ b/lisp/files-x.el
@@ -461,5 +461,4 @@ from the MODE alist ignoring the input argument VALUE."
(provide 'files-x)
-;; arch-tag: 949d263c-30a8-4b49-af26-cda97c7c5477
;;; files-x.el ends here
diff --git a/lisp/files.el b/lisp/files.el
index 1e03ba1920..312ecb3852 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -57,7 +57,10 @@ when it has unsaved changes."
A list of elements of the form (FROM . TO), each meaning to replace
FROM with TO when it appears in a directory name. This replacement is
done when setting up the default directory of a newly visited file.
-*Every* FROM string ought to start with \"\\\\`\".
+
+FROM is matched against directory names anchored at the first
+character, so it should start with a \"\\\\`\", or, if directory
+names cannot have embedded newlines, with a \"^\".
FROM and TO should be equivalent names, which refer to the
same directory. Do not use `~' in the TO strings;
@@ -3775,10 +3778,9 @@ BACKUPNAME is the backup file name, which is the old file renamed."
(rename-file real-file-name backupname t)
(setq setmodes (list modes context backupname)))
(file-error
- ;; If trouble writing the backup, write it in ~.
- (setq backupname (expand-file-name
- (convert-standard-filename
- "~/%backup%~")))
+ ;; If trouble writing the backup, write it in
+ ;; .emacs.d/%backup%.
+ (setq backupname (locate-user-emacs-file "%backup%~"))
(message "Cannot write backup file; backing up in %s"
backupname)
(sleep-for 1)
diff --git a/lisp/filesets.el b/lisp/filesets.el
index 5eb8c106e0..618a1b98a5 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -2534,5 +2534,4 @@ Set up hooks, load the cache file -- if existing -- and build the menu."
;; sentence-end-double-space:t
;; End:
-;; arch-tag: 2c03f85f-c3df-4cec-b0a3-b46fd5592d70
;;; filesets.el ends here
diff --git a/lisp/find-cmd.el b/lisp/find-cmd.el
index b7dc11c121..8beae14101 100644
--- a/lisp/find-cmd.el
+++ b/lisp/find-cmd.el
@@ -240,5 +240,4 @@ them into valid switches. The result is -and(ed) together."
(provide 'find-cmd)
-;; arch-tag: 9687fd9e-4e90-4022-864a-f904526e2046
;;; find-cmd.el ends here
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 975493e074..a4a256a967 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -312,5 +312,4 @@ Thus ARG can also contain additional grep options."
(provide 'find-dired)
-;; arch-tag: 8edece95-af00-4221-bc74-a4bd2f75f9b0
;;; find-dired.el ends here
diff --git a/lisp/find-file.el b/lisp/find-file.el
index 244a9470d5..1cadbb9112 100644
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -968,5 +968,4 @@ That name was previously determined by `ff-which-function-are-we-in'."
(provide 'find-file)
-;; arch-tag: 5a2fc49e-3b0a-4708-9acf-fb14e471a97a
;;; find-file.el ends here
diff --git a/lisp/find-lisp.el b/lisp/find-lisp.el
index 9c76e8ed26..c912b0d3e2 100644
--- a/lisp/find-lisp.el
+++ b/lisp/find-lisp.el
@@ -356,5 +356,4 @@ It is a function which takes two arguments, the directory and its parent."
(provide 'find-lisp)
-;; arch-tag: a711374c-f12a-46f6-aa18-ba7d77b9602a
;;; find-lisp.el ends here
diff --git a/lisp/finder.el b/lisp/finder.el
index 4a0277c6e7..6245d7f046 100644
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -428,5 +428,4 @@ Delete the window and kill all Finder-related buffers."
(provide 'finder)
-;; arch-tag: ec85ff49-8cb8-41f5-a63f-9131d53ce2c5
;;; finder.el ends here
diff --git a/lisp/flow-ctrl.el b/lisp/flow-ctrl.el
index d8e6154c52..243c74f437 100644
--- a/lisp/flow-ctrl.el
+++ b/lisp/flow-ctrl.el
@@ -122,5 +122,4 @@ to get the effect of a C-q."
(provide 'flow-ctrl)
-;; arch-tag: 0eb7b19e-0d93-4e0b-9ea2-72b574076a56
;;; flow-ctrl.el ends here
diff --git a/lisp/foldout.el b/lisp/foldout.el
index 87941a9333..f1b26aa5e5 100644
--- a/lisp/foldout.el
+++ b/lisp/foldout.el
@@ -565,5 +565,4 @@ Valid modifiers are shift, control, meta, alt, hyper and super.")
(provide 'foldout)
-;; arch-tag: 19d095a2-1f09-42a7-a5ac-e2a3078cfe95
;;; foldout.el ends here
diff --git a/lisp/follow.el b/lisp/follow.el
index 57a8f231b1..57b48bfe43 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -2122,5 +2122,4 @@ This prevents `mouse-drag-region' from messing things up."
;; | save it". -- Douglas Adams, "Last Chance to See" |
;; \------------------------------------------------------------------------/
-;; arch-tag: 7b16bb1a-808c-4991-a8cc-66d3822936d0
;;; follow.el ends here
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 3dbae271a4..7cec6b8813 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1,8 +1,8 @@
;;; font-lock.el --- Electric font lock mode
;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+;; 2010, 2011 Free Software Foundation, Inc.
;; Author: Jamie Zawinski
;; Richard Stallman
diff --git a/lisp/format.el b/lisp/format.el
index 59cb1a2b13..4281a46a1c 100644
--- a/lisp/format.el
+++ b/lisp/format.el
@@ -1087,5 +1087,4 @@ OLD and NEW are the values."
(provide 'format)
-;; arch-tag: c387e9c7-a93d-47bf-89bc-8ca67e96755a
;;; format.el ends here
diff --git a/lisp/forms-d2.el b/lisp/forms-d2.el
index 00c26d43ec..3487675cbb 100644
--- a/lisp/forms-d2.el
+++ b/lisp/forms-d2.el
@@ -101,5 +101,4 @@ used to fill to the column."
;; That's all, folks!
-;; arch-tag: 8e5d5dac-7abf-4722-ab5e-03eb749beaca
;;; forms-d2.el ends here
diff --git a/lisp/forms-pass.el b/lisp/forms-pass.el
index 431dca5878..b635c965cf 100644
--- a/lisp/forms-pass.el
+++ b/lisp/forms-pass.el
@@ -30,5 +30,4 @@
"Shell: " 7
"\n"))
-;; arch-tag: 74801012-1a2d-4173-b9e4-fcfa241e2305
;;; forms-pass.el ends here
diff --git a/lisp/forms.el b/lisp/forms.el
index 1d5cc9f419..c7fd658246 100644
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -2055,5 +2055,4 @@ Usage: (setq forms-number-of-fields
(goto-char (point-max))
(insert ret)))))
-;; arch-tag: 4a6695c7-d47a-4a21-809b-5cec7f8ec7a1
;;; forms.el ends here
diff --git a/lisp/frame.el b/lisp/frame.el
index 7b063beba4..7898c3ed31 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1,7 +1,8 @@
;;; frame.el --- multi-frame management independent of window systems
;; Copyright (C) 1993, 1994, 1996, 1997, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
diff --git a/lisp/fringe.el b/lisp/fringe.el
index c42e2f8cf0..8dfe203f39 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -269,5 +269,4 @@ SIDE must be the symbol `left' or `right'."
(provide 'fringe)
-;; arch-tag: 6611ef60-0869-47ed-8b93-587ee7d3ff5d
;;; fringe.el ends here
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index ee7a75491b..9c503afc30 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -1992,5 +1992,4 @@ like an INI file. You can add this hook to `find-file-hook'."
(provide 'generic-x)
-;; arch-tag: cde692a5-9ff6-4506-9999-c67999c2bdb5
;;; generic-x.el ends here
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 326d6dbf24..b3d9ac82a9 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-15 Glenn Morris <rgm@gnu.org>
+
+ * message.el (message-mail): A compose-mail function should
+ accept headers as strings.
+
2011-01-13 Chong Yidong <cyd@stupidchicken.com>
* message.el (message-tool-bar-gnome): Tweak tool-bar items. Add
@@ -19031,7 +19036,8 @@
See ChangeLog.2 for earlier changes.
- Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+ Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1
index aef65e8116..6935163739 100644
--- a/lisp/gnus/ChangeLog.1
+++ b/lisp/gnus/ChangeLog.1
@@ -3726,4 +3726,3 @@
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: c2f4e9c8-94fb-4c63-bdfd-4ab680cc9db7
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index 933734f8cc..15f326486d 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -18575,4 +18575,3 @@ See ChangeLog.1 for earlier changes.
;; coding: iso-2022-7bit
;; End:
-;; arch-tag: 956fd310-042f-4fca-8dca-a01dbe06acff
diff --git a/lisp/gnus/ecomplete.el b/lisp/gnus/ecomplete.el
index e749c47bec..8d6ba7a32e 100644
--- a/lisp/gnus/ecomplete.el
+++ b/lisp/gnus/ecomplete.el
@@ -1,6 +1,7 @@
;;; ecomplete.el --- electric completion of addresses and the like
-;; Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: mail
diff --git a/lisp/gnus/flow-fill.el b/lisp/gnus/flow-fill.el
index 40639290f1..66422d2f7d 100644
--- a/lisp/gnus/flow-fill.el
+++ b/lisp/gnus/flow-fill.el
@@ -1,7 +1,7 @@
;;; flow-fill.el --- interpret RFC2646 "flowed" text
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Simon Josefsson <jas@pdc.kth.se>
;; Keywords: mail
diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index b073984892..ec8fe67b9c 100644
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/gmm-utils.el
@@ -1,6 +1,7 @@
;;; gmm-utils.el --- Utility functions for Gnus, Message and MML
-;; Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Reiner Steib <reiner.steib@gmx.de>
;; Keywords: news
diff --git a/lisp/gnus/gnus-bookmark.el b/lisp/gnus/gnus-bookmark.el
index a72b0c4fb7..3688f4de1e 100644
--- a/lisp/gnus/gnus-bookmark.el
+++ b/lisp/gnus/gnus-bookmark.el
@@ -1,6 +1,7 @@
;;; gnus-bookmark.el --- Bookmarks in Gnus
-;; Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Bastien Guerry <bzg AT altern DOT org>
;; Keywords: news
diff --git a/lisp/gnus/gnus-dired.el b/lisp/gnus/gnus-dired.el
index 951e3683dc..bfccda422f 100644
--- a/lisp/gnus/gnus-dired.el
+++ b/lisp/gnus/gnus-dired.el
@@ -1,7 +1,7 @@
;;; gnus-dired.el --- utility functions where gnus and dired meet
-;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Authors: Benjamin Rutt <brutt@bloomington.in.us>,
;; Shenghuo Zhu <zsh@cs.rochester.edu>
diff --git a/lisp/gnus/gnus-gravatar.el b/lisp/gnus/gnus-gravatar.el
index e46460e726..53d1310a09 100644
--- a/lisp/gnus/gnus-gravatar.el
+++ b/lisp/gnus/gnus-gravatar.el
@@ -1,6 +1,6 @@
;;; gnus-gravatar.el --- Gnus Gravatar support
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Julien Danjou <julien@danjou.info>
;; Keywords: news
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 2044d5714b..a21053c60b 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -1,8 +1,8 @@
;;; gnus-group.el --- group mode commands for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-;; Foundation, Inc.
+;; 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index deeb3565bc..acc018f824 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -1,6 +1,6 @@
;;; gnus-html.el --- Render HTML in a buffer.
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: html, web
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index e352ffacef..506bd9f735 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1,8 +1,8 @@
;;; gnus-msg.el --- mail and post interface for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-;; Foundation, Inc.
+;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
;; Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 69d5c05432..0a358fa8da 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -1,7 +1,7 @@
;;; gnus-registry.el --- article registry for Gnus
-;;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;;; Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+;; 2011 Free Software Foundation, Inc.
;; Author: Ted Zlatanov <tzz@lifelogs.com>
;; Keywords: news registry
diff --git a/lisp/gnus/gnus-sync.el b/lisp/gnus/gnus-sync.el
index 8a492e8d2c..56f59c2904 100644
--- a/lisp/gnus/gnus-sync.el
+++ b/lisp/gnus/gnus-sync.el
@@ -1,6 +1,6 @@
;;; gnus-sync.el --- synchronization facility for Gnus
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Ted Zlatanov <tzz@lifelogs.com>
;; Keywords: news synchronization nntp nnrss
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index a8274e8084..cdac6e3e62 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1,8 +1,8 @@
;;; gnus.el --- a newsreader for GNU Emacs
-;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997, 1998,
-;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997,
+;; 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+;; 2010, 2011 Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
;; Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/gravatar.el b/lisp/gnus/gravatar.el
index c17bd201d2..158347fb00 100644
--- a/lisp/gnus/gravatar.el
+++ b/lisp/gnus/gravatar.el
@@ -1,6 +1,6 @@
;;; gravatar.el --- Get Gravatars
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Julien Danjou <julien@danjou.info>
;; Keywords: news
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index a3ba781c6c..d6259ec5e1 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -1,7 +1,7 @@
;;; mail-source.el --- functions for fetching mail
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news, mail
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 6ebcdc2876..64569cfb99 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6512,7 +6512,13 @@ is a function used to switch to and display the mail buffer."
(message-setup
(nconc
`((To . ,(or to "")) (Subject . ,(or subject "")))
- (when other-headers other-headers))
+ ;; C-h f compose-mail says that headers should be specified as
+ ;; (string . value); however all the rest of message expects
+ ;; headers to be symbols, not strings (eg message-header-format-alist).
+ ;; http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00337.html
+ ;; We need to convert any string input, eg from rmail-start-mail.
+ (dolist (h other-headers other-headers)
+ (if (stringp (car h)) (setcar h (intern (capitalize (car h)))))))
yank-action send-actions continue switch-function
return-action)
;; FIXME: Should return nil if failure.
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 5a3972e919..6275534714 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1,7 +1,7 @@
;;; mm-decode.el --- Functions for decoding MIME things
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; MORIOKA Tomohiko <morioka@jaist.ac.jp>
diff --git a/lisp/gnus/mm-extern.el b/lisp/gnus/mm-extern.el
index d1b346745a..9eb033e3cd 100644
--- a/lisp/gnus/mm-extern.el
+++ b/lisp/gnus/mm-extern.el
@@ -1,7 +1,7 @@
;;; mm-extern.el --- showing message/external-body
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: message external-body
diff --git a/lisp/gnus/nnbabyl.el b/lisp/gnus/nnbabyl.el
index 51e0466495..2346c05c85 100644
--- a/lisp/gnus/nnbabyl.el
+++ b/lisp/gnus/nnbabyl.el
@@ -1,7 +1,8 @@
;;; nnbabyl.el --- rmail mbox access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1099, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 63ed4962d4..d5f3a52311 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -1,7 +1,8 @@
;;; nnmail.el --- mail support functions for the Gnus mail backends
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news, mail
diff --git a/lisp/gnus/nnregistry.el b/lisp/gnus/nnregistry.el
index 03ff5e716a..e8d3a06627 100644
--- a/lisp/gnus/nnregistry.el
+++ b/lisp/gnus/nnregistry.el
@@ -1,7 +1,7 @@
;;; nnregistry.el --- access to articles via Gnus' message-id registry
;;; -*- coding: utf-8 -*-
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Authors: Ludovic Courtès <ludo@gnu.org>
;; Keywords: news, mail
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 685c32504d..1bf18c9f2d 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1,8 +1,8 @@
;;; nntp.el --- nntp access for Gnus
-;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993,
-;; 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002,
-;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993, 1994, 1995, 1996,
+;; 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
diff --git a/lisp/gnus/rtree.el b/lisp/gnus/rtree.el
index 04079b1ba8..9bcf45ef65 100644
--- a/lisp/gnus/rtree.el
+++ b/lisp/gnus/rtree.el
@@ -1,6 +1,6 @@
;;; rtree.el --- functions for manipulating range trees
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/shr-color.el b/lisp/gnus/shr-color.el
index afb56ae38a..e7fd008779 100644
--- a/lisp/gnus/shr-color.el
+++ b/lisp/gnus/shr-color.el
@@ -1,6 +1,6 @@
;;; shr-color.el --- Simple HTML Renderer color management
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Julien Danjou <julien@danjou.info>
;; Keywords: html
diff --git a/lisp/gnus/sieve-manage.el b/lisp/gnus/sieve-manage.el
index 9c6af8b9df..cfecab8993 100644
--- a/lisp/gnus/sieve-manage.el
+++ b/lisp/gnus/sieve-manage.el
@@ -1,7 +1,7 @@
;;; sieve-manage.el --- Implementation of the managesive protocol in elisp
-;; 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: Simon Josefsson <simon@josefsson.org>
diff --git a/lisp/gnus/sieve-mode.el b/lisp/gnus/sieve-mode.el
index 6acb6e74fb..bfd45dfdd8 100644
--- a/lisp/gnus/sieve-mode.el
+++ b/lisp/gnus/sieve-mode.el
@@ -1,7 +1,7 @@
;;; sieve-mode.el --- Sieve code editing commands for Emacs
-;; 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: Simon Josefsson <simon@josefsson.org>
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index c25c9c669a..4cd79c11ac 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -1,7 +1,7 @@
;;; smime.el --- S/MIME support library
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org>
;; Keywords: SMIME X.509 PEM OpenSSL
diff --git a/lisp/gnus/spam-stat.el b/lisp/gnus/spam-stat.el
index eeb112f29b..43ca98961f 100644
--- a/lisp/gnus/spam-stat.el
+++ b/lisp/gnus/spam-stat.el
@@ -1,6 +1,7 @@
;;; spam-stat.el --- detecting spam based on statistics
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+;; 2010, 2011 Free Software Foundation, Inc.
;; Author: Alex Schroeder <alex@gnu.org>
;; Keywords: network
diff --git a/lisp/gs.el b/lisp/gs.el
index a890a33db3..362dbf7f3d 100644
--- a/lisp/gs.el
+++ b/lisp/gs.el
@@ -221,5 +221,4 @@ the form \"WINDOW-ID PIXMAP-ID\". Value is non-nil if successful."
(provide 'gs)
-;; arch-tag: 06ab51b8-4932-4cfe-9f60-b924a8edb3f0
;;; gs.el ends here
diff --git a/lisp/help-at-pt.el b/lisp/help-at-pt.el
index c4d1111117..c78815395b 100644
--- a/lisp/help-at-pt.el
+++ b/lisp/help-at-pt.el
@@ -350,5 +350,4 @@ different regions. With numeric argument ARG, behaves like
(provide 'help-at-pt)
-;; arch-tag: d0b8b86d-d23f-45d0-a82d-208d6205a583
;;; help-at-pt.el ends here
diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 30807fcd25..ca6966e4cd 100644
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -202,5 +202,4 @@ and then returns."
(provide 'help-macro)
-;; arch-tag: 59fee949-1686-485a-8a05-83418073e257
;;; help-macro.el ends here
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index eefc68ab62..9be1f319c8 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -829,5 +829,4 @@ help buffer by other means."
(provide 'help-mode)
-;; arch-tag: 850954ae-3725-4cb4-8e91-0bf6d52d6b0b
;;; help-mode.el ends here
diff --git a/lisp/help.el b/lisp/help.el
index f7a8ca1634..bdbc25b949 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1,7 +1,8 @@
;;; help.el --- help commands for Emacs
;; Copyright (C) 1985, 1986, 1993, 1994, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: help, internal
diff --git a/lisp/hexl.el b/lisp/hexl.el
index 3cd987df0a..725cb3a612 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -199,20 +199,8 @@ Quoting cannot be used, so the arguments cannot themselves contain spaces."
(defvar hl-line-face)
;; Variables where the original values are stored to.
-(defvar hexl-mode-old-hl-line-mode)
-(defvar hexl-mode-old-hl-line-range-function)
-(defvar hexl-mode-old-hl-line-face)
-(defvar hexl-mode-old-local-map)
-(defvar hexl-mode-old-mode-name)
-(defvar hexl-mode-old-major-mode)
-(defvar hexl-mode-old-ruler-mode)
-(defvar hexl-mode-old-ruler-function)
-(defvar hexl-mode-old-isearch-search-fun-function)
-(defvar hexl-mode-old-require-final-newline)
-(defvar hexl-mode-old-syntax-table)
-(defvar hexl-mode-old-font-lock-keywords)
-(defvar hexl-mode-old-eldoc-documentation-function)
-(defvar hexl-mode-old-revert-buffer-function)
+(defvar hexl-mode--old-var-vals ())
+(make-variable-buffer-local 'hexl-mode--old-var-vals)
(defvar hexl-ascii-overlay nil
"Overlay used to highlight ASCII element corresponding to current point.")
@@ -229,6 +217,25 @@ Quoting cannot be used, so the arguments cannot themselves contain spaces."
(put 'hexl-mode 'mode-class 'special)
+
+(defun hexl-mode--minor-mode-p (var)
+ (memq var '(ruler-mode hl-line-mode)))
+
+(defun hexl-mode--setq-local (var val)
+ ;; `var' can be either a symbol or a pair, in which case the `car'
+ ;; is the getter function and the `cdr' is the corresponding setter.
+ (unless (or (member var hexl-mode--old-var-vals)
+ (assoc var hexl-mode--old-var-vals))
+ (push (if (or (consp var) (boundp var))
+ (cons var
+ (if (consp var) (funcall (car var)) (symbol-value var)))
+ var)
+ hexl-mode--old-var-vals))
+ (cond
+ ((consp var) (funcall (cdr var) val))
+ ((hexl-mode--minor-mode-p var) (funcall var (if val 1 -1)))
+ (t (set (make-local-variable var) val))))
+
;;;###autoload
(defun hexl-mode (&optional arg)
"\\<hexl-mode-map>A mode for editing binary files in hex dump format.
@@ -334,58 +341,31 @@ You can use \\[hexl-find-file] to visit a file in Hexl mode.
;; We do not turn off the old major mode; instead we just
;; override most of it. That way, we can restore it perfectly.
- (make-local-variable 'hexl-mode-old-local-map)
- (setq hexl-mode-old-local-map (current-local-map))
- (use-local-map hexl-mode-map)
-
- (make-local-variable 'hexl-mode-old-mode-name)
- (setq hexl-mode-old-mode-name mode-name)
- (setq mode-name "Hexl")
- (set (make-local-variable 'hexl-mode-old-isearch-search-fun-function)
- isearch-search-fun-function)
- (set (make-local-variable 'isearch-search-fun-function)
- 'hexl-isearch-search-function)
+ (hexl-mode--setq-local '(current-local-map . use-local-map) hexl-mode-map)
- (make-local-variable 'hexl-mode-old-major-mode)
- (setq hexl-mode-old-major-mode major-mode)
- (setq major-mode 'hexl-mode)
+ (hexl-mode--setq-local 'mode-name "Hexl")
+ (hexl-mode--setq-local 'isearch-search-fun-function
+ 'hexl-isearch-search-function)
+ (hexl-mode--setq-local 'major-mode 'hexl-mode)
- (make-local-variable 'hexl-mode-old-ruler-mode)
- (setq hexl-mode-old-ruler-mode
- (and (boundp 'ruler-mode) ruler-mode))
-
- (make-local-variable 'hexl-mode-old-hl-line-mode)
- (setq hexl-mode-old-hl-line-mode
- (and (boundp 'hl-line-mode) hl-line-mode))
-
- (make-local-variable 'hexl-mode-old-syntax-table)
- (setq hexl-mode-old-syntax-table (syntax-table))
- (set-syntax-table (standard-syntax-table))
+ (hexl-mode--setq-local '(syntax-table . set-syntax-table)
+ (standard-syntax-table))
(add-hook 'write-contents-functions 'hexl-save-buffer nil t)
- (make-local-variable 'hexl-mode-old-require-final-newline)
- (setq hexl-mode-old-require-final-newline require-final-newline)
- (make-local-variable 'require-final-newline)
- (setq require-final-newline nil)
+ (hexl-mode--setq-local 'require-final-newline nil)
- (make-local-variable 'hexl-mode-old-font-lock-keywords)
- (setq hexl-mode-old-font-lock-keywords font-lock-defaults)
- (setq font-lock-defaults '(hexl-font-lock-keywords t))
+
+ (hexl-mode--setq-local 'font-lock-defaults '(hexl-font-lock-keywords t))
- (make-local-variable 'hexl-mode-old-revert-buffer-function)
- (setq hexl-mode-old-revert-buffer-function revert-buffer-function)
- (setq revert-buffer-function 'hexl-revert-buffer-function)
+ (hexl-mode--setq-local 'revert-buffer-function
+ #'hexl-revert-buffer-function)
(add-hook 'change-major-mode-hook 'hexl-maybe-dehexlify-buffer nil t)
;; Set a callback function for eldoc.
- (make-local-variable 'hexl-mode-old-eldoc-documentation-function)
- (setq hexl-mode-old-eldoc-documentation-function
- (bound-and-true-p eldoc-documentation-function))
-
- (set (make-local-variable 'eldoc-documentation-function)
- 'hexl-print-current-point-info)
+ (hexl-mode--setq-local 'eldoc-documentation-function
+ #'hexl-print-current-point-info)
(eldoc-add-command-completions "hexl-")
(eldoc-remove-command "hexl-save-buffer"
"hexl-current-address")
@@ -498,30 +478,22 @@ With arg, don't unhexlify buffer."
(remove-hook 'post-command-hook 'hexl-follow-ascii-find t)
(setq hexl-ascii-overlay nil)
- (if (and (boundp 'ruler-mode) ruler-mode (not hexl-mode-old-ruler-mode))
- (ruler-mode 0))
- (when (boundp 'hexl-mode-old-ruler-function)
- (setq ruler-mode-ruler-function hexl-mode-old-ruler-function))
-
- (if (and (boundp 'hl-line-mode) hl-line-mode (not hexl-mode-old-hl-line-mode))
- (hl-line-mode 0))
- (when (boundp 'hexl-mode-old-hl-line-range-function)
- (setq hl-line-range-function hexl-mode-old-hl-line-range-function))
- (when (boundp 'hexl-mode-old-hl-line-face)
- (setq hl-line-face hexl-mode-old-hl-line-face))
-
- (when (boundp 'hexl-mode-old-eldoc-documentation-function)
- (setq eldoc-documentation-function
- hexl-mode-old-eldoc-documentation-function))
-
- (setq require-final-newline hexl-mode-old-require-final-newline)
- (setq mode-name hexl-mode-old-mode-name)
- (setq isearch-search-fun-function hexl-mode-old-isearch-search-fun-function)
- (use-local-map hexl-mode-old-local-map)
- (set-syntax-table hexl-mode-old-syntax-table)
- (setq font-lock-defaults hexl-mode-old-font-lock-keywords)
- (setq major-mode hexl-mode-old-major-mode)
- (setq revert-buffer-function hexl-mode-old-revert-buffer-function)
+ (let ((mms ()))
+ (dolist (varval hexl-mode--old-var-vals)
+ (let* ((bound (consp varval))
+ (var (if bound (car varval) varval))
+ (val (cdr-safe varval)))
+ (cond
+ ((consp var) (funcall (cdr var) val))
+ ((hexl-mode--minor-mode-p var) (push (cons var val) mms))
+ (bound (set (make-local-variable var) val))
+ (t (kill-local-variable var)))))
+ (kill-local-variable 'hexl-mode--old-var-vals)
+ ;; Enable/disable minor modes. Do it after having reset the other vars,
+ ;; since some of them may affect the minor modes.
+ (dolist (mm mms)
+ (funcall (car mm) (if (cdr mm) 1 -1))))
+
(force-mode-line-update))
(defun hexl-maybe-dehexlify-buffer ()
@@ -620,23 +592,21 @@ Signal error if HEX-ADDRESS is out of range."
(progn
(setq arg (- arg))
(while (> arg 0)
- (if (not (equal address (logior address 3)))
- (if (> address hexl-max-address)
- (progn
- (message "End of buffer.")
- (setq address hexl-max-address))
- (setq address (logior address 3)))
- (if (> address hexl-max-address)
- (progn
- (message "End of buffer.")
- (setq address hexl-max-address))
- (setq address (+ address 4))))
+ (setq address
+ (if (> address hexl-max-address)
+ (progn
+ (message "End of buffer.")
+ hexl-max-address)
+ (if (equal address (logior address 3))
+ (+ address 4)
+ (logior address 3))))
(setq arg (1- arg)))
- (if (> address hexl-max-address)
- (progn
- (message "End of buffer.")
- (setq address hexl-max-address))
- (setq address (logior address 3))))
+ (setq address
+ (if (> address hexl-max-address)
+ (progn
+ (message "End of buffer.")
+ hexl-max-address)
+ (logior address 3))))
(while (> arg 0)
(if (not (equal address (logand address -4)))
(setq address (logand address -4))
@@ -659,23 +629,21 @@ Signal error if HEX-ADDRESS is out of range."
(progn
(setq arg (- arg))
(while (> arg 0)
- (if (not (equal address (logior address 7)))
- (if (> address hexl-max-address)
- (progn
- (message "End of buffer.")
- (setq address hexl-max-address))
- (setq address (logior address 7)))
- (if (> address hexl-max-address)
- (progn
- (message "End of buffer.")
- (setq address hexl-max-address))
- (setq address (+ address 8))))
+ (setq address
+ (if (> address hexl-max-address)
+ (progn
+ (message "End of buffer.")
+ hexl-max-address)
+ (if (equal address (logior address 7))
+ (+ address 8)
+ (logior address 7))))
(setq arg (1- arg)))
- (if (> address hexl-max-address)
- (progn
- (message "End of buffer.")
- (setq address hexl-max-address))
- (setq address (logior address 7))))
+ (setq address
+ (if (> address hexl-max-address)
+ (progn
+ (message "End of buffer.")
+ hexl-max-address)
+ (logior address 7))))
(while (> arg 0)
(if (not (equal address (logand address -8)))
(setq address (logand address -8))
@@ -746,18 +714,18 @@ With prefix arg N, puts point N bytes of the way from the true beginning."
(defun hexl-scroll-down (arg)
"Scroll hexl buffer window upward ARG lines; or near full window if no ARG."
(interactive "P")
- (if (null arg)
- (setq arg (1- (window-height)))
- (setq arg (prefix-numeric-value arg)))
+ (setq arg (if (null arg)
+ (1- (window-height))
+ (prefix-numeric-value arg)))
(hexl-scroll-up (- arg)))
(defun hexl-scroll-up (arg)
"Scroll hexl buffer window upward ARG lines; or near full window if no ARG.
If there's no byte at the target address, move to the first or last line."
(interactive "P")
- (if (null arg)
- (setq arg (1- (window-height)))
- (setq arg (prefix-numeric-value arg)))
+ (setq arg (if (null arg)
+ (1- (window-height))
+ (prefix-numeric-value arg)))
(let* ((movement (* arg 16))
(address (hexl-current-address))
(dest (+ address movement)))
@@ -785,10 +753,8 @@ If there's no byte at the target address, move to the first or last line."
(defun hexl-end-of-1k-page ()
"Go to end of 1KB boundary."
(interactive)
- (hexl-goto-address (let ((address (logior (hexl-current-address) 1023)))
- (if (> address hexl-max-address)
- (setq address hexl-max-address))
- address)))
+ (hexl-goto-address
+ (max hexl-max-address (logior (hexl-current-address) 1023))))
(defun hexl-beginning-of-512b-page ()
"Go to beginning of 512 byte boundary."
@@ -798,10 +764,8 @@ If there's no byte at the target address, move to the first or last line."
(defun hexl-end-of-512b-page ()
"Go to end of 512 byte boundary."
(interactive)
- (hexl-goto-address (let ((address (logior (hexl-current-address) 511)))
- (if (> address hexl-max-address)
- (setq address hexl-max-address))
- address)))
+ (hexl-goto-address
+ (max hexl-max-address (logior (hexl-current-address) 511))))
(defun hexl-quoted-insert (arg)
"Read next input character and insert it.
@@ -1056,27 +1020,17 @@ Customize the variable `hexl-follow-ascii' to disable this feature."
(defun hexl-activate-ruler ()
"Activate `ruler-mode'."
(require 'ruler-mode)
- (unless (boundp 'hexl-mode-old-ruler-function)
- (set (make-local-variable 'hexl-mode-old-ruler-function)
- ruler-mode-ruler-function))
- (set (make-local-variable 'ruler-mode-ruler-function)
- 'hexl-mode-ruler)
- (ruler-mode 1))
+ (hexl-mode--setq-local 'ruler-mode-ruler-function
+ #'hexl-mode-ruler)
+ (hexl-mode--setq-local 'ruler-mode t))
(defun hexl-follow-line ()
"Activate `hl-line-mode'."
(require 'hl-line)
- (unless (boundp 'hexl-mode-old-hl-line-range-function)
- (set (make-local-variable 'hexl-mode-old-hl-line-range-function)
- hl-line-range-function))
- (unless (boundp 'hexl-mode-old-hl-line-face)
- (set (make-local-variable 'hexl-mode-old-hl-line-face)
- hl-line-face))
- (set (make-local-variable 'hl-line-range-function)
- 'hexl-highlight-line-range)
- (set (make-local-variable 'hl-line-face)
- 'highlight)
- (hl-line-mode 1))
+ (hexl-mode--setq-local 'hl-line-range-function
+ #'hexl-highlight-line-range)
+ (hexl-mode--setq-local 'hl-line-face 'highlight)
+ (hexl-mode--setq-local 'hl-line-mode t))
(defun hexl-highlight-line-range ()
"Return the range of address region for the point.
@@ -1158,5 +1112,4 @@ This function is assumed to be used as callback function for `hl-line-mode'."
(provide 'hexl)
-;; arch-tag: d5a7aa8a-9bce-480b-bcff-6c4c7ca5ea4a
;;; hexl.el ends here
diff --git a/lisp/hfy-cmap.el b/lisp/hfy-cmap.el
index 75ffe160bc..1add582a90 100644
--- a/lisp/hfy-cmap.el
+++ b/lisp/hfy-cmap.el
@@ -850,5 +850,4 @@ Loads the variable `hfy-rgb-txt-colour-map', which is used by
;; generated-autoload-file: "htmlfontify.el"
;; End:
-;; arch-tag: dff7feea-add4-48ba-937c-e79ac40cec9b
;;; hfy-cmap.el ends here
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index 31d6272328..5c14140cfb 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -665,5 +665,4 @@ A string is considered new if it had not previously been used in a call to
(provide 'hi-lock)
-;; arch-tag: d2e8fd07-4cc9-4c6f-a200-1e729bc54066
;;; hi-lock.el ends here
diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index ae823bba19..0f6900d800 100644
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -219,5 +219,4 @@ the line including the point by OVERLAY."
(provide 'hl-line)
-;; arch-tag: ac806940-0876-4959-8c89-947563ee2833
;;; hl-line.el ends here
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index b5c2aad23b..6603404d10 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -1,6 +1,7 @@
;;; htmlfontify.el --- htmlise a buffer/source tree with optional hyperlinks
-;; Copyright (C) 2002, 2003, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Emacs Lisp Archive Entry
;; Package: htmlfontify
@@ -2349,7 +2350,7 @@ You may also want to set `hfy-page-header' and `hfy-page-footer'."
;;;### (autoloads (hfy-fallback-colour-values htmlfontify-load-rgb-file)
-;;;;;; "hfy-cmap" "hfy-cmap.el" "5314c2706e20292f96206daa0eb96caa")
+;;;;;; "hfy-cmap" "hfy-cmap.el" "f7f81749b08e0aec14aac431f8b5ac8b")
;;; Generated autoloads from hfy-cmap.el
(autoload 'htmlfontify-load-rgb-file "hfy-cmap" "\
diff --git a/lisp/ibuf-macs.el b/lisp/ibuf-macs.el
index c7b9ace0a8..328a9068d9 100644
--- a/lisp/ibuf-macs.el
+++ b/lisp/ibuf-macs.el
@@ -301,5 +301,4 @@ bound to the current value of the filter.
(provide 'ibuf-macs)
-;; arch-tag: 2748edce-82c9-4cd9-9d9d-bd73e43c20c5
;;; ibuf-macs.el ends here
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 80927be7c5..3b13adc468 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -3015,5 +3015,4 @@ defaults to one.
;; coding: iso-8859-1
;; End:
-;; arch-tag: 72581688-0603-4954-b8cf-837c700f62e8
;;; ibuffer.el ends here
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index d3062f4754..dc0e51625e 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -376,5 +376,4 @@ are exhibited within the square braces.)"
;;allout-layout: (-2 :)
;;End:
-;; arch-tag: 339ec25a-0741-4eb6-be63-997532e89b0f
;;; icomplete.el ends here
diff --git a/lisp/ido.el b/lisp/ido.el
index 87f02d2287..7a472c35a4 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -4774,5 +4774,4 @@ DEF, if non-nil, is the default value."
(provide 'ido)
-;; arch-tag: b63a3500-1735-41bd-8a01-05373f0864da
;;; ido.el ends here
diff --git a/lisp/ielm.el b/lisp/ielm.el
index 5974a55566..65c28663ee 100644
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -560,5 +560,4 @@ Switches to the buffer `*ielm*', or creates it if it does not exist."
(provide 'ielm)
-;; arch-tag: ef60e4c0-9c4f-4bdb-8402-271313329790
;;; ielm.el ends here
diff --git a/lisp/iimage.el b/lisp/iimage.el
index e961f5554b..43621a197a 100644
--- a/lisp/iimage.el
+++ b/lisp/iimage.el
@@ -1,6 +1,7 @@
;;; iimage.el --- Inline image minor mode.
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: KOSEKI Yoshinori <kose@meadowy.org>
;; Maintainer: KOSEKI Yoshinori <kose@meadowy.org>
diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index ab49582d51..9461f56591 100644
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -2622,5 +2622,4 @@ tags to their respective image file. Internal function used by
(provide 'image-dired)
-;; arch-tag: 9d11411d-331f-4380-8b44-8adfe3a0343e
;;; image-dired.el ends here
diff --git a/lisp/image-file.el b/lisp/image-file.el
index b93cdef26e..eeccd5175b 100644
--- a/lisp/image-file.el
+++ b/lisp/image-file.el
@@ -202,5 +202,4 @@ Image files are those whose name has an extension in
(provide 'image-file)
-;; arch-tag: 04cafe36-f7ba-4c80-9f47-4cb656520ce1
;;; image-file.el ends here
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 396264b350..476db9a990 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -628,5 +628,4 @@ indicates a scaling factor. nil indicates scale to 100%. "
(provide 'image-mode)
-;; arch-tag: b5b2b7e6-26a7-4b79-96e3-1546b5c4c6cb
;;; image-mode.el ends here
diff --git a/lisp/image.el b/lisp/image.el
index 3fbb3e0be3..282b81d574 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -1,7 +1,7 @@
;;; image.el --- image API
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: multimedia
@@ -725,5 +725,4 @@ shall be displayed."
(provide 'image)
-;; arch-tag: 8e76a07b-eb48-4f3e-a7a0-1a7ba9f096b3
;;; image.el ends here
diff --git a/lisp/imenu.el b/lisp/imenu.el
index c44ba44a8f..c890a4cbfe 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -1066,5 +1066,4 @@ for more information."
(provide 'imenu)
-;; arch-tag: 98a2f5f5-4b91-4704-b18c-3aacf77d77a7
;;; imenu.el ends here
diff --git a/lisp/indent.el b/lisp/indent.el
index 6d0100489d..ea2b816b99 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -595,5 +595,4 @@ Use \\[edit-tab-stops] to edit them interactively."
(define-key ctl-x-map "\t" 'indent-rigidly)
(define-key esc-map "i" 'tab-to-tab-stop)
-;; arch-tag: f402b2a7-e44f-492f-b5b8-38996020b7c3
;;; indent.el ends here
diff --git a/lisp/info-look.el b/lisp/info-look.el
index 065e1beb5f..984d5383e4 100644
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -999,5 +999,4 @@ Return nil if there is nothing appropriate in the buffer near point."
(provide 'info-look)
-;; arch-tag: 0f1e3ea3-32a2-4461-bbab-3cff93539a74
;;; info-look.el ends here
diff --git a/lisp/info-xref.el b/lisp/info-xref.el
index 7ab4291058..e317b10bcd 100644
--- a/lisp/info-xref.el
+++ b/lisp/info-xref.el
@@ -5,6 +5,7 @@
;; Author: Kevin Ryde <user42@zip.com.au>
;; Keywords: docs
+;; Version: 3
;; This file is part of GNU Emacs.
@@ -23,56 +24,259 @@
;;; Commentary:
-;; This file implements some simple checking of external cross references in
-;; info files, by attempting to visit the nodes specified.
+;; This is some simple checking of external cross references in info files,
+;; docstrings and custom-links by attempting to visit the nodes specified.
;;
-;; "makeinfo" checks references internal to a document, but not external
-;; references, which makes it rather easy for mistakes to creep in or node
-;; name changes to go unnoticed. `Info-validate' doesn't check external
-;; references either.
+;; `M-x info-xref-check' checks a single info file. See the docstring for
+;; details.
;;
-;; `M-x info-xref-check' checks one file. When invoked from an Info-mode or
-;; texinfo-mode buffer, the current info file is the default at the prompt.
+;; `M-x info-xref-check-all' checks all info files in Info-directory-list.
+;; This is a good way to check the consistency of the whole system.
;;
-;; `M-x info-xref-check-all' looks at everything in the normal info path.
-;; This might be a lot of files but it's a good way to check the consistency
-;; of the whole system.
+;; `M-x info-xref-check-all-custom' loads up all defcustom variables and
+;; checks any info references in them.
;;
-;; Results are shown in a buffer. The format is a bit rough, but hopefully
-;; there won't be too many problems normally, and correcting them is a
-;; manual process anyway, a case of finding the right spot in the original
-;; .texi and finding what node it ought to point to.
-;;
-;; When a target info file doesn't exist there's clearly no way to validate
-;; node references within it. A message is given for missing target files
-;; (once per source document), it could be simply that the target hasn't
-;; been installed, or it could be a mistake in the reference.
-;;
-;; Indirect info files are understood, just pass the top-level foo.info to
-;; `info-xref-check' and it traverses all sub-files. Compressed info files
-;; are accepted too, as usual for `Info-mode'.
-;;
-;; `info-xref-check-all' is rather permissive in what it considers an info
-;; file. It has to be since info files don't necessarily have a ".info"
-;; suffix (eg. this is usual for the emacs manuals). One consequence of
-;; this is that if for instance there's a source code directory in
-;; `Info-directory-list' then a lot of extraneous files might be read, which
-;; will be time consuming but should be harmless.
-;;
-;; `M-x info-xref-check-all-custom' is a related command, it goes through
-;; all info document references in customizable variables, checking them
-;; like info file cross references.
+;; `M-x info-xref-docstrings' checks docstring "Info node ..." hyperlinks in
+;; source files (and other files).
+
+;;; History:
+
+;; Version 3 - new M-x info-xref-docstrings, use compilation-mode
;;; Code:
(require 'info)
+(eval-when-compile
+ (require 'cl)) ;; for `incf'
+
+;;-----------------------------------------------------------------------------
+;; vaguely generic
+
+(defun info-xref-lock-file-p (filename)
+ "Return non-nil if FILENAME is an Emacs lock file.
+A lock file is \".#foo.txt\" etc per `lock-buffer'."
+ (string-match "\\(\\`\\|\\/\\)\\.#" filename))
+
+(defun info-xref-subfile-p (filename)
+ "Return t if FILENAME is an info subfile.
+If removing the last \"-<NUM>\" from the filename gives a file
+which exists, then consider FILENAME a subfile. This is an
+imperfect test, probably ought to open up the purported top file
+and see what subfiles it says."
+ (and (string-match "\\`\\(\\([^-]*-\\)*[^-]*\\)-[0-9]+\\(.*\\)\\'" filename)
+ (file-exists-p (concat (match-string 1 filename)
+ (match-string 3 filename)))))
+
+(defmacro info-xref-with-file (filename &rest body)
+ ;; checkdoc-params: (filename body)
+ "Evaluate BODY in a buffer containing the contents of FILENAME.
+If FILENAME is already in a buffer then that's used, otherwise a
+temporary buffer.
+
+The current implementation uses `insert-file-contents' rather
+than `find-file-noselect' so as not to be held up by queries
+about local variables or possible weirdness in a major mode.
+`lm-with-file' does a similar thing, but it sets
+`emacs-lisp-mode' which is not wanted here."
+
+ (declare (debug t) (indent 1))
+ `(let* ((info-xref-with-file--filename ,filename)
+ (info-xref-with-file--body (lambda () ,@body))
+ (info-xref-with-file--existing
+ (find-buffer-visiting info-xref-with-file--filename)))
+ (if info-xref-with-file--existing
+ (with-current-buffer info-xref-with-file--existing
+ (save-excursion
+ (funcall info-xref-with-file--body)))
+ (with-temp-buffer
+ (insert-file-contents ,filename)
+ (funcall info-xref-with-file--body)))))
+
+
+;;-----------------------------------------------------------------------------
+;; output buffer
-(defconst info-xref-results-buffer "*info-xref results*"
+(defconst info-xref-output-buffer "*info-xref results*"
"Name of the buffer for info-xref results.")
+(defvar info-xref-good 0
+ "Count of good cross references, during info-xref processing.")
+(defvar info-xref-bad 0
+ "Count of bad cross references, during info-xref processing.")
+(defvar info-xref-unavail 0
+ "Count of unavailable cross references, during info-xref processing.")
+
+(defvar info-xref-output-heading ""
+ "A heading string, during info-xref processing.
+This is shown if there's an error, but not if successful.")
+
+(defvar info-xref-filename nil
+ "The current buffer's filename, during info-xref processing.
+When looking at file contents in a temp buffer there's no
+`buffer-file-name', hence this variable.")
+
+(defvar info-xref-xfile-alist nil
+ "Info files found or not found, during info-xref processing.
+Key is \"(foo)\" etc and value nil or t according to whether info
+manual \"(foo)\" exists or not. This is used to suppress
+duplicate messages about foo not being available. (Duplicates
+within one top-level file that is.)")
+
+(defvar info-xref-in-progress nil)
+(defmacro info-xref-with-output (&rest body)
+ "Run BODY with an info-xref output buffer.
+This is meant to nest, so you can wrap it around a set of
+different info-xref checks and have them write to the one output
+buffer created by the outermost `info-xref-with-output', with an
+overall good/bad count summary inserted at the very end."
+
+ (declare (debug t))
+ `(save-excursion
+ (unless info-xref-in-progress
+ (display-buffer (get-buffer-create info-xref-output-buffer))
+ (set-buffer info-xref-output-buffer)
+ (setq buffer-read-only nil)
+ (fundamental-mode)
+ (erase-buffer)
+ (insert ";; info-xref output -*- mode: compilation -*-\n\n")
+ (compilation-mode)
+ (setq info-xref-good 0
+ info-xref-bad 0
+ info-xref-unavail 0
+ info-xref-xfile-alist nil))
+
+ (let ((info-xref-in-progress t)
+ (info-xref-output-heading ""))
+ ,@body)
+
+ (unless info-xref-in-progress
+ (info-xref-output "done, %d good, %d bad, %d unavailable"
+ info-xref-good info-xref-bad info-xref-unavail))))
+
+(defun info-xref-output (fmt &rest args)
+ "Emit a `format'-ed message FMT+ARGS to the `info-xref-output-buffer'."
+ (with-current-buffer info-xref-output-buffer
+ (save-excursion
+ (goto-char (point-max))
+ (let ((inhibit-read-only t))
+ (insert info-xref-output-heading
+ (apply 'format fmt args)
+ "\n")))
+ (setq info-xref-output-heading "")
+ ;; all this info-xref can be pretty slow, display now so the user sees
+ ;; some progress
+ (sit-for 0)))
+(put 'info-xref-output 'byte-compile-format-like t)
+
+(defun info-xref-output-error (fmt &rest args)
+ "Emit a `format'-ed error FMT+ARGS to the `info-xref-output-buffer'.
+The error is attributed to `info-xref-filename' and the current
+buffer's line and column of point."
+ (apply 'info-xref-output
+ (concat "%s:%s:%s: " fmt)
+ info-xref-filename
+ (1+ (count-lines (point-min) (line-beginning-position)))
+ (1+ (current-column))
+ args))
+(put 'info-xref-output-error 'byte-compile-format-like t)
+
+
+;;-----------------------------------------------------------------------------
+;; node checking
+
+;; When asking Info-goto-node to fork, *info* needs to be the current
+;; buffer, otherwise it seems to clone the current buffer but then do the
+;; goto-node in plain *info*.
+;;
+;; We only fork if *info* already exists, if it doesn't then can create and
+;; destroy just that instead of a new name.
+;;
+;; If Info-goto-node can't find the file, then no new buffer is created. If
+;; it finds the file but not the node, then a buffer is created. Handle
+;; this difference by checking before killing.
+;;
+(defun info-xref-goto-node-p (node)
+ "Return t if it's possible to go to the given NODE."
+ (let ((oldbuf (current-buffer)))
+ (save-excursion
+ (save-window-excursion
+ (prog1
+ (condition-case err
+ (progn
+ (Info-goto-node node
+ (when (get-buffer "*info*")
+ (set-buffer "*info*")
+ "xref - temporary"))
+ t)
+ (error nil))
+ (unless (equal (current-buffer) oldbuf)
+ (kill-buffer)))))))
+
+(defun info-xref-check-node (node)
+
+ ;; Collapse spaces as per info.el and `help-make-xrefs'.
+ ;; Note defcustom :info-link nodes don't get this whitespace collapsing,
+ ;; they should be the exact node name ready to visit.
+ ;; `info-xref-check-all-custom' uses `info-xref-goto-node-p' and so
+ ;; doesn't come through here.
+ ;;
+ ;; Could use "[\t\n ]+" but try to avoid uselessly replacing " " with " ".
+ (setq node (replace-regexp-in-string "[\t\n][\t\n ]*\\| [\t\n ]+" " "
+ node t t))
+
+ (if (not (string-match "\\`([^)]*)" node))
+ (info-xref-output-error "no `(file)' part at start of node: %s\n" node)
+ (let ((file (match-string 0 node)))
+
+ (if (string-equal "()" file)
+ (info-xref-output-error "empty filename part: %s" node)
+
+ ;; see if the file exists, if haven't looked before
+ (unless (assoc file info-xref-xfile-alist)
+ (let ((found (info-xref-goto-node-p file)))
+ (push (cons file found) info-xref-xfile-alist)
+ (unless found
+ (info-xref-output-error "not available to check: %s\n (this reported once per file)" file))))
+
+ ;; if the file exists, try the node
+ (cond ((not (cdr (assoc file info-xref-xfile-alist)))
+ (incf info-xref-unavail))
+ ((info-xref-goto-node-p node)
+ (incf info-xref-good))
+ (t
+ (incf info-xref-bad)
+ (info-xref-output-error "no such node: %s" node)))))))
+
+
+;;-----------------------------------------------------------------------------
+
;;;###autoload
(defun info-xref-check (filename)
- "Check external references in FILENAME, an info document."
+ "Check external references in FILENAME, an info document.
+Interactively from an `Info-mode' or `texinfo-mode' buffer the
+current info file is the default.
+
+Results are shown in a `compilation-mode' buffer. The format is
+a bit rough, but there shouldn't be many problems normally. The
+file:line:column: is the info document, but of course normally
+any correction should be made in the original .texi file.
+Finding the right place in the .texi is a manual process.
+
+When a target info file doesn't exist there's obviously no way to
+validate node references within it. A message is given for
+missing target files once per source document. It could be
+simply that you don't have the target installed, or it could be a
+mistake in the reference.
+
+Indirect info files are understood, just pass the top-level
+foo.info to `info-xref-check' and it traverses all sub-files.
+Compressed info files are accepted too as usual for `Info-mode'.
+
+\"makeinfo\" checks references internal to an info document, but
+not external references, which makes it rather easy for mistakes
+to creep in or node name changes to go unnoticed.
+`Info-validate' doesn't check external references either."
+
(interactive
(list
(let* ((default-filename
@@ -90,98 +294,80 @@
(format "Info file (%s): " default-filename)
"Info file: ")))
(read-file-name prompt nil default-filename t))))
+
(info-xref-check-list (list filename)))
;;;###autoload
(defun info-xref-check-all ()
- "Check external references in all info documents in the usual path.
-The usual path is `Info-directory-list' and `Info-additional-directory-list'."
+ "Check external references in all info documents in the info path.
+`Info-directory-list' and `Info-additional-directory-list' are
+the info paths. See `info-xref-check' for how each file is
+checked.
+
+The search for \"all\" info files is rather permissive, since
+info files don't necessarily have a \".info\" extension and in
+particular the Emacs manuals normally don't. If you have a
+source code directory in `Info-directory-list' then a lot of
+extraneous files might be read. This will be time consuming but
+should be harmless."
+
(interactive)
(info-xref-check-list (info-xref-all-info-files)))
-;; An alternative to trying to get only top-level files here would be to
-;; simply return all files, and have info-xref-check-list not follow
-;; Indirect:. The current way seems a bit nicer though, because it gets the
-;; proper top-level filename into the error messages, and suppresses
-;; duplicate "not available" messages for all subfiles of a single document.
+;; An alternative for geting only top-level files here would be to simply
+;; return all files and have info-xref-check-list not follow "Indirect:".
+;; The current way seems better because it (potentially) gets the proper
+;; top-level filename into the error messages, and suppresses duplicate "not
+;; available" messages for all subfiles of a single document.
(defun info-xref-all-info-files ()
"Return a list of all available info files.
-Only top-level files are returned, subfiles are excluded.
+Only top level files are returned, subfiles are excluded.
-Since info files don't have to have a .info suffix, all files in the
-relevant directories are considered, which might mean a lot of extraneous
-things are returned if for instance a source code directory is in the path."
+Since info files don't have to have a .info suffix, all files in
+the relevant directories are considered, which might mean a lot
+of extraneous things if for instance a source code directory is
+in the path."
(info-initialize) ;; establish Info-directory-list
(apply 'nconc
(mapcar
(lambda (dir)
(let ((result nil))
- (dolist (name (directory-files dir t))
- (unless (or (file-directory-p name) (info-xref-subfile-p name))
+ (dolist (name (directory-files
+ dir
+ t ;; absolute filenames
+ "\\`[^.]")) ;; not dotfiles, nor .# lockfiles
+ (when (and (file-exists-p name) ;; ignore broken symlinks
+ (not (string-match "\\.te?xi\\'" name)) ;; not .texi
+ (not (backup-file-name-p name))
+ (not (file-directory-p name))
+ (not (info-xref-subfile-p name)))
(push name result)))
(nreverse result)))
(append Info-directory-list Info-additional-directory-list))))
-(defun info-xref-subfile-p (filename)
- "Return t if FILENAME is an info subfile.
-If removing the last \"-<NUM>\" from the filename gives a file that exists,
-then consider FILENAME a subfile. This is an imperfect test, we probably
-should open up the purported top file and see what subfiles it says."
- (and (string-match "\\`\\(\\([^-]*-\\)*[^-]*\\)-[0-9]+\\(.*\\)\\'" filename)
- (file-exists-p (concat (match-string 1 filename)
- (match-string 3 filename)))))
-
-
-;; Some dynamic variables are used to share information with sub-functions
-;; below.
-;;
-;; info-xref-filename-header - a heading message for the current top-level
-;; filename, or "" when it's been printed.
-;;
-(defvar info-xref-xfile-alist)
-;;
-;; info-xref-good - count of good cross references.
-;;
-(defvar info-xref-good)
-;;
-;; info-xref-bad - count of bad cross references.
-;;
-(defvar info-xref-bad)
-;;
-;; info-xref-xfile-alist - indexed by "(foo)" with value nil or t according
-;; to whether "(foo)" exists or not. This is used to suppress duplicate
-;; messages about foo not being available. (Duplicates within one
-;; top-level file that is.)
-;;
-(defvar info-xref-filename-heading)
-
(defun info-xref-check-list (filename-list)
"Check external references in info documents in FILENAME-LIST."
- (pop-to-buffer info-xref-results-buffer t)
- (erase-buffer)
- (let ((info-xref-good 0)
- (info-xref-bad 0))
+ (info-xref-with-output
(dolist (info-xref-filename filename-list)
- (let ((info-xref-filename-heading
- (format "In file %s:\n" info-xref-filename))
- (info-xref-xfile-alist nil))
+ (setq info-xref-xfile-alist nil)
+ (let ((info-xref-output-heading
+ (format "Info file %s\n" info-xref-filename)))
(with-temp-message (format "Looking at %s" info-xref-filename)
(with-temp-buffer
(info-insert-file-contents info-xref-filename)
(goto-char (point-min))
- (if (re-search-forward "\^_\nIndirect:\n" nil t)
+ (if (search-forward "\^_\nIndirect:\n" nil t)
(let ((dir (file-name-directory info-xref-filename)))
(while (looking-at "\\(.*\\): [0-9]+\n")
- (let ((subfile (match-string 1)))
+ (let ((info-xref-filename
+ (expand-file-name (match-string 1) dir)))
(with-temp-buffer
- (info-insert-file-contents
- (expand-file-name subfile dir))
+ (info-insert-file-contents info-xref-filename)
(info-xref-check-buffer)))
(forward-line)))
- (info-xref-check-buffer))))))
- (insert (format "done, %d good, %d bad\n" info-xref-good info-xref-bad))))
+ (info-xref-check-buffer))))))))
(defun info-xref-check-buffer ()
"Check external references in the info file in the current buffer.
@@ -190,129 +376,155 @@ This should be the raw file contents, not `Info-mode'."
(while (re-search-forward
"\\*[Nn]ote[ \n\t]+[^:]*:[ \n\t]+\\(\\(([^)]*)\\)[^.,]+\\)[.,]"
nil t)
- (let* ((file (match-string 2))
- (node ;; Canonicalize spaces: we could use "[\t\n ]+" but
- ;; we try to avoid uselessly replacing " " with " ".
- (replace-regexp-in-string "[\t\n][\t\n ]*\\| [\t\n ]+" " "
- (match-string 1) t t)))
- (if (string-equal "()" file)
- (info-xref-output "Empty filename part: %s\n" node)
- ;; see if the file exists, if we haven't tried it before
- (unless (assoc file info-xref-xfile-alist)
- (let ((found (info-xref-goto-node-p file)))
- (push (cons file found) info-xref-xfile-alist)
- (unless found
- (info-xref-output "Not available to check: %s\n" file))))
- ;; if the file exists, try the node
- (when (cdr (assoc file info-xref-xfile-alist))
- (if (info-xref-goto-node-p node)
- (setq info-xref-good (1+ info-xref-good))
- (setq info-xref-bad (1+ info-xref-bad))
- (info-xref-output "No such node: %s\n" node)))))))
-
-(defun info-xref-output (str &rest args)
- "Emit a `format'-ed message STR+ARGS to the info-xref output buffer."
- (with-current-buffer info-xref-results-buffer
- (insert info-xref-filename-heading
- (apply 'format str args))
- (setq info-xref-filename-heading "")
- ;; all this info-xref can be pretty slow, display now so the user can
- ;; see some progress
- (sit-for 0)))
-
-;; When asking Info-goto-node to fork, *info* needs to be the current
-;; buffer, otherwise it seems to clone the current buffer but then do the
-;; goto-node in plain *info*.
-;;
-;; We only fork if *info* already exists, if it doesn't then we can create
-;; and destroy just that instead of a new name.
-;;
-;; If Info-goto-node can't find the file, then no new buffer is created. If
-;; it finds the file but not the node, then a buffer is created. Handle
-;; this difference by checking before killing.
-;;
-(defun info-xref-goto-node-p (node)
- "Return t if it's possible to go to the given NODE."
- (let ((oldbuf (current-buffer)))
(save-excursion
- (save-window-excursion
- (prog1
- (condition-case err
- (progn
- (Info-goto-node node
- (when (get-buffer "*info*")
- (set-buffer "*info*")
- "xref - temporary"))
- t)
- (error nil))
- (unless (equal (current-buffer) oldbuf)
- (kill-buffer (current-buffer))))))))
+ (goto-char (match-beginning 1)) ;; start of nodename as error position
+ (info-xref-check-node (match-string 1)))))
+
+(defvar viper-mode) ;; quieten the byte compiler
+(defvar gnus-registry-install)
;;;###autoload
(defun info-xref-check-all-custom ()
"Check info references in all customize groups and variables.
-`custom-manual' and `info-link' entries in the `custom-links' list are checked.
+Info references can be in `custom-manual' or `info-link' entries
+of the `custom-links' for a variable.
-`custom-load' autoloads for all symbols are loaded in order to get all the
-link information. This will be a lot of lisp packages loaded, and can take
-quite a while."
+Any `custom-load' autoloads in variables are loaded in order to
+get full link information. This will be a lot of Lisp packages
+and can take a long time."
(interactive)
- (pop-to-buffer info-xref-results-buffer t)
- (erase-buffer)
- (let ((info-xref-filename-heading ""))
-
- ;; `custom-load-symbol' is not used, since it quietly ignores errors,
- ;; but we want to show them (since they may mean incomplete checking).
- ;;
- ;; Just one pass through mapatoms is made. There shouldn't be any new
- ;; custom-loads setup by packages loaded.
- ;;
- (info-xref-output "Loading custom-load autoloads ...\n")
- (require 'cus-start)
- (require 'cus-load)
- (let ((viper-mode nil)) ;; tell viper.el not to ask about viperizing
- (mapatoms
- (lambda (symbol)
- (dolist (load (get symbol 'custom-loads))
- (cond ((symbolp load)
- (condition-case cause (require load)
- (error
- (info-xref-output "Symbol `%s': cannot require '%s: %s\n"
- symbol load cause))))
- ;; skip if previously loaded
- ((assoc load load-history))
- ((assoc (locate-library load) load-history))
- (t
- (condition-case cause (load load)
- (error
- (info-xref-output "Symbol `%s': cannot load \"%s\": %s\n"
- symbol load cause)))))))))
-
- ;; Don't bother to check whether the info file exists as opposed to just
- ;; a missing node. If you have the lisp then you should have the
- ;; documentation, so missing node name will be the usual fault.
- ;;
- (info-xref-output "\nChecking custom-links references ...\n")
- (let ((good 0)
- (bad 0))
- (mapatoms
- (lambda (symbol)
- (dolist (link (get symbol 'custom-links))
- (when (memq (car link) '(custom-manual info-link))
- ;; skip :tag part of (custom-manual :tag "Foo" "(foo)Node")
- (if (eq :tag (cadr link))
- (setq link (cddr link)))
- (if (info-xref-goto-node-p (cadr link))
- (setq good (1+ good))
- (setq bad (1+ bad))
- ;; symbol-file gives nil for preloaded variables, would need
- ;; to copy what describe-variable does to show the right place
- (info-xref-output "Symbol `%s' (in %s): cannot goto node: %s\n"
- symbol (symbol-file symbol) (cadr link)))))))
- (info-xref-output "%d good, %d bad\n" good bad))))
+ (info-xref-with-output
+
+ ;; `custom-load-symbol' is not used, since it quietly ignores errors, but
+ ;; we want to show them since they mean incomplete checking.
+ ;;
+ ;; Just one pass through mapatoms is made. There shouldn't be any new
+ ;; custom-loads setup by packages loaded.
+ ;;
+ (info-xref-output "Loading custom-load autoloads ...")
+ (require 'cus-start)
+ (require 'cus-load)
+
+ ;; These are `setq' rather than `let' since a let would unbind the
+ ;; variables after viper.el/gnus-registry.el have loaded, defeating the
+ ;; defvars in those files. Of course it'd be better if those files
+ ;; didn't make interactive queries on loading at all, to allow for
+ ;; programmatic loading like here.
+ (unless (boundp 'viper-mode)
+ (setq viper-mode nil)) ;; avoid viper.el ask about viperizing
+ (unless (boundp 'gnus-registry-install)
+ (setq gnus-registry-install nil)) ;; avoid gnus-registery.el querying
+
+ (mapatoms
+ (lambda (symbol)
+ (dolist (load (get symbol 'custom-loads))
+ (cond ((symbolp load)
+ (condition-case cause (require load)
+ (error
+ (info-xref-output "Symbol `%s': cannot require '%s: %s"
+ symbol load cause))))
+ ;; skip if previously loaded
+ ((assoc load load-history))
+ ((assoc (locate-library load) load-history))
+ (t
+ (condition-case err
+ (load load)
+ (error
+ (info-xref-output "Symbol `%s': cannot load \"%s\": %s"
+ symbol load
+ (error-message-string err)))))))))
+
+ ;; Don't bother to check whether the info file exists as opposed to just
+ ;; a missing node. If you have the code then you should have the
+ ;; documentation, so a wrong node name will be the usual fault.
+ ;;
+ (info-xref-output "\nChecking custom-links references ...")
+ (mapatoms
+ (lambda (symbol)
+ (dolist (link (get symbol 'custom-links))
+ (when (memq (car link) '(custom-manual info-link))
+ ;; skip :tag part of (custom-manual :tag "Foo" "(foo)Node")
+ (if (eq :tag (cadr link))
+ (setq link (cddr link)))
+ (if (info-xref-goto-node-p (cadr link))
+ (incf info-xref-good)
+ (incf info-xref-bad)
+ ;; symbol-file gives nil for preloaded variables, would need
+ ;; to copy what describe-variable does to show the right place
+ (info-xref-output "Symbol `%s' (file %s): cannot goto node: %s"
+ symbol
+ (symbol-file symbol 'defvar)
+ (cadr link)))))))))
+
+;;;###autoload
+(defun info-xref-docstrings (filename-list)
+ ;; checkdoc-params: (filename-list)
+ "Check docstring info node references in source files.
+The given files are searched for docstring hyperlinks like
+
+ Info node `(elisp)Documentation Tips'
+
+and those links checked by attempting to visit the target nodes
+as per `info-xref-check' does.
+
+Interactively filenames are read as a wildcard pattern like
+\"foo*.el\", with the current file as a default. Usually this
+will be lisp sources, but anything with such hyperlinks can be
+checked, including the Emacs .c sources (or the etc/DOC file of
+all builtins).
+
+Because info node hyperlinks are found by a simple regexp search
+in the files, the Lisp code checked doesn't have to be loaded,
+and links can be in the file commentary or elsewhere too. Even
+.elc files can usually be checked successfully if you don't have
+the sources handy."
+ (interactive
+ (let* ((default (and buffer-file-name
+ (file-relative-name buffer-file-name)))
+ (prompt (if default
+ (format "Filename with wildcards (%s): "
+ default)
+ "Filename with wildcards: "))
+ (pattern (read-file-name prompt nil default))
+ ;; absolute filenames
+ (filename-list (file-expand-wildcards pattern t))
+ newlist)
+ (setq filename-list
+ (dolist (file filename-list (nreverse newlist))
+ (or (info-xref-lock-file-p file)
+ (file-directory-p file)
+ (push file newlist))))
+ (unless filename-list
+ (error "No files: %S" pattern))
+ (list filename-list)))
+
+ (eval-and-compile
+ (require 'help-mode)) ;; for `help-xref-info-regexp'
+
+ (info-xref-with-output
+ (dolist (info-xref-filename filename-list)
+ (setq info-xref-xfile-alist nil) ;; "not found"s once per file
+
+ (info-xref-with-file info-xref-filename
+ (goto-char (point-min))
+ (while (re-search-forward help-xref-info-regexp nil t)
+ (let ((node (match-string 2)))
+ (save-excursion
+ (goto-char (match-beginning 2)) ;; start of node as error position
+
+ ;; skip nodes with "%" as probably `format' strings such as in
+ ;; info-look.el
+ (unless (string-match "%" node)
+
+ ;; "(emacs)" is the default manual for docstring hyperlinks,
+ ;; per `help-make-xrefs'
+ (unless (string-match "\\`(" node)
+ (setq node (concat "(emacs)" node)))
+
+ (info-xref-check-node node)))))))))
+
(provide 'info-xref)
-;; arch-tag: 69d4d528-69ed-4cc2-8eb4-c666a0c1d5ac
;;; info-xref.el ends here
diff --git a/lisp/info.el b/lisp/info.el
index d05905aa8d..185d5044d5 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1,8 +1,8 @@
;; info.el --- info package for Emacs
-;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+;; 2010, 2011 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: help
diff --git a/lisp/informat.el b/lisp/informat.el
index 1eb2e94b01..a1028087c3 100644
--- a/lisp/informat.el
+++ b/lisp/informat.el
@@ -511,5 +511,4 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\""
(provide 'informat)
-;; arch-tag: 581c440e-5be1-4f31-b005-2d5824bbf569
;;; informat.el ends here
diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el
index c13ddfd621..3346ebd422 100644
--- a/lisp/international/ccl.el
+++ b/lisp/international/ccl.el
@@ -1559,5 +1559,4 @@ See the documentation of `define-ccl-program' for the detail of CCL program."
(provide 'ccl)
-;; arch-tag: 836bcd27-63a1-4a56-b232-1145ecf823fb
;;; ccl.el ends here
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index cc53c18773..5ebe14fd01 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -1414,5 +1414,4 @@ METHOD must be one of these symbols:
;; coding: utf-8
;; End:
-;; arch-tag: 85889c35-9f4d-4912-9bf5-82de31b0d42d
;;; characters.el ends here
diff --git a/lisp/international/cp51932.el b/lisp/international/cp51932.el
index a648bfcefc..d4a347d43a 100644
--- a/lisp/international/cp51932.el
+++ b/lisp/international/cp51932.el
@@ -469,4 +469,3 @@
map)
(define-translation-table 'cp51932-encode map))
-;; arch-tag: d21c06e5-a548-4dda-8802-c2922ff19da3
diff --git a/lisp/international/eucjp-ms.el b/lisp/international/eucjp-ms.el
index 060692f31a..a16848a0c7 100644
--- a/lisp/international/eucjp-ms.el
+++ b/lisp/international/eucjp-ms.el
@@ -2086,4 +2086,3 @@
map)
(define-translation-table 'eucjp-ms-encode map))
-;; arch-tag: c4191096-288a-4f13-9b2a-ee7a1f11eb4a
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 11975ea060..7796fa5eb3 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -1152,5 +1152,4 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
;;
(provide 'fontset)
-;; arch-tag: bb53e629-0234-403c-950e-551e61554849
;;; fontset.el ends here
diff --git a/lisp/international/isearch-x.el b/lisp/international/isearch-x.el
index ab61f26a63..a6a92d3d8e 100644
--- a/lisp/international/isearch-x.el
+++ b/lisp/international/isearch-x.el
@@ -141,5 +141,4 @@
(isearch-update)))
(isearch-process-search-char last-char)))
-;; arch-tag: 1a90a6cf-2cb2-477a-814a-9ff895852822
;;; isearch-x.el ends here
diff --git a/lisp/international/iso-ascii.el b/lisp/international/iso-ascii.el
index d2bacf6e90..07c72e8ffd 100644
--- a/lisp/international/iso-ascii.el
+++ b/lisp/international/iso-ascii.el
@@ -1,7 +1,7 @@
;;; iso-ascii.el --- set up char tables for ISO 8859/1 on ASCII terminals
-;; Copyright (C) 1987, 1995, 1998, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 1995, 1998, 2001, 2002, 2003, 2004, 2005, 2006,
+;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Howard Gayle
;; Maintainer: FSF
@@ -171,5 +171,4 @@
(provide 'iso-ascii)
-;; arch-tag: 687edf0d-f792-471e-b50e-be805938359a
;;; iso-ascii.el ends here
diff --git a/lisp/international/iso-cvt.el b/lisp/international/iso-cvt.el
index f9b312dcd6..f829101770 100644
--- a/lisp/international/iso-cvt.el
+++ b/lisp/international/iso-cvt.el
@@ -904,5 +904,4 @@ Optional arg BUFFER is ignored (for use in `format-alist')."
(provide 'iso-cvt)
-;; arch-tag: 64ae843f-ed0e-43e1-ba50-ffd581b90840
;;; iso-cvt.el ends here
diff --git a/lisp/international/iso-transl.el b/lisp/international/iso-transl.el
index c73dd0fb07..79d0373dac 100644
--- a/lisp/international/iso-transl.el
+++ b/lisp/international/iso-transl.el
@@ -291,5 +291,4 @@ sequence VECTOR. (VECTOR is normally one character long.)")
(provide 'iso-transl)
-;; arch-tag: 034cfedf-7ebd-461d-bcd0-5c79e6dc0b61
;;; iso-transl.el ends here
diff --git a/lisp/international/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el
index 9e0bffef36..7e317ea09c 100644
--- a/lisp/international/ja-dic-cnv.el
+++ b/lisp/international/ja-dic-cnv.el
@@ -545,5 +545,4 @@ To get complete usage, invoke:
;; coding: iso-2022-7bit
;; End:
-;; arch-tag: dec06fb0-8118-45b1-80d7-dc360b6fd3b2
;;; ja-dic-cnv.el ends here
diff --git a/lisp/international/ja-dic-utl.el b/lisp/international/ja-dic-utl.el
index 8e276a240f..8400c473af 100644
--- a/lisp/international/ja-dic-utl.el
+++ b/lisp/international/ja-dic-utl.el
@@ -222,5 +222,4 @@ LEIM is available from the same ftp directory as Emacs."))
;; coding: iso-2022-7bit
;; End:
-;; arch-tag: df2218fa-469c-40f6-bace-7f89a053f9c0
;;; ja-dic-utl.el ends here
diff --git a/lisp/international/kinsoku.el b/lisp/international/kinsoku.el
index 835f991957..b3ba9edc44 100644
--- a/lisp/international/kinsoku.el
+++ b/lisp/international/kinsoku.el
@@ -183,5 +183,4 @@ the context of text formatting."
(aref (char-category-set (preceding-char)) ?<))
(kinsoku-shorter linebeg))))
-;; arch-tag: e6b036bc-9e5b-4e9f-a22c-4ed04e37777e
;;; kinsoku.el ends here
diff --git a/lisp/international/kkc.el b/lisp/international/kkc.el
index 767c231546..7babb81cf1 100644
--- a/lisp/international/kkc.el
+++ b/lisp/international/kkc.el
@@ -1,7 +1,7 @@
;;; kkc.el --- Kana Kanji converter -*- coding: iso-2022-7bit; -*-
-;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005,
-;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006, 2007, 2008, 2009, 2010, 2011
;; National Institute of Advanced Industrial Science and Technology (AIST)
@@ -658,5 +658,4 @@ and change the current conversion to the last one in the group."
;;
(provide 'kkc)
-;; arch-tag: 3cbfd56e-74e6-4f60-bb46-ba7c2d366fbf
;;; kkc.el ends here
diff --git a/lisp/international/latexenc.el b/lisp/international/latexenc.el
index e32624df9f..7f1ce6a737 100644
--- a/lisp/international/latexenc.el
+++ b/lisp/international/latexenc.el
@@ -186,5 +186,4 @@ coding system names is determined from `latex-inputenc-coding-alist'."
(provide 'latexenc)
-;; arch-tag: f971bc3e-1fec-4609-8f2f-73dd41ab22e1
;;; latexenc.el ends here
diff --git a/lisp/international/latin1-disp.el b/lisp/international/latin1-disp.el
index 243bff78e4..67b1b73d52 100644
--- a/lisp/international/latin1-disp.el
+++ b/lisp/international/latin1-disp.el
@@ -3196,5 +3196,4 @@ isn't changed if the display can render Unicode characters."
(provide 'latin1-disp)
-;; arch-tag: 68b2872e-d667-4f48-8e2f-ec2ba2d29406
;;; latin1-disp.el ends here
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 0bfbfd9524..73542feeaa 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2979,5 +2979,4 @@ properties are sticky."
(define-key ctl-x-map "8\r" 'ucs-insert)
-;; arch-tag: b382c432-4b36-460e-bf4c-05efd0bb18dc
;;; mule-cmds.el ends here
diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index c0a39321ad..fd444a098e 100644
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -1555,5 +1555,4 @@ for decoding and encoding files, process I/O, etc."
;; code.
(provide 'code-pages)
-;; arch-tag: 7d5fed55-b6df-42f6-8d3d-0011190551f5
;;; mule-conf.el ends here
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index 966eb89eb4..b9006b7588 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -1169,5 +1169,4 @@ The default is 20. If LIMIT is negative, do not limit the listing."
(provide 'mule-diag)
-;; arch-tag: cd3b607c-2893-45a0-a4fa-a6535754dbee
;;; mule-diag.el ends here
diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el
index 3992b0f3d3..3762dd5d9a 100644
--- a/lisp/international/mule-util.el
+++ b/lisp/international/mule-util.el
@@ -405,5 +405,4 @@ per-character basis, this may not be accurate."
;; coding: iso-2022-7bit
;; End:
-;; arch-tag: 5bdb52b6-a3a5-4529-b7a0-37d01b0e570b
;;; mule-util.el ends here
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 54f5de54fe..2f0063540d 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -2444,5 +2444,4 @@ added by processing software."
;;;
(provide 'mule)
-;; arch-tag: 9aebaa6e-0e8a-40a9-b857-cb5d04a39e7c
;;; mule.el ends here
diff --git a/lisp/international/ogonek.el b/lisp/international/ogonek.el
index fa8b7c69a0..6fd22ee0e8 100644
--- a/lisp/international/ogonek.el
+++ b/lisp/international/ogonek.el
@@ -500,5 +500,4 @@ followed by a non-Polish character, that is one not listed in the
(provide 'ogonek)
-;; arch-tag: 672d7744-28ac-412b-965e-06a27e50d1d7
;;; ogonek.el ends here
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 094e86dbad..47f4cadc1b 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -3077,5 +3077,4 @@ call it with one argument STRING."
;;
(provide 'quail)
-;; arch-tag: 46d7db54-5467-42c4-a2a9-53ca90a1e886
;;; quail.el ends here
diff --git a/lisp/international/robin.el b/lisp/international/robin.el
index d9478611b5..7e98a507f9 100644
--- a/lisp/international/robin.el
+++ b/lisp/international/robin.el
@@ -571,5 +571,4 @@ used."
;; coding: utf-8-emacs
;; End:
-;; arch-tag: ba995140-7436-4a57-b875-747fc340f605
;;; robin.el ends here
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index 6e6f8ce738..ccaced294b 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -1210,5 +1210,4 @@ to store generated Quail packages."
;; coding: iso-2022-7bit
;; End:
-;; arch-tag: 8ad478b2-a985-4da2-b47f-d8ee5d7c24a3
;;; titdic-cnv.el ends here
diff --git a/lisp/international/ucs-normalize.el b/lisp/international/ucs-normalize.el
index afd6769e65..d6fdcd5798 100644
--- a/lisp/international/ucs-normalize.el
+++ b/lisp/international/ucs-normalize.el
@@ -628,5 +628,4 @@ be decomposed."
;; coding: utf-8
;; End:
-;; arch-tag: cef65ae7-71ad-4e19-8da8-56ab4d42aaa4
;;; ucs-normalize.el ends here
diff --git a/lisp/international/utf-7.el b/lisp/international/utf-7.el
index 91a95d8e33..709414d5f1 100644
--- a/lisp/international/utf-7.el
+++ b/lisp/international/utf-7.el
@@ -127,5 +127,4 @@ ESC and SKIP-CHARS are adjusted for the normal and IMAP versions."
(provide 'utf-7)
-;; arch-tag: 975ee403-90a4-4286-97d2-4ed1323f4ef9
;;; utf-7.el ends here
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 717f6d46f7..7fd96df1b0 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1244,9 +1244,9 @@ Use `isearch-exit' to quit without signaling."
(interactive)
;; (ding) signal instead below, if quitting
(discard-input)
- (if isearch-success
- ;; If search is successful, move back to starting point
- ;; and really do quit.
+ (if (and isearch-success (not isearch-error))
+ ;; If search is successful and has no incomplete regexp,
+ ;; move back to starting point and really do quit.
(progn
(setq isearch-success nil)
(isearch-cancel))
@@ -2767,5 +2767,4 @@ CASE-FOLD non-nil means the search was case-insensitive."
(isearch-search)
(isearch-update))
-;; arch-tag: 74850515-f7d8-43a6-8a2c-ca90a4c1e675
;;; isearch.el ends here
diff --git a/lisp/isearchb.el b/lisp/isearchb.el
index e79d6b26c6..194e49094b 100644
--- a/lisp/isearchb.el
+++ b/lisp/isearchb.el
@@ -223,5 +223,4 @@ accessed via isearchb."
(provide 'isearchb)
-;; arch-tag: 9277523f-a624-4aa0-ba10-b89eeb7b6e99
;;; isearchb.el ends here
diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el
index a6b2521dac..d773a3c76d 100644
--- a/lisp/iswitchb.el
+++ b/lisp/iswitchb.el
@@ -1,7 +1,7 @@
;;; iswitchb.el --- switch between buffers using substrings
-;; Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Stephen Eglen <stephen@gnu.org>
;; Maintainer: Stephen Eglen <stephen@gnu.org>
@@ -1437,5 +1437,4 @@ This mode enables switching between buffers using substrings. See
(provide 'iswitchb)
-;; arch-tag: d74198ae-753f-44f2-b34f-0c515398d90a
;;; iswitchb.el ends here
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index f8e99cca68..eab8754bb9 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -591,5 +591,4 @@ will take place when text is fontified stealthily."
(provide 'jit-lock)
-;; arch-tag: 56b5de6e-f581-453b-bb97-49c39372ff9e
;;; jit-lock.el ends here
diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el
index f5fca85221..43cbba8182 100644
--- a/lisp/jka-cmpr-hook.el
+++ b/lisp/jka-cmpr-hook.el
@@ -365,5 +365,4 @@ Return the new status of auto compression (non-nil means on)."
(provide 'jka-cmpr-hook)
-;; arch-tag: 4bd73429-f400-45fe-a065-270a113e31a8
;;; jka-cmpr-hook.el ends here
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index 8c9866380b..f1ad77ae8d 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -166,8 +166,11 @@ to keep: LEN chars starting BEG chars from the beginning."
(unwind-protect
(or (memq (call-process
jka-compr-shell infile t nil "-c"
+ ;; Windows shells need the program file name
+ ;; after the pipe symbol be quoted if they use
+ ;; forward slashes as directory separators.
(format
- "%s %s 2> %s | %s bs=%d skip=%d %s 2> %s"
+ "%s %s 2> %s | \"%s\" bs=%d skip=%d %s 2> %s"
prog
(mapconcat 'identity args " ")
err-file
@@ -701,5 +704,4 @@ by `jka-compr-installed'."
(provide 'jka-compr)
-;; arch-tag: 3f15b630-e9a7-46c4-a22a-94afdde86ebc
;;; jka-compr.el ends here
diff --git a/lisp/json.el b/lisp/json.el
index e389907414..a82a1d8811 100644
--- a/lisp/json.el
+++ b/lisp/json.el
@@ -526,5 +526,4 @@ Advances point just past JSON object."
(provide 'json)
-;; arch-tag: 15f6e4c8-b831-4172-8749-bbc680c50ea1
;;; json.el ends here
diff --git a/lisp/kermit.el b/lisp/kermit.el
index c21e9bfa1d..d2a4206163 100644
--- a/lisp/kermit.el
+++ b/lisp/kermit.el
@@ -148,5 +148,4 @@ command `kermit | tr -d '\\015''."
(provide 'kermit)
-;; arch-tag: 6633215d-6c47-4e66-9f27-16fba02a8dce
;;; kermit.el ends here
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index e191228ff9..bcb4f1b270 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -1270,5 +1270,4 @@ To customize possible responses, change the \"bindings\" in `kmacro-step-edit-ma
(provide 'kmacro)
-;; arch-tag: d3fe0b24-ae41-47de-a4d6-41a77d5559f0
;;; kmacro.el ends here
diff --git a/lisp/language/burmese.el b/lisp/language/burmese.el
index 2742fd315b..9fce058316 100644
--- a/lisp/language/burmese.el
+++ b/lisp/language/burmese.el
@@ -57,4 +57,3 @@
(set-char-table-range composition-function-table '(#x1000 . #x107F) elt)
(set-char-table-range composition-function-table '(#xAA60 . #xAA7B) elt))
-;; arch-tag: 8ba5f4cd-ef89-4008-b784-397edd0cb32e
diff --git a/lisp/language/cham.el b/lisp/language/cham.el
index 9ea6b0e28c..d1ddfb512a 100644
--- a/lisp/language/cham.el
+++ b/lisp/language/cham.el
@@ -42,4 +42,3 @@
;; coding: utf-8
;; End:
-;; arch-tag: a393ea52-445b-4e22-a967-c244afc88cf6
diff --git a/lisp/language/china-util.el b/lisp/language/china-util.el
index edbed8a776..1f09d1f349 100644
--- a/lisp/language/china-util.el
+++ b/lisp/language/china-util.el
@@ -191,5 +191,4 @@ Return the length of resulting text."
;;
(provide 'china-util)
-;; arch-tag: 5a47b084-b9ac-420e-8191-70c5b3a14836
;;; china-util.el ends here
diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el
index c03849e23e..7baa8f4d26 100644
--- a/lisp/language/chinese.el
+++ b/lisp/language/chinese.el
@@ -287,5 +287,4 @@ converted to CNS)."))
(provide 'chinese)
-;; arch-tag: b82fcf7a-84f6-4e0b-b38c-1742dac0e09f
;;; chinese.el ends here
diff --git a/lisp/language/cyril-util.el b/lisp/language/cyril-util.el
index d57edf0ed6..65c25fcd20 100644
--- a/lisp/language/cyril-util.el
+++ b/lisp/language/cyril-util.el
@@ -192,5 +192,4 @@ If the argument is nil, we return the display table to its standard state."
;; coding: iso-2022-7bit
;; End:
-;; arch-tag: f6d9dd5d-685c-45d6-a5d8-1e2178228b7e
;;; cyril-util.el ends here
diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index 1d728e48ab..891773f57c 100644
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -272,5 +272,4 @@ Support for Russian using koi8-r and the russian-computer input method.")
(provide 'cyrillic)
-;; arch-tag: bda71ae0-ba41-4cb6-a6e0-1dff542313d3
;;; cyrillic.el ends here
diff --git a/lisp/language/czech.el b/lisp/language/czech.el
index fd7834c224..95afdd0b61 100644
--- a/lisp/language/czech.el
+++ b/lisp/language/czech.el
@@ -45,5 +45,4 @@ and selects the Czech tutorial."))
(provide 'czech)
-;; arch-tag: 45ac0d83-ca13-4b5e-9e82-821e44080c24
;;; czech.el ends here
diff --git a/lisp/language/english.el b/lisp/language/english.el
index 9dde2d3ff7..915a8db5aa 100644
--- a/lisp/language/english.el
+++ b/lisp/language/english.el
@@ -67,5 +67,4 @@ Nothing special is needed to handle English.")
(set-language-info-alist
"ASCII" (cdr (assoc "English" language-info-alist)))
-;; arch-tag: e440bdb0-91b0-4fb4-ae38-425780f8f745
;;; english.el ends here
diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index a2577ced1b..7f78808016 100644
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -2073,5 +2073,4 @@ mark."
;;; ethio-util.el ends here
-;; arch-tag: c8feb3d6-39bf-4b0a-b6ef-26f03fbc8140
;;; ethio-util.el ends here
diff --git a/lisp/language/ethiopic.el b/lisp/language/ethiopic.el
index 07d42278f3..400882fbc4 100644
--- a/lisp/language/ethiopic.el
+++ b/lisp/language/ethiopic.el
@@ -85,5 +85,4 @@
(provide 'ethiopic)
-;; arch-tag: e81329d9-1286-43ba-92fd-54ce5c7b213c
;;; ethiopic.el ends here
diff --git a/lisp/language/european.el b/lisp/language/european.el
index 46c37945d1..747b77d906 100644
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -639,5 +639,4 @@ method and applying Turkish case rules for the characters i, I, $(D)E(B, $(D*
(provide 'european)
-;; arch-tag: 9e018b12-fb02-4120-907b-9adeaf84b5c2
;;; european.el ends here
diff --git a/lisp/language/georgian.el b/lisp/language/georgian.el
index 91c09beb20..6138e04f49 100644
--- a/lisp/language/georgian.el
+++ b/lisp/language/georgian.el
@@ -48,5 +48,4 @@
(provide 'georgian)
-;; arch-tag: 15499fbb-26d4-4a13-9d78-135eef7d32f5
;;; georgian.el ends here
diff --git a/lisp/language/greek.el b/lisp/language/greek.el
index bddc791eeb..e4d239cdf2 100644
--- a/lisp/language/greek.el
+++ b/lisp/language/greek.el
@@ -83,5 +83,4 @@
(provide 'greek)
-;; arch-tag: 9ba48d79-84bc-45e1-9318-685dc3921410
;;; greek.el ends here
diff --git a/lisp/language/hanja-util.el b/lisp/language/hanja-util.el
index 8de533afab..1fa1b7247f 100644
--- a/lisp/language/hanja-util.el
+++ b/lisp/language/hanja-util.el
@@ -6591,5 +6591,4 @@ The value is a hanja character that is selected interactively."
(provide 'hanja-util)
-;; arch-tag: 3358afb4-c63f-472f-989a-5249129924d1
;;; hanja-util.el ends here
diff --git a/lisp/language/hebrew.el b/lisp/language/hebrew.el
index ad079c2d70..58ffb02982 100644
--- a/lisp/language/hebrew.el
+++ b/lisp/language/hebrew.el
@@ -259,5 +259,4 @@ Bidirectional editing is supported.")))
(provide 'hebrew)
-;; arch-tag: 3ca04f32-3f1e-498e-af46-8267498ba5d9
;;; hebrew.el ends here
diff --git a/lisp/language/ind-util.el b/lisp/language/ind-util.el
index be3fba4a30..825950807f 100644
--- a/lisp/language/ind-util.el
+++ b/lisp/language/ind-util.el
@@ -1213,5 +1213,4 @@ Returns new end position."
(provide 'ind-util)
-;; arch-tag: 59aacd71-46c2-4cb3-bb26-e12bbad55545
;;; ind-util.el ends here
diff --git a/lisp/language/indian.el b/lisp/language/indian.el
index aa0bb5117a..bfe05c3eee 100644
--- a/lisp/language/indian.el
+++ b/lisp/language/indian.el
@@ -389,5 +389,4 @@ South Indian language Malayalam is supported in this language environment."))
(provide 'indian)
-;; arch-tag: 83aa8fc7-7ee2-4364-a6e5-498f5e3b8c2f
;;; indian.el ends here
diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el
index 5df35643e3..75d33b65b8 100644
--- a/lisp/language/japan-util.el
+++ b/lisp/language/japan-util.el
@@ -325,5 +325,4 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading."
;;
(provide 'japan-util)
-;; arch-tag: b579595c-c9ad-4b57-9314-98cd8b214f89
;;; japan-util.el ends here
diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el
index 09800ceb4f..9262d6a17a 100644
--- a/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@ -274,5 +274,4 @@ and the second is a glyph for a variation selector."
(provide 'japanese)
-;; arch-tag: 450f5537-9d53-4d5e-b731-4cf116d8cbc9
;;; japanese.el ends here
diff --git a/lisp/language/khmer.el b/lisp/language/khmer.el
index 9e1dbf6c4b..d01fa3b33b 100644
--- a/lisp/language/khmer.el
+++ b/lisp/language/khmer.el
@@ -35,5 +35,4 @@
(set-char-table-range composition-function-table '(#x1780 . #x17FF) val)
(set-char-table-range composition-function-table '(#x19E0 . #x19FF) val))
-;; arch-tag: 032890e4-a936-4584-ad44-79eb5f8bc98e
;; khmer.el ends here
diff --git a/lisp/language/korea-util.el b/lisp/language/korea-util.el
index 43ef614a47..34564edb6b 100644
--- a/lisp/language/korea-util.el
+++ b/lisp/language/korea-util.el
@@ -143,5 +143,4 @@
;;
(provide 'korea-util)
-;; arch-tag: b17d0981-05da-4577-99f8-1db87fff8b44
;;; korea-util.el ends here
diff --git a/lisp/language/korean.el b/lisp/language/korean.el
index d7967a8e95..dedd7430fc 100644
--- a/lisp/language/korean.el
+++ b/lisp/language/korean.el
@@ -87,5 +87,4 @@ and the following key bindings are available within Korean input methods:
(provide 'korean)
-;; arch-tag: ca7c7348-5ca3-4623-887a-7fd33d725d0e
;;; korean.el ends here
diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el
index 6c441a1f30..365840efdd 100644
--- a/lisp/language/lao-util.el
+++ b/lisp/language/lao-util.el
@@ -516,5 +516,4 @@ syllable. In that case, FROM and TO are indexes to STR."
;;
(provide 'lao-util)
-;; arch-tag: 1f828781-3cb8-4695-88af-8f33222338ce
;;; lao-util.el ends here
diff --git a/lisp/language/lao.el b/lisp/language/lao.el
index d60459a1f1..9423ac9c81 100644
--- a/lisp/language/lao.el
+++ b/lisp/language/lao.el
@@ -83,5 +83,4 @@
(provide 'lao)
-;; arch-tag: ba540fd9-6352-4449-a9cd-669afd21fa57
;;; lao.el ends here
diff --git a/lisp/language/misc-lang.el b/lisp/language/misc-lang.el
index e099ea542b..6fa54ff5c8 100644
--- a/lisp/language/misc-lang.el
+++ b/lisp/language/misc-lang.el
@@ -74,5 +74,4 @@ and Italian.")))
(provide 'misc-lang)
-;; arch-tag: 6953585c-1a1a-4c09-be82-a2518afb6074
;;; misc-lang.el ends here
diff --git a/lisp/language/romanian.el b/lisp/language/romanian.el
index 5319a18b47..8a2aabb42b 100644
--- a/lisp/language/romanian.el
+++ b/lisp/language/romanian.el
@@ -52,5 +52,4 @@ An environment for generic Latin-10 encoding is also available."))
(provide 'romanian)
-;; arch-tag: a0bf93ee-2f02-4678-a477-c08acc35366b
;;; romanian.el ends here
diff --git a/lisp/language/sinhala.el b/lisp/language/sinhala.el
index 0b9bf1279f..ea8a6a34cd 100644
--- a/lisp/language/sinhala.el
+++ b/lisp/language/sinhala.el
@@ -45,5 +45,4 @@
"[\u0D80-\u0DFF]")
0 'font-shape-gstring)))
-;; arch-tag: 87b9ad3b-5090-422f-b942-eb85b9d52e7c
;; sinhala.el ends here
diff --git a/lisp/language/slovak.el b/lisp/language/slovak.el
index 458c0327e0..430c5fd1d5 100644
--- a/lisp/language/slovak.el
+++ b/lisp/language/slovak.el
@@ -46,5 +46,4 @@ and selects the Slovak tutorial."))
(provide 'slovak)
-;; arch-tag: 1bae098a-33b2-4426-8c29-59e44fe05484
;;; slovak.el ends here
diff --git a/lisp/language/tai-viet.el b/lisp/language/tai-viet.el
index a7029c659a..9b36e316e9 100644
--- a/lisp/language/tai-viet.el
+++ b/lisp/language/tai-viet.el
@@ -62,4 +62,3 @@ is available at this web page:
;; coding: utf-8
;; End:
-;; arch-tag: db4e3377-2ba7-47a0-b173-e44420d540c3
diff --git a/lisp/language/thai-util.el b/lisp/language/thai-util.el
index b15197be29..ebc7423b3f 100644
--- a/lisp/language/thai-util.el
+++ b/lisp/language/thai-util.el
@@ -282,5 +282,4 @@ The commands affected are \\[forward-word], \\[backward-word], \\[kill-word], \\
;;
(provide 'thai-util)
-;; arch-tag: 59425d6a-8cf9-4e06-a6ab-8ab7dc7a7a97
;;; thai-util.el ends here
diff --git a/lisp/language/thai-word.el b/lisp/language/thai-word.el
index 55a89f462c..5cb13e08fd 100644
--- a/lisp/language/thai-word.el
+++ b/lisp/language/thai-word.el
@@ -11077,4 +11077,3 @@ With argument, do this that many times."
;; end of thai-word.el
-;; arch-tag: 29927f02-e177-4224-a270-7e67210b038a
diff --git a/lisp/language/thai.el b/lisp/language/thai.el
index b4f3177a23..1a729083d9 100644
--- a/lisp/language/thai.el
+++ b/lisp/language/thai.el
@@ -85,5 +85,4 @@ This is the same as `thai-tis620' with the addition of no-break-space."
(provide 'thai)
-;; arch-tag: c7eb0e91-4db0-4619-81f8-8762e7d51e15
;;; thai.el ends here
diff --git a/lisp/language/tibet-util.el b/lisp/language/tibet-util.el
index 2f446a1814..f5f2c687b7 100644
--- a/lisp/language/tibet-util.el
+++ b/lisp/language/tibet-util.el
@@ -421,5 +421,4 @@ before writing buffer in Unicode. See also
(provide 'tibet-util)
-;; arch-tag: 7a7333e8-1584-446c-b39c-a02b9def265d
;;; tibet-util.el ends here
diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el
index 7ece195b1e..e30a4ef812 100644
--- a/lisp/language/tibetan.el
+++ b/lisp/language/tibetan.el
@@ -611,5 +611,4 @@ This also matches some punctuation characters which need conversion.")
(provide 'tibetan)
-;; arch-tag: 8d37c8d7-f95d-450f-9ec2-819e61fc79a7
;;; tibetan.el ends here
diff --git a/lisp/language/tv-util.el b/lisp/language/tv-util.el
index 15eb51a3c5..400856d1aa 100644
--- a/lisp/language/tv-util.el
+++ b/lisp/language/tv-util.el
@@ -139,4 +139,3 @@
;;
(provide 'tai-viet-util)
-;; arch-tag: a45ac3fc-07d0-44d5-8841-2ebea7e11f5b
diff --git a/lisp/language/utf-8-lang.el b/lisp/language/utf-8-lang.el
index 0eef348e18..53bdea21b5 100644
--- a/lisp/language/utf-8-lang.el
+++ b/lisp/language/utf-8-lang.el
@@ -52,5 +52,4 @@ encoded in UTF-8."))
(provide 'utf-8-lang)
-;; arch-tag: dfa339e1-296f-4b1e-9fe8-2b65279ec813
;;; utf-8-lang.el ends here
diff --git a/lisp/language/viet-util.el b/lisp/language/viet-util.el
index 9c651e0553..3c7c66b8bf 100644
--- a/lisp/language/viet-util.el
+++ b/lisp/language/viet-util.el
@@ -296,5 +296,4 @@ positions (integers or markers) specifying the stretch of the region."
;;;
(provide 'viet-util)
-;; arch-tag: 082a4d3b-168f-45b4-b3e1-82bfa1b5a194
;;; viet-util.el ends here
diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el
index 65933c7658..8f00b44f38 100644
--- a/lisp/language/vietnamese.el
+++ b/lisp/language/vietnamese.el
@@ -110,5 +110,4 @@ Telex, VIQR is the default setting.")))
(provide 'vietnamese)
-;; arch-tag: 5bd4f1aa-2d4e-4f33-b7d8-0679c6a19ee6
;;; vietnamese.el ends here
diff --git a/lisp/ledit.el b/lisp/ledit.el
index 034f61317f..a4fb4bca18 100644
--- a/lisp/ledit.el
+++ b/lisp/ledit.el
@@ -154,5 +154,4 @@ do (setq lisp-mode-hook 'ledit-from-lisp-mode)"
(provide 'ledit)
-;; arch-tag: f0f1ca13-8d31-478c-ae1b-b448c55a8faf
;;; ledit.el ends here
diff --git a/lisp/linum.el b/lisp/linum.el
index 5859c48fc3..2dfc6b7020 100644
--- a/lisp/linum.el
+++ b/lisp/linum.el
@@ -202,5 +202,4 @@ and you have to scroll or press \\[recenter-top-bottom] to update the numbers."
(provide 'linum)
-;; arch-tag: dea45631-ed3c-4867-8b49-1c41c80aec6a
;;; linum.el ends here
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 17f4035bf2..763d8c38eb 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -267,5 +267,4 @@ something strange, such as redefining an Emacs function."
(provide 'loadhist)
-;; arch-tag: 70bb846a-c413-4f01-bf88-78dba4ac0798
;;; loadhist.el ends here
diff --git a/lisp/longlines.el b/lisp/longlines.el
index e00e666b24..964398edea 100644
--- a/lisp/longlines.el
+++ b/lisp/longlines.el
@@ -503,5 +503,4 @@ This is called by `window-configuration-change-hook'."
(provide 'longlines)
-;; arch-tag: 3489d225-5506-47b9-8659-d8807b77c624
;;; longlines.el ends here
diff --git a/lisp/lpr.el b/lisp/lpr.el
index 561aa05f37..234c60b542 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -337,5 +337,4 @@ The characters tab, linefeed, space, return and formfeed are not affected."
(provide 'lpr)
-;; arch-tag: 21c3f821-ebec-4ca9-ac67-a81e4b75c62a
;;; lpr.el ends here
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index 1db729934e..8f2daeec5d 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -1,7 +1,7 @@
;;; ls-lisp.el --- emulate insert-directory completely in Emacs Lisp
-;; Copyright (C) 1992, 1994, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1994, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
;; Modified by: Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>
diff --git a/lisp/macros.el b/lisp/macros.el
index 4ac740d4fc..b55edb2fa4 100644
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -283,5 +283,4 @@ and then select the region of un-tablified names and use
(provide 'macros)
-;; arch-tag: 346ed1a5-1220-4bc8-b533-961ee704361f
;;; macros.el ends here
diff --git a/lisp/mail/blessmail.el b/lisp/mail/blessmail.el
index 4737f86a6a..297bf86d5c 100644
--- a/lisp/mail/blessmail.el
+++ b/lisp/mail/blessmail.el
@@ -66,5 +66,4 @@
(write-region (point-min) (point-max) "blessmail")
(kill-emacs)
-;; arch-tag: c3329fe2-f945-41a9-8b00-b4b038ff182f
;;; blessmail.el ends here
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 5c6da623fe..597344fb88 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -2662,5 +2662,4 @@ been weeded out."
(provide 'feedmail)
-;; arch-tag: ec27b380-11c0-4dfd-8436-f636cf2bb992
;;; feedmail.el ends here
diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el
index 82928642f3..f6bf1127f5 100644
--- a/lisp/mail/footnote.el
+++ b/lisp/mail/footnote.el
@@ -797,5 +797,4 @@ started, play around with the following keys:
(provide 'footnote)
-;; arch-tag: 9bcfb6d7-2161-4caf-8793-700f62400398
;;; footnote.el ends here
diff --git a/lisp/mail/hashcash.el b/lisp/mail/hashcash.el
index 5c6a69e686..1108ff92c0 100644
--- a/lisp/mail/hashcash.el
+++ b/lisp/mail/hashcash.el
@@ -1,6 +1,7 @@
;;; hashcash.el --- Add hashcash payments to email
-;; Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011 Free Software Foundation
+;; Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation
;; Written by: Paul Foley <mycroft@actrix.gen.nz> (1997-2002)
;; Maintainer: Paul Foley <mycroft@actrix.gen.nz>
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index 0125d52f55..f322c57396 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -1,7 +1,8 @@
;;; mail-extr.el --- extract full name and address from RFC 822 mail header -*- coding: utf-8 -*-
;; Copyright (C) 1991, 1992, 1993, 1994, 1997, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Joe Wells <jbw@cs.bu.edu>
;; Maintainer: FSF
diff --git a/lisp/mail/mail-hist.el b/lisp/mail/mail-hist.el
index afaf6949ca..6a008ab857 100644
--- a/lisp/mail/mail-hist.el
+++ b/lisp/mail/mail-hist.el
@@ -293,5 +293,4 @@ received mail."
(provide 'mail-hist)
-;; arch-tag: 9ff9a07c-9dca-482d-ba87-54f42778559d
;;; mail-hist.el ends here
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index 0ec8f6dee2..a9ce8247a6 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -609,5 +609,4 @@ In other respects, this behaves like `end-of-buffer', which see."
(provide 'mailabbrev)
-;; arch-tag: 5aa2d901-73f8-4ad7-b73c-4802282ad2ff
;;; mailabbrev.el ends here
diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index e035201890..53deaa46a4 100644
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -1,7 +1,8 @@
;;; mailalias.el --- expand and complete mailing address aliases
-;; Copyright (C) 1985, 1987, 1995, 1996, 1997, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1987, 1995, 1996, 1997, 2001, 2002, 2003, 2004,
+;; 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: mail
diff --git a/lisp/mail/mailclient.el b/lisp/mail/mailclient.el
index b1da0458d8..3c23abaf4e 100644
--- a/lisp/mail/mailclient.el
+++ b/lisp/mail/mailclient.el
@@ -174,5 +174,4 @@ The mail client is taken to be the handler of mailto URLs."
(provide 'mailclient)
-;; arch-tag: 35d10fc8-a1bc-4f29-a4e6-c288e53578ef
;;; mailclient.el ends here
diff --git a/lisp/mail/mailheader.el b/lisp/mail/mailheader.el
index 56fa0c5979..752fcb6202 100644
--- a/lisp/mail/mailheader.el
+++ b/lisp/mail/mailheader.el
@@ -1,7 +1,7 @@
;;; mailheader.el --- mail header parsing, merging, formatting
-;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
-;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Erik Naggum <erik@naggum.no>
;; Keywords: tools, mail, news
diff --git a/lisp/mail/mailpost.el b/lisp/mail/mailpost.el
index 0790375388..7c4bea830d 100644
--- a/lisp/mail/mailpost.el
+++ b/lisp/mail/mailpost.el
@@ -102,5 +102,4 @@ site-init."
(provide 'mailpost)
-;; arch-tag: 1f8ca085-60a6-4eac-8efb-69ffec2fa124
;;; mailpost.el ends here
diff --git a/lisp/mail/metamail.el b/lisp/mail/metamail.el
index 2b900485b1..63f366d55a 100644
--- a/lisp/mail/metamail.el
+++ b/lisp/mail/metamail.el
@@ -200,5 +200,4 @@ redisplayed as output is inserted."
(provide 'metamail)
-;; arch-tag: 52c0cb6f-d800-4776-9789-f0275cb5490e
;;; metamail.el ends here
diff --git a/lisp/mail/mspools.el b/lisp/mail/mspools.el
index 80c31924dd..e89fd6c157 100644
--- a/lisp/mail/mspools.el
+++ b/lisp/mail/mspools.el
@@ -1,7 +1,7 @@
;;; mspools.el --- show mail spools waiting to be read
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
-;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Stephen Eglen <stephen@gnu.org>
;; Maintainer: Stephen Eglen <stephen@gnu.org>
diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index ba5c8e337c..280be615c1 100644
--- a/lisp/mail/reporter.el
+++ b/lisp/mail/reporter.el
@@ -407,5 +407,4 @@ mail-sending package is used for editing and sending the message."
(provide 'reporter)
-;; arch-tag: 33612ff4-fbbc-4be2-b183-560ce9e0199b
;;; reporter.el ends here
diff --git a/lisp/mail/rfc822.el b/lisp/mail/rfc822.el
index ddaf762598..1fefef7e27 100644
--- a/lisp/mail/rfc822.el
+++ b/lisp/mail/rfc822.el
@@ -324,5 +324,4 @@
(provide 'rfc822)
-;; arch-tag: 5d388a24-e173-40fb-9b8e-85269de44b37
;;; rfc822.el ends here
diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el
index a5d8e59a3c..aeb4de531a 100644
--- a/lisp/mail/rmail-spam-filter.el
+++ b/lisp/mail/rmail-spam-filter.el
@@ -555,5 +555,4 @@ checks to see if the old format is used, and updates it if necessary."
(provide 'rmail-spam-filter)
-;; arch-tag: 03e1d45d-b72f-4dd7-8f04-e7fd78249746
;;; rmail-spam-fitler ends here
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 9bfcdea14c..472df32927 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4263,7 +4263,7 @@ encoded string (and the same mask) will decode the string."
;;; Start of automatically extracted autoloads.
;;;### (autoloads (rmail-edit-current-message) "rmailedit" "rmailedit.el"
-;;;;;; "bdbcacaef237aab5ca6c8653dc52a044")
+;;;;;; "1602595714ff15197cf32727d6765c31")
;;; Generated autoloads from rmailedit.el
(autoload 'rmail-edit-current-message "rmailedit" "\
@@ -4275,7 +4275,7 @@ Edit the contents of this message.
;;;### (autoloads (rmail-next-labeled-message rmail-previous-labeled-message
;;;;;; rmail-read-label rmail-kill-label rmail-add-label) "rmailkwd"
-;;;;;; "rmailkwd.el" "46ac83afa76e3aa88eacf73237bd703e")
+;;;;;; "rmailkwd.el" "061943b8a3dfd5695715b36736827950")
;;; Generated autoloads from rmailkwd.el
(autoload 'rmail-add-label "rmailkwd" "\
@@ -4318,7 +4318,7 @@ With prefix argument N moves forward N messages with these labels.
;;;***
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "724fa72db9b6c804f7f69ad1da83fd39")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "783deb7c855767051af119f1bfd8d84e")
;;; Generated autoloads from rmailmm.el
(autoload 'rmail-mime "rmailmm" "\
@@ -4344,7 +4344,7 @@ attachments as specfied by `rmail-mime-attachment-dirs-alist'.
;;;***
;;;### (autoloads (set-rmail-inbox-list) "rmailmsc" "rmailmsc.el"
-;;;;;; "fd5e2a8dc4f74ea2275525d7a2766bea")
+;;;;;; "f1d9be06745c78b90224da788f61c2d9")
;;; Generated autoloads from rmailmsc.el
(autoload 'set-rmail-inbox-list "rmailmsc" "\
@@ -4360,7 +4360,7 @@ This applies only to the current session.
;;;### (autoloads (rmail-sort-by-labels rmail-sort-by-lines rmail-sort-by-correspondent
;;;;;; rmail-sort-by-recipient rmail-sort-by-author rmail-sort-by-subject
-;;;;;; rmail-sort-by-date) "rmailsort" "rmailsort.el" "446f2e852393e72030b85a1a9230c7ac")
+;;;;;; rmail-sort-by-date) "rmailsort" "rmailsort.el" "8b20167ea495d683f83f980833e948e0")
;;; Generated autoloads from rmailsort.el
(autoload 'rmail-sort-by-date "rmailsort" "\
@@ -4419,7 +4419,7 @@ If prefix argument REVERSE is non-nil, sorts in reverse order.
;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic
;;;;;; rmail-summary-by-regexp rmail-summary-by-recipients rmail-summary-by-labels
-;;;;;; rmail-summary) "rmailsum" "rmailsum.el" "267d6f740d6697a631dacbd86f583374")
+;;;;;; rmail-summary) "rmailsum" "rmailsum.el" "b1d2ca7470a7d8baffe9e90a15a5b5e0")
;;; Generated autoloads from rmailsum.el
(autoload 'rmail-summary "rmailsum" "\
@@ -4467,7 +4467,7 @@ SENDERS is a string of regexps separated by commas.
;;;***
;;;### (autoloads (unforward-rmail-message undigestify-rmail-message)
-;;;;;; "undigest" "undigest.el" "2869c38a0051d0acab1a5968627fa57d")
+;;;;;; "undigest" "undigest.el" "1b5181e02606e49ede71604472250cc3")
;;; Generated autoloads from undigest.el
(autoload 'undigestify-rmail-message "undigest" "\
diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el
index 3c1b1935d8..2d5659a420 100644
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -399,5 +399,4 @@ HEADER-DIFF should be a return value from `rmail-edit-diff-headers'."
;; generated-autoload-file: "rmail.el"
;; End:
-;; arch-tag: 9524f335-12cc-4e95-9e9b-3208dc30550b
;;; rmailedit.el ends here
diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el
index 4551454cd0..b9b69231b8 100644
--- a/lisp/mail/rmailkwd.el
+++ b/lisp/mail/rmailkwd.el
@@ -194,5 +194,4 @@ With prefix argument N moves forward N messages with these labels."
;; generated-autoload-file: "rmail.el"
;; End:
-;; arch-tag: 1149979c-8e47-4333-9629-cf3dc887a6a7
;;; rmailkwd.el ends here
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index ba1f39798e..1b0e446209 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -274,11 +274,11 @@ It is called with one argument ENTITY."
"Return a vector describing the displayed region of a MIME-entity at POS.
Optional 2nd argument ENTITY is the MIME-entity at POS.
The value is a vector [ INDEX HEADER TAGLINE BODY END], where
+ INDEX: index into the returned vector indicating where POS is (1..3).
HEADER: the position of the beginning of a header
TAGLINE: the position of the beginning of a tagline
BODY: the position of the beginning of a body
- END: the position of the end of the entity.
- INDEX: index into the returned vector indicating where POS is."
+ END: the position of the end of the entity."
(save-excursion
(or entity
(setq entity (get-text-property pos 'rmail-mime-entity)))
@@ -319,74 +319,32 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where
(setq end body-beg))
(vector index beg tagline-beg body-beg end)))))
-(defun rmail-mime-next-item ()
- "Move point to the next displayed item of the current MIME entity.
-A MIME entity has three items; header, tagline, and body.
-If we are in the last item of the entity, move point to the first
-item of the next entity. If we reach the end of buffer, move
-point to the first item of the first entity (i.e. the beginning
-of buffer)."
- (interactive)
- (if (rmail-mime-message-p)
- (let* ((segment (rmail-mime-entity-segment (point)))
- (next-pos (aref segment (1+ (aref segment 0))))
- (button (next-button (point))))
- (goto-char (if (and button (< (button-start button) next-pos))
- (button-start button)
- next-pos))
- (if (eobp)
- (goto-char (point-min))))))
-
-(defun rmail-mime-previous-item ()
- "Move point to the previous displayed item of the current MIME message.
-A MIME entity has three items; header, tagline, and body.
-If we are at the beginning of the first item of the entity, move
-point to the last item of the previous entity. If we reach the
-beginning of buffer, move point to the last item of the last
-entity."
- (interactive)
- (when (rmail-mime-message-p)
- (if (bobp)
- (goto-char (point-max)))
- (let* ((segment (rmail-mime-entity-segment (1- (point))))
- (prev-pos (aref segment (aref segment 0)))
- (button (previous-button (point))))
- (goto-char (if (and button (> (button-start button) prev-pos))
- (button-start button)
- prev-pos)))))
-
(defun rmail-mime-shown-mode (entity)
"Make MIME-entity ENTITY displayed by the default way."
(let ((new (aref (rmail-mime-entity-display entity) 1)))
(aset new 0 (aref (rmail-mime-entity-header entity) 2))
(aset new 1 (aref (rmail-mime-entity-tagline entity) 2))
- (aset new 2 (aref (rmail-mime-entity-body entity) 2))))
-
-(defun rmail-mime-hidden-mode (entity top)
- "Make MIME-entity ENTITY displayed in the hidden mode.
-If TOP is non-nil, display ENTITY only by the tagline.
-Otherwise, don't display ENTITY."
- (if top
- (let ((new (aref (rmail-mime-entity-display entity) 1)))
- (aset new 0 nil)
- (aset new 1 top)
- (aset new 2 nil)
- (aset (rmail-mime-entity-body entity) 2 nil))
- (let ((current (aref (rmail-mime-entity-display entity) 0)))
- (aset current 0 nil)
- (aset current 1 nil)
- (aset current 2 nil)))
+ (aset new 2 (aref (rmail-mime-entity-body entity) 2)))
+ (dolist (child (rmail-mime-entity-children entity))
+ (rmail-mime-shown-mode child)))
+
+(defun rmail-mime-hidden-mode (entity)
+ "Make MIME-entity ENTITY displayed in the hidden mode."
+ (let ((new (aref (rmail-mime-entity-display entity) 1)))
+ (aset new 0 nil)
+ (aset new 1 t)
+ (aset new 2 nil))
(dolist (child (rmail-mime-entity-children entity))
- (rmail-mime-hidden-mode child nil)))
+ (rmail-mime-hidden-mode child)))
(defun rmail-mime-raw-mode (entity)
"Make MIME-entity ENTITY displayed in the raw mode."
(let ((new (aref (rmail-mime-entity-display entity) 1)))
(aset new 0 'raw)
(aset new 1 nil)
- (aset new 2 'raw)
- (dolist (child (rmail-mime-entity-children entity))
- (rmail-mime-hidden-mode child nil))))
+ (aset new 2 'raw))
+ (dolist (child (rmail-mime-entity-children entity))
+ (rmail-mime-raw-mode child)))
(defun rmail-mime-toggle-raw (entity)
"Toggle on and off the raw display mode of MIME-entity ENTITY."
@@ -407,7 +365,7 @@ Otherwise, don't display ENTITY."
(restore-buffer-modified-p modified)))))
(defun rmail-mime-toggle-hidden ()
- "Toggle on and off the hidden display mode of MIME-entity ENTITY."
+ "Hide or show the body of MIME-entity at point."
(interactive)
(when (rmail-mime-message-p)
(let* ((rmail-mime-mbox-buffer rmail-view-buffer)
@@ -420,18 +378,19 @@ Otherwise, don't display ENTITY."
;; Enter the hidden mode.
(progn
;; If point is in the body part, move it to the tagline
- ;; (or the header if headline is not displayed).
+ ;; (or the header if tagline is not displayed).
(if (= (aref segment 0) 3)
(goto-char (aref segment 2)))
- (rmail-mime-hidden-mode entity t)
+ (rmail-mime-hidden-mode entity)
;; If the current entity is the topmost one, display the
;; header.
(if (and rmail-mime-mbox-buffer (= (aref segment 1) (point-min)))
(let ((new (aref (rmail-mime-entity-display entity) 1)))
(aset new 0 t))))
;; Enter the shown mode.
- (aset (rmail-mime-entity-body entity) 2 t)
- (rmail-mime-shown-mode entity))
+ (rmail-mime-shown-mode entity)
+ ;; Force this body shown.
+ (aset (aref (rmail-mime-entity-display entity) 1) 2 t))
(let ((inhibit-read-only t)
(modified (buffer-modified-p))
(rmail-mime-mbox-buffer rmail-view-buffer)
@@ -441,8 +400,8 @@ Otherwise, don't display ENTITY."
(rmail-mime-insert entity)
(restore-buffer-modified-p modified))))))
-(define-key rmail-mode-map "\t" 'rmail-mime-next-item)
-(define-key rmail-mode-map [backtab] 'rmail-mime-previous-item)
+(define-key rmail-mode-map "\t" 'forward-button)
+(define-key rmail-mode-map [backtab] 'backward-button)
(define-key rmail-mode-map "\r" 'rmail-mime-toggle-hidden)
;;; Handlers
@@ -454,7 +413,11 @@ to the tag line."
(insert "[")
(let ((tag (aref (rmail-mime-entity-tagline entity) 0)))
(if (> (length tag) 0) (insert (substring tag 1) ":")))
- (insert (car (rmail-mime-entity-type entity)))
+ (insert (car (rmail-mime-entity-type entity)) " ")
+ (insert-button (let ((new (aref (rmail-mime-entity-display entity) 1)))
+ (if (aref new 2) "Hide" "Show"))
+ :type 'rmail-mime-toggle
+ 'help-echo "mouse-2, RET: Toggle show/hide")
(dolist (item item-list)
(when item
(if (stringp item)
@@ -462,6 +425,26 @@ to the tag line."
(apply 'insert-button item))))
(insert "]\n"))
+(defun rmail-mime-update-tagline (entity)
+ "Update the current tag line for MIME-entity ENTITY."
+ (let ((inhibit-read-only t)
+ (modified (buffer-modified-p))
+ ;; If we are going to show the body, the new button label is
+ ;; "Hide". Otherwise, it's "Show".
+ (label (if (aref (aref (rmail-mime-entity-display entity) 1) 2) "Hide"
+ "Show"))
+ (button (next-button (point))))
+ ;; Go to the second character of the button "Show" or "Hide".
+ (goto-char (1+ (button-start button)))
+ (setq button (button-at (point)))
+ (save-excursion
+ (insert label)
+ (delete-region (point) (button-end button)))
+ (delete-region (button-start button) (point))
+ (put-text-property (point) (button-end button) 'rmail-mime-entity entity)
+ (restore-buffer-modified-p modified)
+ (forward-line 1)))
+
(defun rmail-mime-insert-header (header)
"Decode and insert a MIME-entity header HEADER in the current buffer.
HEADER is a vector [BEG END DEFAULT-STATUS].
@@ -478,12 +461,27 @@ See `rmail-mime-entity' for the detail."
(rmail-copy-headers (point) (aref header 1)))))
(rfc2047-decode-region pos (point))
(if (and last-coding-system-used (not rmail-mime-coding-system))
- (setq rmail-mime-coding-system last-coding-system-used))
+ (setq rmail-mime-coding-system (cons last-coding-system-used nil)))
(goto-char (point-min))
(rmail-highlight-headers)
(goto-char (point-max))
(insert "\n"))))
+(defun rmail-mime-find-header-encoding (header)
+ "Retun the last coding system used to decode HEADER.
+HEADER is a header component of a MIME-entity object (see
+`rmail-mime-entity')."
+ (with-temp-buffer
+ (let ((last-coding-system-used nil))
+ (with-current-buffer rmail-mime-mbox-buffer
+ (let ((rmail-buffer rmail-mime-mbox-buffer)
+ (rmail-view-buffer rmail-mime-view-buffer))
+ (save-excursion
+ (goto-char (aref header 0))
+ (rmail-copy-headers (point) (aref header 1)))))
+ (rfc2047-decode-region (point-min) (point-max))
+ last-coding-system-used)))
+
(defun rmail-mime-text-handler (content-type
content-disposition
content-transfer-encoding)
@@ -516,7 +514,7 @@ See `rmail-mime-entity' for the detail."
((string= transfer-encoding "quoted-printable")
(quoted-printable-decode-region pos (point))))))
(decode-coding-region pos (point) coding-system)
- (or rmail-mime-coding-system
+ (if (or (not rmail-mime-coding-system) (consp rmail-mime-coding-system))
(setq rmail-mime-coding-system coding-system))
(or (bolp) (insert "\n"))))
@@ -544,7 +542,10 @@ See `rmail-mime-entity' for the detail."
(rmail-mime-insert-header header)))
;; tagline
(if (eq (aref current 1) (aref new 1))
- (forward-char (- (aref segment 3) (aref segment 2)))
+ (if (or (not (aref current 1))
+ (eq (aref current 2) (aref new 2)))
+ (forward-char (- (aref segment 3) (aref segment 2)))
+ (rmail-mime-update-tagline entity))
(if (aref current 1)
(delete-char (- (aref segment 3) (aref segment 2))))
(if (aref new 1)
@@ -599,13 +600,13 @@ MIME-Version: 1.0
(insert-image (create-image data (cdr bulk-data) t))
(insert "\n")))
-(defun rmail-mime-image (button)
- "Display the image associated with BUTTON."
+(defun rmail-mime-toggle-button (button)
+ "Hide or show the body of the MIME-entity associated with BUTTON."
(save-excursion
- (goto-char (button-end button))
+ (goto-char (button-start button))
(rmail-mime-toggle-hidden)))
-(define-button-type 'rmail-mime-image 'action 'rmail-mime-image)
+(define-button-type 'rmail-mime-toggle 'action 'rmail-mime-toggle-button)
(defun rmail-mime-bulk-handler (content-type
@@ -628,7 +629,7 @@ directly."
(size (cdr (assq 'size (cdr (rmail-mime-entity-disposition entity)))))
(bulk-data (aref (rmail-mime-entity-tagline entity) 1))
(body (rmail-mime-entity-body entity))
- size type to-show)
+ type to-show)
(cond (size
(setq size (string-to-number size)))
((stringp (aref body 0))
@@ -662,7 +663,6 @@ directly."
(defun rmail-mime-insert-bulk (entity)
"Presentation handler for an attachment MIME entity."
- ;; Find the default directory for this media type.
(let* ((content-type (rmail-mime-entity-type entity))
(content-disposition (rmail-mime-entity-disposition entity))
(current (aref (rmail-mime-entity-display entity) 0))
@@ -671,6 +671,7 @@ directly."
(tagline (rmail-mime-entity-tagline entity))
(bulk-data (aref tagline 1))
(body (rmail-mime-entity-body entity))
+ ;; Find the default directory for this media type.
(directory (catch 'directory
(dolist (entry rmail-mime-attachment-dirs-alist)
(when (string-match (car entry) (car content-type))
@@ -711,13 +712,16 @@ directly."
;; tagline
(if (eq (aref current 1) (aref new 1))
- (forward-char (- (aref segment 3) (aref segment 2)))
+ (if (or (not (aref current 1))
+ (eq (aref current 2) (aref new 2)))
+ (forward-char (- (aref segment 3) (aref segment 2)))
+ (rmail-mime-update-tagline entity))
(if (aref current 1)
(delete-char (- (aref segment 3) (aref segment 2))))
(if (aref new 1)
(rmail-mime-insert-tagline
entity
- " file:"
+ " Save:"
(list filename
:type 'rmail-mime-save
'help-echo "mouse-2, RET: Save attachment"
@@ -725,14 +729,17 @@ directly."
'directory (file-name-as-directory directory)
'data data)
(format " (%.0f%s)" size (car units))
- (if (cdr bulk-data)
- " ")
- (if (cdr bulk-data)
- (list "Toggle show/hide"
- :type 'rmail-mime-image
- 'help-echo "mouse-2, RET: Toggle show/hide"
- 'image-type (cdr bulk-data)
- 'image-data data)))))
+ ;; We don't need this button because the "type" string of a
+ ;; tagline is the button to do this.
+ ;; (if (cdr bulk-data)
+ ;; " ")
+ ;; (if (cdr bulk-data)
+ ;; (list "Toggle show/hide"
+ ;; :type 'rmail-mime-image
+ ;; 'help-echo "mouse-2, RET: Toggle show/hide"
+ ;; 'image-type (cdr bulk-data)
+ ;; 'image-data data))
+ )))
;; body
(if (eq (aref current 2) (aref new 2))
(forward-char (- (aref segment 4) (aref segment 3)))
@@ -742,7 +749,11 @@ directly."
(cond ((eq (cdr bulk-data) 'text)
(rmail-mime-insert-decoded-text entity))
((cdr bulk-data)
- (rmail-mime-insert-image entity)))))
+ (rmail-mime-insert-image entity))
+ (t
+ ;; As we don't know how to display the body, just
+ ;; insert it as a text.
+ (rmail-mime-insert-decoded-text entity)))))
(put-text-property beg (point) 'rmail-mime-entity entity)))
(defun test-rmail-mime-bulk-handler ()
@@ -820,7 +831,9 @@ The other arguments are the same as `rmail-mime-multipart-handler'."
(cond ((string-match "mixed" subtype)
(setq content-type '("text/plain")))
((string-match "digest" subtype)
- (setq content-type '("message/rfc822"))))
+ (setq content-type '("message/rfc822")))
+ (t
+ (setq content-type nil)))
;; Loop over all body parts, where beg points at the beginning of
;; the part and end points at the end of the part. next points at
@@ -877,8 +890,9 @@ The other arguments are the same as `rmail-mime-multipart-handler'."
(setq second child)))))
(or best (not second) (setq best second))
(dolist (child entities)
- (or (eq best child)
- (rmail-mime-hidden-mode child t)))))
+ (unless (eq best child)
+ (aset (rmail-mime-entity-body child) 2 nil)
+ (rmail-mime-hidden-mode child)))))
entities)))
(defun test-rmail-mime-multipart-handler ()
@@ -930,21 +944,23 @@ This is the epilogue. It is also to be ignored."))
(rmail-mime-insert-header header)))
;; tagline
(if (eq (aref current 1) (aref new 1))
- (forward-char (- (aref segment 3) (aref segment 2)))
+ (if (or (not (aref current 1))
+ (eq (aref current 2) (aref new 2)))
+ (forward-char (- (aref segment 3) (aref segment 2)))
+ (rmail-mime-update-tagline entity))
(if (aref current 1)
(delete-char (- (aref segment 3) (aref segment 2))))
(if (aref new 1)
(rmail-mime-insert-tagline entity)))
(put-text-property beg (point) 'rmail-mime-entity entity)
+
;; body
(if (eq (aref current 2) (aref new 2))
(forward-char (- (aref segment 4) (aref segment 3)))
- (if (aref current 2)
- (delete-char (- (aref segment 4) (aref segment 3))))
- (if (aref new 2)
- (dolist (child (rmail-mime-entity-children entity))
- (rmail-mime-insert child))))))
+ (dolist (child (rmail-mime-entity-children entity))
+ (rmail-mime-insert child)))
+ entity))
;;; Main code
@@ -1005,7 +1021,16 @@ The parsed header value:
;; Everything else is an attachment.
(rmail-mime-bulk-handler content-type
content-disposition
- content-transfer-encoding)))
+ content-transfer-encoding))
+ (save-restriction
+ (widen)
+ (let ((entity (get-text-property (1- (point)) 'rmail-mime-entity))
+ current new)
+ (when entity
+ (setq current (aref (rmail-mime-entity-display entity) 0)
+ new (aref (rmail-mime-entity-display entity) 1))
+ (dotimes (i 3)
+ (aset current i (aref new i)))))))
(defun rmail-mime-show (&optional show-headers)
"Handle the current buffer as a MIME message.
@@ -1050,7 +1075,8 @@ modified."
(setq content-transfer-encoding (downcase content-transfer-encoding)))
(setq content-type
(if content-type
- (mail-header-parse-content-type content-type)
+ (or (mail-header-parse-content-type content-type)
+ '("text/plain"))
(or default-content-type '("text/plain"))))
(setq content-disposition
(if content-disposition
@@ -1178,13 +1204,20 @@ available."
(if (aref current 1)
(delete-char (- (aref segment 3) (aref segment 2))))
;; body
- (if (eq (aref current 2) (aref new 2))
- (forward-char (- (aref segment 4) (aref segment 3)))
- (if (aref current 2)
- (delete-char (- (aref segment 4) (aref segment 3))))
- (insert-buffer-substring rmail-mime-mbox-buffer
- (aref body 0) (aref body 1)))
- (put-text-property beg (point) 'rmail-mime-entity entity)))
+ (let ((children (rmail-mime-entity-children entity)))
+ (if children
+ (progn
+ (put-text-property beg (point) 'rmail-mime-entity entity)
+ (dolist (child children)
+ (rmail-mime-insert child)))
+ (if (eq (aref current 2) (aref new 2))
+ (forward-char (- (aref segment 4) (aref segment 3)))
+ (if (aref current 2)
+ (delete-char (- (aref segment 4) (aref segment 3))))
+ (insert-buffer-substring rmail-mime-mbox-buffer
+ (aref body 0) (aref body 1))
+ (or (bolp) (insert "\n")))
+ (put-text-property beg (point) 'rmail-mime-entity entity)))))
(dotimes (i 3)
(aset current i (aref new i)))))
@@ -1212,17 +1245,18 @@ displays text and multipart messages, and offers to download
attachments as specfied by `rmail-mime-attachment-dirs-alist'."
(interactive "P")
(if rmail-enable-mime
- (if (rmail-mime-message-p)
- (let ((rmail-mime-mbox-buffer rmail-view-buffer)
- (rmail-mime-view-buffer rmail-buffer)
- (entity (get-text-property (point) 'rmail-mime-entity)))
- (if arg
- (if entity
- (rmail-mime-toggle-raw entity))
- (goto-char (point-min))
- (rmail-mime-toggle-raw
- (get-text-property (point) 'rmail-mime-entity))))
- (message "Not a MIME message"))
+ (with-current-buffer rmail-buffer
+ (if (rmail-mime-message-p)
+ (let ((rmail-mime-mbox-buffer rmail-view-buffer)
+ (rmail-mime-view-buffer rmail-buffer)
+ (entity (get-text-property (point) 'rmail-mime-entity)))
+ (if arg
+ (if entity
+ (rmail-mime-toggle-raw entity))
+ (goto-char (point-min))
+ (rmail-mime-toggle-raw
+ (get-text-property (point) 'rmail-mime-entity))))
+ (message "Not a MIME message")))
(let* ((data (rmail-apply-in-message rmail-current-message 'buffer-string))
(buf (get-buffer-create "*RMAIL*"))
(rmail-mime-mbox-buffer rmail-view-buffer)
@@ -1256,8 +1290,19 @@ attachments as specfied by `rmail-mime-attachment-dirs-alist'."
(with-current-buffer rmail-mime-view-buffer
(erase-buffer)
(rmail-mime-insert entity)
- (if rmail-mime-coding-system
- (set-buffer-file-coding-system rmail-mime-coding-system t t)))
+ (if (consp rmail-mime-coding-system)
+ ;; Decoding is done by rfc2047-decode-region only for a
+ ;; header. But, as the used coding system may have been
+ ;; overriden by mm-charset-override-alist, we can't
+ ;; trust (car rmail-mime-coding-system). So, here we
+ ;; try the decoding again with mm-charset-override-alist
+ ;; bound to nil.
+ (let ((mm-charset-override-alist nil))
+ (setq rmail-mime-coding-system
+ (rmail-mime-find-header-encoding
+ (rmail-mime-entity-header entity)))))
+ (set-buffer-file-coding-system
+ (coding-system-base rmail-mime-coding-system) t t))
;; Decoding failed. ENTITY is an error message. Insert the
;; original message body as is, and show warning.
(let ((region (with-current-buffer rmail-mime-mbox-buffer
@@ -1340,5 +1385,4 @@ attachments as specfied by `rmail-mime-attachment-dirs-alist'."
;; generated-autoload-file: "rmail.el"
;; End:
-;; arch-tag: 3f2c5e5d-1aef-4512-bc20-fd737c9d5dd9
;;; rmailmm.el ends here
diff --git a/lisp/mail/rmailmsc.el b/lisp/mail/rmailmsc.el
index 919f52a888..884a6b96d9 100644
--- a/lisp/mail/rmailmsc.el
+++ b/lisp/mail/rmailmsc.el
@@ -59,5 +59,4 @@ This applies only to the current session."
;; generated-autoload-file: "rmail.el"
;; End:
-;; arch-tag: 94614a62-2a0a-4e25-bac9-06f461ed4c60
;;; rmailmsc.el ends here
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index 969bce938b..f630b92d52 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -603,5 +603,4 @@ than appending to it. Deletes the message after writing if
(if rmail-delete-after-output
(rmail-delete-forward)))
-;; arch-tag: 4059abf0-f249-4be4-8e0d-602d370d01d1
;;; rmailout.el ends here
diff --git a/lisp/mail/rmailsort.el b/lisp/mail/rmailsort.el
index 44204a4b91..38e24295e8 100644
--- a/lisp/mail/rmailsort.el
+++ b/lisp/mail/rmailsort.el
@@ -255,5 +255,4 @@ Numeric keys are sorted numerically, all others as strings."
;; generated-autoload-file: "rmail.el"
;; End:
-;; arch-tag: 665da245-f6a7-4115-ad8c-ba19216988d5
;;; rmailsort.el ends here
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 73e009ea69..3c45c4d791 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -1847,5 +1847,4 @@ the summary is only showing a subset of messages."
;; generated-autoload-file: "rmail.el"
;; End:
-;; arch-tag: 80b0a27a-a50d-4f37-9466-83d32d1e0ca8
;;; rmailsum.el ends here
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index e37c7a0149..e73897e61c 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -1997,5 +1997,4 @@ version at point."
(provide 'supercite)
(run-hooks 'sc-load-hook)
-;; arch-tag: a5d5bfa6-3bd5-4414-8c65-0afc83e45cd3
;;; supercite.el ends here
diff --git a/lisp/mail/uce.el b/lisp/mail/uce.el
index e71dd9cea2..d322ccaaf8 100644
--- a/lisp/mail/uce.el
+++ b/lisp/mail/uce.el
@@ -375,5 +375,4 @@ You might need to set `uce-mail-reader' before using this."
(provide 'uce)
-;; arch-tag: 44b68c87-9b29-47bd-822c-3feee3883221
;;; uce.el ends here
diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el
index 0403c4afc6..3818b6aa45 100644
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -329,5 +329,4 @@ following the containing message."
;; generated-autoload-file: "rmail.el"
;; End:
-;; arch-tag: 3a28b9fb-c1f5-43ef-9278-285f3e4b874d
;;; undigest.el ends here
diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index 4aa727f9f5..f358968a26 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -245,5 +245,4 @@ For example, invoke `emacs -batch -f batch-unrmail RMAIL'."
(provide 'unrmail)
-;; arch-tag: 14c6290d-60b2-456f-8909-5c2387de6acb
;;; unrmail.el ends here
diff --git a/lisp/makesum.el b/lisp/makesum.el
index f4b647eed3..34bac36913 100644
--- a/lisp/makesum.el
+++ b/lisp/makesum.el
@@ -1,7 +1,7 @@
;;; makesum.el --- generate key binding summary for Emacs
-;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010, 2011 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: help
diff --git a/lisp/man.el b/lisp/man.el
index eb21cb2e83..d22ea9cebb 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -1721,5 +1721,4 @@ Uses `Man-name-local-regexp'."
(provide 'man)
-;; arch-tag: 587cda76-8e23-4594-b1f3-89b6b09a0d47
;;; man.el ends here
diff --git a/lisp/master.el b/lisp/master.el
index 7b5ed66f74..edd24d1d92 100644
--- a/lisp/master.el
+++ b/lisp/master.el
@@ -159,5 +159,4 @@ See `recenter'."
(provide 'master)
-;; arch-tag: dca08daa-8127-45ae-b77e-b135160dce98
;;; master.el ends here
diff --git a/lisp/mb-depth.el b/lisp/mb-depth.el
index 80847609d0..19b92daff8 100644
--- a/lisp/mb-depth.el
+++ b/lisp/mb-depth.el
@@ -72,5 +72,4 @@ Returns non-nil if the new state is enabled."
(provide 'mb-depth)
-;; arch-tag: 50224089-5bf5-46f8-803d-18f018c5eacf
;;; mb-depth.el ends here
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index b6e4dad2c7..e4250cbb79 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -3297,4 +3297,3 @@
;; add-log-time-zone-rule: t
;; End:
-;;; arch-tag: 87324964-69b6-4925-a3c2-9c1df53d7d51
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index 2e5cc15c27..f4fa462fe2 100644
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -11400,7 +11400,8 @@
(dist): Leave release in current directory.
- Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+ Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el
index a53ae4a3ed..d66cd4846c 100644
--- a/lisp/mh-e/mh-acros.el
+++ b/lisp/mh-e/mh-acros.el
@@ -327,5 +327,4 @@ MH-E functions."
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: b383b49a-494f-4ed0-a30a-cb6d5d2da4ff
;;; mh-acros.el ends here
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el
index d0917386f1..e141d865bf 100644
--- a/lisp/mh-e/mh-alias.el
+++ b/lisp/mh-e/mh-alias.el
@@ -670,5 +670,4 @@ show buffer, the message in the show buffer doesn't match."
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: 49879e46-5aa3-4569-bece-e5a58731d690
;;; mh-alias.el ends here
diff --git a/lisp/mh-e/mh-buffers.el b/lisp/mh-e/mh-buffers.el
index d8666f6f8c..ca06cc9f51 100644
--- a/lisp/mh-e/mh-buffers.el
+++ b/lisp/mh-e/mh-buffers.el
@@ -83,5 +83,4 @@ The function returns the size of the final size of the log buffer."
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: 812e9f29-78b8-4e73-ada9-aa61dc1ceecb
;;; mh-buffers.el ends here
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index c4cfe5ca91..234493c9c5 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -1113,5 +1113,4 @@ doesn't exist there."
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: 62865511-e610-4923-b0b5-f45a8ab70a34
;;; mh-comp.el ends here
diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el
index 0ecd9ac671..303a5c7c9d 100644
--- a/lisp/mh-e/mh-compat.el
+++ b/lisp/mh-e/mh-compat.el
@@ -315,5 +315,4 @@ XEmacs."
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: 577b0eab-a5cd-45e1-8d9f-c1a426f4d73c
;;; mh-compat.el ends here
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 0054cd2205..0bf73dc0a5 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -3727,5 +3727,4 @@ The background and foreground are used in the image."
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: cce884de-bd37-4104-9963-e4439d5ed22b
;;; mh-e.el ends here
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index b225474a03..01b442fc8f 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -1974,5 +1974,4 @@ If MSG is nil then act on the message at point"
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: aa97b758-d4f6-4c86-bc5a-1950921da1e7
;;; mh-folder.el ends here
diff --git a/lisp/mh-e/mh-funcs.el b/lisp/mh-e/mh-funcs.el
index 188ac2d86d..4f471dfe21 100644
--- a/lisp/mh-e/mh-funcs.el
+++ b/lisp/mh-e/mh-funcs.el
@@ -372,5 +372,4 @@ See `mh-store-msg' for a description of DIRECTORY."
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: 1936c4f1-4843-438e-bc4b-a63bb75a7762
;;; mh-funcs.el ends here
diff --git a/lisp/mh-e/mh-gnus.el b/lisp/mh-e/mh-gnus.el
index 23c2b038b4..ee72ba8bac 100644
--- a/lisp/mh-e/mh-gnus.el
+++ b/lisp/mh-e/mh-gnus.el
@@ -177,5 +177,4 @@ PROMPT overrides the default one used to ask user for a file name."
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: 1e3638af-cad3-4c69-8427-bc8eb6e5e4fa
;;; mh-gnus.el ends here
diff --git a/lisp/mh-e/mh-identity.el b/lisp/mh-e/mh-identity.el
index 1590feaabf..98683d9d2e 100644
--- a/lisp/mh-e/mh-identity.el
+++ b/lisp/mh-e/mh-identity.el
@@ -304,5 +304,4 @@ the header."
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: 07d66ef6-8726-4ac6-9ecf-e566cd5bfb45
;;; mh-identity.el ends here
diff --git a/lisp/mh-e/mh-inc.el b/lisp/mh-e/mh-inc.el
index 6e3cff212e..f1f54ed018 100644
--- a/lisp/mh-e/mh-inc.el
+++ b/lisp/mh-e/mh-inc.el
@@ -90,5 +90,4 @@
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: 3713cf2a-6082-4cb4-8ce2-99d9acaba835
;;; mh-inc.el ends here
diff --git a/lisp/mh-e/mh-junk.el b/lisp/mh-e/mh-junk.el
index deb1c339a1..8b62160b96 100644
--- a/lisp/mh-e/mh-junk.el
+++ b/lisp/mh-e/mh-junk.el
@@ -467,5 +467,4 @@ See `mh-spamprobe-blacklist' for more information."
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: 603335f1-77ff-4306-8828-5d3dad51abe1
;;; mh-junk.el ends here
diff --git a/lisp/mh-e/mh-letter.el b/lisp/mh-e/mh-letter.el
index 74635663b6..babcae8ff8 100644
--- a/lisp/mh-e/mh-letter.el
+++ b/lisp/mh-e/mh-letter.el
@@ -960,5 +960,4 @@ Otherwise, simply insert MH-INS-STRING before each line."
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: 0548632c-aadb-4e3b-bb80-bbd62ff90bf3
;;; mh-letter.el ends here
diff --git a/lisp/mh-e/mh-limit.el b/lisp/mh-e/mh-limit.el
index 62606211bf..c196d3d3fe 100644
--- a/lisp/mh-e/mh-limit.el
+++ b/lisp/mh-e/mh-limit.el
@@ -334,5 +334,4 @@ The MH command pick is used to do the match."
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: b0d24378-1234-4c42-aa3f-7abad25b40a1
;;; mh-limit.el ends here
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index de90062da4..c9f0a2641f 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -1,8 +1,7 @@
;;; mh-mime.el --- MH-E MIME support
-;; Copyright (C) 1993, 1995,
-;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Bill Wohler <wohler@newt.com>
;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-print.el b/lisp/mh-e/mh-print.el
index bc73c32e0f..583a1e50f9 100644
--- a/lisp/mh-e/mh-print.el
+++ b/lisp/mh-e/mh-print.el
@@ -248,5 +248,4 @@ Consider using \\[mh-ps-print-msg] instead."
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: 8d84d50b-2a49-4d0d-b51e-ba9c9b6fc679
;;; mh-print.el ends here
diff --git a/lisp/mh-e/mh-scan.el b/lisp/mh-e/mh-scan.el
index 8f9bcd53cd..31017fc61e 100644
--- a/lisp/mh-e/mh-scan.el
+++ b/lisp/mh-e/mh-scan.el
@@ -485,5 +485,4 @@ comes after that."
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: 5ab35d46-101e-443b-a2b6-5a908cf97528
;;; mh-scan.el ends here
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index 1c60a1a41e..49a48304b8 100644
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -1931,5 +1931,4 @@ folder buffer."
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: 607762ad-0dff-4fe1-a27e-6c0dde0dcc47
;;; mh-search ends here
diff --git a/lisp/mh-e/mh-seq.el b/lisp/mh-e/mh-seq.el
index 422c01f0a7..027a896ca8 100644
--- a/lisp/mh-e/mh-seq.el
+++ b/lisp/mh-e/mh-seq.el
@@ -1,8 +1,7 @@
;;; mh-seq.el --- MH-E sequences support
-;; Copyright (C) 1993, 1995,
-;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Bill Wohler <wohler@newt.com>
;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-show.el b/lisp/mh-e/mh-show.el
index 1c2d7850d4..7e123a84cb 100644
--- a/lisp/mh-e/mh-show.el
+++ b/lisp/mh-e/mh-show.el
@@ -917,5 +917,4 @@ See also `mh-folder-mode'.
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: 8607a80a-9b5c-43a7-a25d-d7e4a848c25b
;;; mh-show.el ends here
diff --git a/lisp/mh-e/mh-speed.el b/lisp/mh-e/mh-speed.el
index 8782671c95..334b4111dd 100644
--- a/lisp/mh-e/mh-speed.el
+++ b/lisp/mh-e/mh-speed.el
@@ -581,5 +581,4 @@ The function invalidates the latest ancestor that is present."
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: d38ddcd4-3c00-4e37-99bf-8b89dda7b32c
;;; mh-speed.el ends here
diff --git a/lisp/mh-e/mh-thread.el b/lisp/mh-e/mh-thread.el
index f172d45013..13a64a9ff4 100644
--- a/lisp/mh-e/mh-thread.el
+++ b/lisp/mh-e/mh-thread.el
@@ -880,5 +880,4 @@ This function can only be used the folder is threaded."
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: b10e62f5-f028-4e04-873e-89d0e069b3d5
;;; mh-thread.el ends here
diff --git a/lisp/mh-e/mh-tool-bar.el b/lisp/mh-e/mh-tool-bar.el
index f51c97e4e6..8b78cbc8b1 100644
--- a/lisp/mh-e/mh-tool-bar.el
+++ b/lisp/mh-e/mh-tool-bar.el
@@ -465,5 +465,4 @@ This button runs `mh-widen'"))
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: 28c2436d-bb8d-486a-a8d7-5a4d9cae3513
;;; mh-tool-bar.el ends here
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index 2ac6d2faad..01780bed18 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -1013,5 +1013,4 @@ If the current line is too long truncate a part of it as well."
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: 1af39fdf-f66f-4b06-9b48-18a7656c8e36
;;; mh-utils.el ends here
diff --git a/lisp/mh-e/mh-xface.el b/lisp/mh-e/mh-xface.el
index 5229f95f5d..3d4557642e 100644
--- a/lisp/mh-e/mh-xface.el
+++ b/lisp/mh-e/mh-xface.el
@@ -471,5 +471,4 @@ The argument CHANGE is ignored."
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: a79dd33f-d0e5-4b19-a53a-be690f90229a
;;; mh-xface.el ends here
diff --git a/lisp/midnight.el b/lisp/midnight.el
index b4b0528677..f5d7c5b446 100644
--- a/lisp/midnight.el
+++ b/lisp/midnight.el
@@ -234,5 +234,4 @@ first argument to `run-at-time'."
(provide 'midnight)
-;; arch-tag: a5979be9-2890-46a3-ba84-791f0a4a6e80
;;; midnight.el ends here
diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el
index 50e90c1e06..115a861050 100644
--- a/lisp/minibuf-eldef.el
+++ b/lisp/minibuf-eldef.el
@@ -156,5 +156,4 @@ Returns non-nil if the new state is enabled."
(provide 'minibuf-eldef)
-;; arch-tag: 7e421fae-c275-4729-b0da-7836af377d3d
;;; minibuf-eldef.el ends here
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 284cbdc218..a1e20257b2 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -2320,5 +2320,4 @@ filter out additional entries (because TABLE migth not obey PRED)."
(provide 'minibuffer)
-;; arch-tag: ef8a0a15-1080-4790-a754-04017c02f08f
;;; minibuffer.el ends here
diff --git a/lisp/misc.el b/lisp/misc.el
index daba21153f..8d05f59215 100644
--- a/lisp/misc.el
+++ b/lisp/misc.el
@@ -1,7 +1,7 @@
;;; misc.el --- some nonstandard basic editing commands for Emacs
-;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005,
-;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010, 2011 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: convenience
diff --git a/lisp/misearch.el b/lisp/misearch.el
index 5d4d3ef49c..7800f5f64b 100644
--- a/lisp/misearch.el
+++ b/lisp/misearch.el
@@ -378,5 +378,4 @@ whose file names match the specified wildcard."
(provide 'multi-isearch)
-;; arch-tag: a6d38ffa-4d14-4e39-8ac6-46af9d6a6773
;;; misearch.el ends here
diff --git a/lisp/mouse-copy.el b/lisp/mouse-copy.el
index f600a849ce..2b3b23904c 100644
--- a/lisp/mouse-copy.el
+++ b/lisp/mouse-copy.el
@@ -222,5 +222,4 @@ by johnh@ficus.cs.ucla.edu."
(provide 'mouse-copy)
-;; arch-tag: 3d50293b-c089-4273-b412-4fc96a5f26ff
;;; mouse-copy.el ends here
diff --git a/lisp/mouse-drag.el b/lisp/mouse-drag.el
index cf15d6b9e5..51f4612d68 100644
--- a/lisp/mouse-drag.el
+++ b/lisp/mouse-drag.el
@@ -1,7 +1,7 @@
;;; mouse-drag.el --- use mouse-2 to do a new style of scrolling
-;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: John Heidemann <johnh@ISI.EDU>
;; Keywords: mouse
diff --git a/lisp/mpc.el b/lisp/mpc.el
index c5dcd33ccf..56b6fed871 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -2611,5 +2611,4 @@ This is used so that they can be compared with `eq', which is needed for
(provide 'mpc)
-;; arch-tag: 4794b2f5-59e6-4f26-b695-650b3e002f37
;;; mpc.el ends here
diff --git a/lisp/msb.el b/lisp/msb.el
index 0e7a20fd33..55d15e4d8b 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -1154,5 +1154,4 @@ different buffer menu using the function `msb'."
(provide 'msb)
(eval-after-load "msb" '(run-hooks 'msb-after-load-hook 'msb-after-load-hooks))
-;; arch-tag: 403f9e82-b92e-4e7a-a797-5d6d9b76da36
;;; msb.el ends here
diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index d16c20cd58..1be3b2ee53 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -285,5 +285,4 @@ Return non-nil if the new state is enabled."
(provide 'mwheel)
-;; arch-tag: 50ed00e7-3686-4b7a-8037-fb31aa5c237f
;;; mwheel.el ends here
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index bcf1a506f7..d22fdd4913 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -1,7 +1,8 @@
;;; browse-url.el --- pass a URL to a WWW browser
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Denis Howe <dbh@doc.ic.ac.uk>
;; Maintainer: FSF
diff --git a/lisp/net/eudc-bob.el b/lisp/net/eudc-bob.el
index 0f6aae3961..70fae8864f 100644
--- a/lisp/net/eudc-bob.el
+++ b/lisp/net/eudc-bob.el
@@ -366,5 +366,4 @@ display a button."
"Display a button for the JPEG DATA."
(eudc-bob-display-jpeg data nil))
-;; arch-tag: 8f1853df-c9b6-4c5a-bdb1-d94dbd651fb3
;;; eudc-bob.el ends here
diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el
index f5d4311fce..49afea8f41 100644
--- a/lisp/net/eudc-export.el
+++ b/lisp/net/eudc-export.el
@@ -220,5 +220,4 @@ This function can only be called from a directory query result buffer."
(overlay-get (car (overlays-at (point))) 'eudc-record)
(eudc-insert-record-at-point-into-bbdb)))
-;; arch-tag: 8cbda7dc-3163-47e6-921c-6ec5083df2d7
;;; eudc-export.el ends here
diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el
index 7cfb7a159e..b37fb174a7 100644
--- a/lisp/net/eudc-hotlist.el
+++ b/lisp/net/eudc-hotlist.el
@@ -194,5 +194,4 @@ These are the special commands of this mode:
""
eudc-hotlist-menu))
-;; arch-tag: 9b633ab3-6a6e-4b46-b12e-d96739a7e0e8
;;; eudc-hotlist.el ends here
diff --git a/lisp/net/eudc-vars.el b/lisp/net/eudc-vars.el
index 54c7ae074c..72ead8f2db 100644
--- a/lisp/net/eudc-vars.el
+++ b/lisp/net/eudc-vars.el
@@ -1,7 +1,7 @@
;;; eudc-vars.el --- Emacs Unified Directory Client
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Oscar Figueiredo <oscar@cpe.fr>
;; Maintainer: Pavel Janík <Pavel@Janik.cz>
@@ -406,5 +406,4 @@ Otherwise records must match queries exactly."
(provide 'eudc-vars)
-;; arch-tag: 80050575-b838-4246-8ebc-b2d7c5a2e482
;;; eudc-vars.el ends here
diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el
index 0b50f51617..cdfd02b3f6 100644
--- a/lisp/net/eudcb-bbdb.el
+++ b/lisp/net/eudcb-bbdb.el
@@ -243,5 +243,4 @@ RETURN-ATTRS is a list of attributes to return, defaulting to
(provide 'eudcb-bbdb)
-;; arch-tag: 38276208-75de-4dbc-ba6f-8db684c32e0a
;;; eudcb-bbdb.el ends here
diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el
index 192f0f4600..8e2af6ba6b 100644
--- a/lisp/net/eudcb-ldap.el
+++ b/lisp/net/eudcb-ldap.el
@@ -208,5 +208,4 @@ attribute names are returned. Default to `person'"
(provide 'eudcb-ldap)
-;; arch-tag: 0f254dc0-7378-4fd4-ae26-18666184e96b
;;; eudcb-ldap.el ends here
diff --git a/lisp/net/eudcb-mab.el b/lisp/net/eudcb-mab.el
index 4d34bfde9d..9163aac13f 100644
--- a/lisp/net/eudcb-mab.el
+++ b/lisp/net/eudcb-mab.el
@@ -130,5 +130,4 @@ RETURN-ATTRS is a list of attributes to return, defaulting to
(provide 'eudcb-mab)
-;; arch-tag: 4bef8e65-f109-47c7-91b9-8a6ea3ed7bb1
;;; eudcb-mab.el ends here
diff --git a/lisp/net/eudcb-ph.el b/lisp/net/eudcb-ph.el
index 794fcdfb5f..4a6cbef92f 100644
--- a/lisp/net/eudcb-ph.el
+++ b/lisp/net/eudcb-ph.el
@@ -241,5 +241,4 @@ depending on RETURN-RESPONSE."
(provide 'eudcb-ph)
-;; arch-tag: 4365bbf5-af20-453e-b5b6-2e7118ebfcdb
;;; eudcb-ph.el ends here
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index e49af2948e..657925cb54 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -1,6 +1,6 @@
;;; gnutls.el --- Support SSL/TLS connections through GnuTLS
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Ted Zlatanov <tzz@lifelogs.com>
;; Keywords: comm, tls, ssl, encryption
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index 3bcf985052..96df47f2fe 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -302,5 +302,4 @@ Also fontifies the buffer appropriately (see `goto-address-fontify-p' and
(provide 'goto-addr)
-;; arch-tag: ca47c505-5661-425d-a471-62bc6e75cf0a
;;; goto-addr.el ends here
diff --git a/lisp/net/imap-hash.el b/lisp/net/imap-hash.el
index ebc90632ca..3460389dc1 100644
--- a/lisp/net/imap-hash.el
+++ b/lisp/net/imap-hash.el
@@ -371,4 +371,3 @@ Get only the headers if HEADERS-ONLY is not nil."
;;; (imap-hash-fetch iht nil 1 2 3)
;;; (imap-hash-fetch iht t 1 2 3)
-;; arch-tag: 071410ac-91dc-4e36-b892-18e057d639c5
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 88284af06f..0de4c7f32d 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -557,7 +557,8 @@ an alist of attribute/value pairs."
(not (equal "" sizelimit)))
(setq arglist (nconc arglist (list (format "-z%s" sizelimit)))))
(apply #'call-process ldap-ldapsearch-prog
- nil buf nil
+ ;; Ignore stderr, which can corrupt results
+ nil (list buf nil) nil
(append arglist ldap-ldapsearch-args filter))
(insert "\n")
(goto-char (point-min))
diff --git a/lisp/net/mairix.el b/lisp/net/mairix.el
index 2655c4feb7..e145bd2274 100644
--- a/lisp/net/mairix.el
+++ b/lisp/net/mairix.el
@@ -946,4 +946,3 @@ Use cursor keys or C-n,C-p to select next/previous search.\n\n")
;;; mairix.el ends here
-;; arch-tag: 787ab678-fcd5-4c50-9295-01c2ee5124a6
diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el
index 95e87e8c68..79bede155a 100644
--- a/lisp/net/newst-backend.el
+++ b/lisp/net/newst-backend.el
@@ -2353,5 +2353,4 @@ This function is suited for adding it to `newsticker-new-item-functions'."
(provide 'newst-backend)
-;; arch-tag: 0e37b658-56e9-49ab-90f9-f2df57e1a659
;;; newst-backend.el ends here
diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el
index 987c9f0413..d37d38f955 100644
--- a/lisp/net/newst-plainview.el
+++ b/lisp/net/newst-plainview.el
@@ -1800,5 +1800,4 @@ Take care: end of item is at the end of its last line!"
(provide 'newst-plainview)
-;; arch-tag: 4e48b683-d48b-48dd-a13e-fe45baf41184
;;; newst-plainview.el ends here
diff --git a/lisp/net/newst-reader.el b/lisp/net/newst-reader.el
index 92766cb0a4..7f5c36aa83 100644
--- a/lisp/net/newst-reader.el
+++ b/lisp/net/newst-reader.el
@@ -1181,5 +1181,4 @@ static char * visit_xpm[] = {
(provide 'newst-reader)
-;; arch-tag: c604b701-bdf1-4fc1-8d05-5fabd1939533
;;; newst-reader.el ends here
diff --git a/lisp/net/newst-ticker.el b/lisp/net/newst-ticker.el
index 6a9e12b8e5..1a5aff876c 100644
--- a/lisp/net/newst-ticker.el
+++ b/lisp/net/newst-ticker.el
@@ -290,5 +290,4 @@ running already."
(provide 'newst-ticker)
-;; arch-tag: faee3ebb-749b-4935-9835-7f36d4b700f0
;;; newst-ticker.el ends here
diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el
index 3552107a37..955ed78c1d 100644
--- a/lisp/net/newst-treeview.el
+++ b/lisp/net/newst-treeview.el
@@ -2076,5 +2076,4 @@ POS gives the position where EVENT occurred."
(provide 'newst-treeview)
-;; arch-tag: 5dbaff48-1f3e-4fc6-8ebd-e966fc90d2d4
;;; newst-treeview.el ends here
diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el
index c8ad9a3227..0e807cca30 100644
--- a/lisp/net/newsticker.el
+++ b/lisp/net/newsticker.el
@@ -409,5 +409,4 @@
(provide 'newsticker)
-;; arch-tag: ab761dfa-67bc-4207-bc64-4307271dc381
;;; newsticker.el ends here
diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el
index 2312f7a237..f1ad2fd459 100644
--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@@ -1,7 +1,7 @@
;;; quickurl.el --- insert an URL based on text at point in buffer
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Dave Pearson <davep@davep.org>
;; Maintainer: Dave Pearson <davep@davep.org>
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 964f9c44cc..6481f627d9 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -2852,5 +2852,4 @@ Passwords are stored in `rcirc-authinfo' (which see)."
(provide 'rcirc)
-;; arch-tag: b471b7e8-6b5a-4399-b2c6-a3c78dfc8ffb
;;; rcirc.el ends here
diff --git a/lisp/net/rcompile.el b/lisp/net/rcompile.el
index bd98ab6dd3..86998fd433 100644
--- a/lisp/net/rcompile.el
+++ b/lisp/net/rcompile.el
@@ -1,7 +1,7 @@
;;; rcompile.el --- run a compilation on a remote machine
-;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Albert <alon@milcse.rtsg.mot.com>
;; Maintainer: FSF
@@ -178,5 +178,4 @@ See \\[compile]."
remote-compile-host
""))))))
-;; arch-tag: 2866a132-ece4-4ce9-9f91-ec147f803f73
;;; rcompile.el ends here
diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el
index 42b671fac6..4cd366e1d6 100644
--- a/lisp/net/rlogin.el
+++ b/lisp/net/rlogin.el
@@ -1,7 +1,8 @@
;;; rlogin.el --- remote login interface
;; Copyright (C) 1992, 1993, 1994, 1995, 1997, 1998, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Noah Friedman
;; Maintainer: Noah Friedman <friedman@splode.com>
@@ -318,5 +319,4 @@ Delete ARG characters forward, or send a C-d to process if at end of buffer."
(provide 'rlogin)
-;; arch-tag: 6e20eabf-feda-40fa-ab40-0d156db447e4
;;; rlogin.el ends here
diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el
index 3337641802..8da3c5bc69 100644
--- a/lisp/net/secrets.el
+++ b/lisp/net/secrets.el
@@ -1,6 +1,6 @@
;;; secrets.el --- Client interface to gnome-keyring and kwallet.
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Michael Albinus <michael.albinus@gmx.de>
;; Keywords: comm password passphrase
diff --git a/lisp/net/snmp-mode.el b/lisp/net/snmp-mode.el
index 111fb4ea2f..3229aa74f9 100644
--- a/lisp/net/snmp-mode.el
+++ b/lisp/net/snmp-mode.el
@@ -694,5 +694,4 @@ controls whether case is significant."
(provide 'snmp-mode)
-;; arch-tag: eb6cc0f9-1e47-4023-8625-bc9aae6c3527
;;; snmp-mode.el ends here
diff --git a/lisp/net/socks.el b/lisp/net/socks.el
index 420d9d1977..df4ffb7324 100644
--- a/lisp/net/socks.el
+++ b/lisp/net/socks.el
@@ -646,5 +646,4 @@ version.")
(provide 'socks)
-;; arch-tag: 67aef0d9-f4f7-4056-89c3-b4c9bf93ce7f
;;; socks.el ends here
diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el
index 5403e3b335..bc3621c199 100644
--- a/lisp/net/telnet.el
+++ b/lisp/net/telnet.el
@@ -263,5 +263,4 @@ Normally input is edited in Emacs and sent a line at a time."
(provide 'telnet)
-;; arch-tag: 98218821-d04a-48b6-9058-57d0d4677a56
;;; telnet.el ends here
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index ae7deeeb95..dcb7dc9237 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -1,7 +1,7 @@
;;; tramp-sh.el --- Tramp access functions for (s)sh-like connections
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; (copyright statements below in code to be updated with the above notice)
@@ -761,7 +761,7 @@ on the remote host.")
(defconst tramp-perl-encode
"%s -e '
# This script contributed by Juanma Barranquero <lektu@terra.es>.
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
use strict;
@@ -803,7 +803,7 @@ This string is passed to `format', so percent characters need to be doubled.")
(defconst tramp-perl-decode
"%s -e '
# This script contributed by Juanma Barranquero <lektu@terra.es>.
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
# Free Software Foundation, Inc.
use strict;
@@ -4065,9 +4065,17 @@ Goes through the list `tramp-inline-compress-commands'."
vec 5
"Checking local compress command `%s', `%s' for sanity"
compress decompress)
- (unless (zerop (tramp-call-local-coding-command
- (format "echo %s | %s | %s"
- magic compress decompress) nil nil))
+ (unless
+ (zerop
+ (tramp-call-local-coding-command
+ (format
+ ;; Windows shells need the program file name after
+ ;; the pipe symbol be quoted if they use forward
+ ;; slashes as directory separators.
+ (if (memq system-type '(windows-nt))
+ "echo %s | \"%s\" | \"%s\""
+ "echo %s | %s | %s")
+ magic compress decompress) nil nil))
(throw 'next nil))
(tramp-message
vec 5
@@ -4961,9 +4969,25 @@ function cell is returned to be applied on a buffer."
((symbolp coding)
coding)
((and compress (string-match "decoding" prop))
- (format "(%s | %s >%%s)" coding compress))
+ (format
+ ;; Windows shells need the program file name after
+ ;; the pipe symbol be quoted if they use forward
+ ;; slashes as directory separators.
+ (if (and (string-match "local" prop)
+ (memq system-type '(windows-nt)))
+ "(%s | \"%s\" >%%s)"
+ "(%s | %s >%%s)")
+ coding compress))
(compress
- (format "(%s <%%s | %s)" compress coding))
+ (format
+ ;; Windows shells need the program file name after
+ ;; the pipe symbol be quoted if they use forward
+ ;; slashes as directory separators.
+ (if (and (string-match "local" prop)
+ (memq system-type '(windows-nt)))
+ "(%s <%%s | \"%s\")"
+ "(%s <%%s | %s)")
+ compress coding))
((string-match "decoding" prop)
(format "%s >%%s" coding))
(t
diff --git a/lisp/net/tramp-uu.el b/lisp/net/tramp-uu.el
index 89947ae761..b4af01cec4 100644
--- a/lisp/net/tramp-uu.el
+++ b/lisp/net/tramp-uu.el
@@ -94,7 +94,6 @@
(provide 'tramp-uu)
-;; arch-tag: 7153f2c6-8be5-4cd2-8c06-0fbcf5190ef6
;;; tramp-uu.el ends here
;; Local Variables:
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index cd9ef314ac..ef312af80b 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1,7 +1,7 @@
;;; tramp.el --- Transparent Remote Access, Multiple Protocol
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Kai Großjohann <kai.grossjohann@gmx.net>
;; Michael Albinus <michael.albinus@gmx.de>
@@ -291,8 +291,11 @@ shouldn't return t when it isn't."
;; password caching. "scpc" is chosen if we detect that the user is
;; running OpenSSH 4.0 or newer.
(cond
- ;; PuTTY is installed.
- ((executable-find "pscp")
+ ;; PuTTY is installed. We don't take it, if it is installed on a
+ ;; non-windows system, or pscp from the pssh (parallel ssh) package
+ ;; is found.
+ ((and (eq system-type 'windows-nt)
+ (executable-find "pscp"))
(if (or (fboundp 'password-read)
(fboundp 'auth-source-user-or-password)
;; Pageant is running.
diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el
index 51c2a682d2..c34d70d489 100644
--- a/lisp/net/webjump.el
+++ b/lisp/net/webjump.el
@@ -480,5 +480,4 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke
(provide 'webjump)
-;; arch-tag: f1d20156-0a6f-488b-bd91-f69ee8b6d5cc
;;; webjump.el ends here
diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el
index 234a89393a..a078284f02 100644
--- a/lisp/net/xesam.el
+++ b/lisp/net/xesam.el
@@ -918,5 +918,4 @@ Example:
;; yahoo, ebay, ...
;; - Construct complex queries via widgets, like in mairix.el.
-;; arch-tag: 7fb9fc6c-c2ff-4bc7-bb42-bacb80cce2b2
;;; xesam.el ends here
diff --git a/lisp/net/zeroconf.el b/lisp/net/zeroconf.el
index 40ceb5b149..b36330342f 100644
--- a/lisp/net/zeroconf.el
+++ b/lisp/net/zeroconf.el
@@ -686,5 +686,4 @@ For the description of arguments, see `zeroconf-resolved-services-hash'."
(provide 'zeroconf)
-;; arch-tag: ea578165-7fa8-44f4-90f0-de3940aec69f
;;; zeroconf.el ends here
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 6e2955c660..7511c682f7 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -1390,5 +1390,4 @@ unless optional argument SOFT is non-nil."
(provide 'newcomment)
-;; arch-tag: 01e3320a-00c8-44ea-a696-8f8e7354c858
;;; newcomment.el ends here
diff --git a/lisp/notifications.el b/lisp/notifications.el
index dc4904db4c..9f86704b77 100644
--- a/lisp/notifications.el
+++ b/lisp/notifications.el
@@ -1,6 +1,6 @@
;;; notifications.el --- Client interface to desktop notifications.
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Julien Danjou <julien@danjou.info>
;; Keywords: comm desktop notifications
diff --git a/lisp/nxml/nxml-enc.el b/lisp/nxml/nxml-enc.el
index 0a0d70f31b..96af778eed 100644
--- a/lisp/nxml/nxml-enc.el
+++ b/lisp/nxml/nxml-enc.el
@@ -146,5 +146,4 @@ Applied to any files that `auto-mode-alist' says should be handled by
(provide 'nxml-enc)
-;; arch-tag: c2436247-78f3-418c-8069-85dc5335d083
;;; nxml-enc.el ends here
diff --git a/lisp/nxml/nxml-glyph.el b/lisp/nxml/nxml-glyph.el
index 9d7e5136e4..bfd4c3565d 100644
--- a/lisp/nxml/nxml-glyph.el
+++ b/lisp/nxml/nxml-glyph.el
@@ -415,5 +415,4 @@ Return nil if the face cannot display a glyph for N."
(provide 'nxml-glyph)
-;; arch-tag: 50985104-27c6-4241-8625-b11aa5685633
;;; nxml-glyph.el ends here
diff --git a/lisp/nxml/nxml-maint.el b/lisp/nxml/nxml-maint.el
index ae828cf335..f5feed7a8d 100644
--- a/lisp/nxml/nxml-maint.el
+++ b/lisp/nxml/nxml-maint.el
@@ -1,6 +1,7 @@
;;; nxml-maint.el --- commands for maintainers of nxml-*.el
-;; Copyright (C) 2003, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: James Clark
;; Keywords: XML
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 17561eb7e7..79b16acc7b 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -1,6 +1,7 @@
;;; nxml-mode.el --- a new XML mode
-;; Copyright (C) 2003, 2004, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: James Clark
;; Keywords: XML
diff --git a/lisp/nxml/nxml-ns.el b/lisp/nxml/nxml-ns.el
index 4bb68a5504..c6e8456a89 100644
--- a/lisp/nxml/nxml-ns.el
+++ b/lisp/nxml/nxml-ns.el
@@ -145,5 +145,4 @@ NS is a symbol or nil."
(provide 'nxml-ns)
-;; arch-tag: 5968e4b7-fb37-46ce-8621-c65db9793028
;;; nxml-ns.el ends here
diff --git a/lisp/nxml/nxml-outln.el b/lisp/nxml/nxml-outln.el
index 8416d698e1..5c0d1acb8d 100644
--- a/lisp/nxml/nxml-outln.el
+++ b/lisp/nxml/nxml-outln.el
@@ -1,6 +1,7 @@
;;; nxml-outln.el --- outline support for nXML mode
-;; Copyright (C) 2004, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: James Clark
;; Keywords: XML
diff --git a/lisp/nxml/nxml-parse.el b/lisp/nxml/nxml-parse.el
index 3566331284..72e053c5cb 100644
--- a/lisp/nxml/nxml-parse.el
+++ b/lisp/nxml/nxml-parse.el
@@ -315,5 +315,4 @@ same way as well-formedness error."
(provide 'nxml-parse)
-;; arch-tag: fc19639b-1bff-4673-9992-f539da89ba1e
;;; nxml-parse.el ends here
diff --git a/lisp/nxml/nxml-rap.el b/lisp/nxml/nxml-rap.el
index 5816b5a398..b7b05ab43f 100644
--- a/lisp/nxml/nxml-rap.el
+++ b/lisp/nxml/nxml-rap.el
@@ -482,5 +482,4 @@ expected `%s'"
(provide 'nxml-rap)
-;; arch-tag: cba241ec-4c59-4ef3-aa51-2cf92b3dd24f
;;; nxml-rap.el ends here
diff --git a/lisp/nxml/nxml-uchnm.el b/lisp/nxml/nxml-uchnm.el
index 418ff917a4..530a71dc95 100644
--- a/lisp/nxml/nxml-uchnm.el
+++ b/lisp/nxml/nxml-uchnm.el
@@ -248,5 +248,4 @@ the variable `nxml-enabled-unicode-blocks'."
(provide 'nxml-uchnm)
-;; arch-tag: 440248c3-b604-467c-8b50-e83662c659a3
;;; nxml-uchnm.el ends here
diff --git a/lisp/nxml/nxml-util.el b/lisp/nxml/nxml-util.el
index e764d59fad..770f09a603 100644
--- a/lisp/nxml/nxml-util.el
+++ b/lisp/nxml/nxml-util.el
@@ -132,5 +132,4 @@ modifications to the buffer."
(provide 'nxml-util)
-;; arch-tag: 7d3b3af4-de2b-4410-bf67-94d64824324b
;;; nxml-util.el ends here
diff --git a/lisp/nxml/rng-cmpct.el b/lisp/nxml/rng-cmpct.el
index 36db724d7f..65ab323df2 100644
--- a/lisp/nxml/rng-cmpct.el
+++ b/lisp/nxml/rng-cmpct.el
@@ -938,4 +938,3 @@ Current token after parse is token following ]."
;;; rng-cmpct.el
-;; arch-tag: 90395eb1-283b-4146-bbc1-6d6ef1704e57
diff --git a/lisp/nxml/rng-dt.el b/lisp/nxml/rng-dt.el
index 35f55b5d9d..25abeb0048 100644
--- a/lisp/nxml/rng-dt.el
+++ b/lisp/nxml/rng-dt.el
@@ -61,5 +61,4 @@ a datatype library.")
(provide 'rng-dt)
-;; arch-tag: 1dca90f1-8dae-4dd4-b61f-fade4452c014
;;; rng-dt.el ends here
diff --git a/lisp/nxml/rng-loc.el b/lisp/nxml/rng-loc.el
index c568b86a25..e145bef2fc 100644
--- a/lisp/nxml/rng-loc.el
+++ b/lisp/nxml/rng-loc.el
@@ -1,6 +1,7 @@
;;; rng-loc.el --- locate the schema to use for validation
-;; Copyright (C) 2003, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: James Clark
;; Keywords: XML, RelaxNG
diff --git a/lisp/nxml/rng-maint.el b/lisp/nxml/rng-maint.el
index 5226868836..7a6f3377f6 100644
--- a/lisp/nxml/rng-maint.el
+++ b/lisp/nxml/rng-maint.el
@@ -275,5 +275,4 @@
(while (rng-do-some-validation
(lambda () t))))
-;; arch-tag: 4b8c6143-daac-4888-9c61-9bea6f935f17
;;; rng-maint.el ends here
diff --git a/lisp/nxml/rng-match.el b/lisp/nxml/rng-match.el
index b49acdfb7b..b47ac09969 100644
--- a/lisp/nxml/rng-match.el
+++ b/lisp/nxml/rng-match.el
@@ -1736,5 +1736,4 @@ be exhaustive."
(provide 'rng-match)
-;; arch-tag: c8c50733-edcf-49fb-85e2-0aac8749b7f8
;;; rng-match.el ends here
diff --git a/lisp/nxml/rng-nxml.el b/lisp/nxml/rng-nxml.el
index 07aac01088..977f84d730 100644
--- a/lisp/nxml/rng-nxml.el
+++ b/lisp/nxml/rng-nxml.el
@@ -1,6 +1,7 @@
;;; rng-nxml.el --- make nxml-mode take advantage of rng-validate-mode
-;; Copyright (C) 2003, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: James Clark
;; Keywords: XML, RelaxNG
diff --git a/lisp/nxml/rng-parse.el b/lisp/nxml/rng-parse.el
index 7e3a8cdefe..83f0ee39c3 100644
--- a/lisp/nxml/rng-parse.el
+++ b/lisp/nxml/rng-parse.el
@@ -100,5 +100,4 @@ be signaled in the same way as when it is not well-formed."
(provide 'rng-parse)
-;; arch-tag: 8f14f533-b687-4dc0-9cd7-617ead856981
;;; rng-parse.el ends here
diff --git a/lisp/nxml/rng-pttrn.el b/lisp/nxml/rng-pttrn.el
index 8e7139df32..6a9db71ebc 100644
--- a/lisp/nxml/rng-pttrn.el
+++ b/lisp/nxml/rng-pttrn.el
@@ -186,5 +186,4 @@
(provide 'rng-pttrn)
-;; arch-tag: 9418e269-ddd4-4037-861f-ff903f48f008
;;; rng-pttrn.el ends here
diff --git a/lisp/nxml/rng-uri.el b/lisp/nxml/rng-uri.el
index b4cbd9a066..73d8f3b373 100644
--- a/lisp/nxml/rng-uri.el
+++ b/lisp/nxml/rng-uri.el
@@ -352,5 +352,4 @@ Both FULL and BASE must be absolute URIs."
(provide 'rng-uri)
-;; arch-tag: c7b7b8b8-61d1-48ec-82bc-7001c70b2e9d
;;; rng-uri.el ends here
diff --git a/lisp/nxml/rng-util.el b/lisp/nxml/rng-util.el
index 0c4fb818a5..cca6f28f22 100644
--- a/lisp/nxml/rng-util.el
+++ b/lisp/nxml/rng-util.el
@@ -167,5 +167,4 @@ HIST, if non-nil, specifies a history list as with `completing-read'."
(provide 'rng-util)
-;; arch-tag: 2dc233e0-5e7a-488f-bfc4-5909512dbaf0
;;; rng-util.el ends here
diff --git a/lisp/nxml/rng-valid.el b/lisp/nxml/rng-valid.el
index 96ab5b6c95..0ac4d925a7 100644
--- a/lisp/nxml/rng-valid.el
+++ b/lisp/nxml/rng-valid.el
@@ -1,6 +1,7 @@
;;; rng-valid.el --- real-time validation of XML using RELAX NG
-;; Copyright (C) 2003, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: James Clark
;; Keywords: XML, RelaxNG
diff --git a/lisp/nxml/rng-xsd.el b/lisp/nxml/rng-xsd.el
index e729b30671..c4f28b746c 100644
--- a/lisp/nxml/rng-xsd.el
+++ b/lisp/nxml/rng-xsd.el
@@ -856,5 +856,4 @@ MONTHS must be an integer >= 0."
(provide 'rng-xsd)
-;; arch-tag: 6b05510e-a5bb-4b99-8618-4660d00d0abb
;;; rng-xsd.el ends here
diff --git a/lisp/nxml/xmltok.el b/lisp/nxml/xmltok.el
index da8f356f9c..831f5de325 100644
--- a/lisp/nxml/xmltok.el
+++ b/lisp/nxml/xmltok.el
@@ -1920,5 +1920,4 @@ and `xmltok-namespace-attributes'."
(provide 'xmltok)
-;; arch-tag: 747e5f3a-6fc3-4f8d-bd96-89f05aa99f5e
;;; xmltok.el ends here
diff --git a/lisp/nxml/xsd-regexp.el b/lisp/nxml/xsd-regexp.el
index 80b818e930..4d470de973 100644
--- a/lisp/nxml/xsd-regexp.el
+++ b/lisp/nxml/xsd-regexp.el
@@ -2117,5 +2117,4 @@ Code is inserted into the current buffer."
(provide 'xsd-regexp)
-;; arch-tag: bf990d61-a26c-4fd3-b578-56a5640729da
;;; xsd-regexp.el ends here
diff --git a/lisp/obsolete/awk-mode.el b/lisp/obsolete/awk-mode.el
index a629b3ec67..4556bda5ed 100644
--- a/lisp/obsolete/awk-mode.el
+++ b/lisp/obsolete/awk-mode.el
@@ -122,5 +122,4 @@ Turning on AWK mode runs `awk-mode-hook'."
(provide 'awk-mode)
-;; arch-tag: 14ebc02a-b3c5-4e76-8034-6ca9ac0af0e6
;;; awk-mode.el ends here
diff --git a/lisp/obsolete/complete.el b/lisp/obsolete/complete.el
index faf8d8336e..e0cd171753 100644
--- a/lisp/obsolete/complete.el
+++ b/lisp/obsolete/complete.el
@@ -1120,5 +1120,4 @@ This is only used by "
(provide 'complete)
-;; arch-tag: fc7e2768-ff44-4e22-b579-4d825b968458
;;; complete.el ends here
diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el
index 353f39273b..ffd6a930c0 100644
--- a/lisp/obsolete/fast-lock.el
+++ b/lisp/obsolete/fast-lock.el
@@ -855,5 +855,4 @@ See `fast-lock-get-face-properties'."
(provide 'fast-lock)
-;; arch-tag: 638c431e-8cae-4538-80a1-963ff97d233e
;;; fast-lock.el ends here
diff --git a/lisp/obsolete/iso-acc.el b/lisp/obsolete/iso-acc.el
index a237b17dee..28d73649dd 100644
--- a/lisp/obsolete/iso-acc.el
+++ b/lisp/obsolete/iso-acc.el
@@ -487,5 +487,4 @@ Noninteractively, this operates on text from START to END."
(add-hook 'minibuffer-setup-hook 'iso-acc-minibuf-setup)
-;; arch-tag: 149ff409-7c3e-4574-9b5d-ac038939c0a6
;;; iso-acc.el ends here
diff --git a/lisp/obsolete/iso-insert.el b/lisp/obsolete/iso-insert.el
index 785e372f01..c1d65d85c6 100644
--- a/lisp/obsolete/iso-insert.el
+++ b/lisp/obsolete/iso-insert.el
@@ -629,5 +629,4 @@
(provide 'iso-insert)
-;; arch-tag: eb5f97bd-a034-4851-92ff-ab1f1bf92814
;;; iso-insert.el ends here
diff --git a/lisp/obsolete/iso-swed.el b/lisp/obsolete/iso-swed.el
index c3620711eb..b8c1556a61 100644
--- a/lisp/obsolete/iso-swed.el
+++ b/lisp/obsolete/iso-swed.el
@@ -149,5 +149,4 @@
(provide 'iso-swed)
-;; arch-tag: 6b3dc269-660c-44b6-a25f-680b921eaf2c
;;; iso-swed.el ends here
diff --git a/lisp/obsolete/keyswap.el b/lisp/obsolete/keyswap.el
index cb04a5858d..053e8f7efa 100644
--- a/lisp/obsolete/keyswap.el
+++ b/lisp/obsolete/keyswap.el
@@ -39,5 +39,4 @@
(aset the-table ?\^h ?\177)
(setq keyboard-translate-table the-table))
-;; arch-tag: 67cf7009-e23e-421c-9648-078e7277297c
;;; keyswap.el ends here
diff --git a/lisp/obsolete/levents.el b/lisp/obsolete/levents.el
index 126b5a1f9b..753484c39f 100644
--- a/lisp/obsolete/levents.el
+++ b/lisp/obsolete/levents.el
@@ -290,5 +290,4 @@ GNU Emacs 19 does not currently generate process-output events."
(provide 'levents)
-;; arch-tag: a80c21da-69d7-46de-9cdb-5f68577b5525
;;; levents.el ends here
diff --git a/lisp/obsolete/lucid.el b/lisp/obsolete/lucid.el
index e3033e8565..997da10311 100644
--- a/lisp/obsolete/lucid.el
+++ b/lisp/obsolete/lucid.el
@@ -1,7 +1,7 @@
;;; lucid.el --- emulate some Lucid Emacs functions
-;; Copyright (C) 1993, 1995, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: emulations
diff --git a/lisp/obsolete/old-whitespace.el b/lisp/obsolete/old-whitespace.el
index e230fa55b0..a69e353cbf 100644
--- a/lisp/obsolete/old-whitespace.el
+++ b/lisp/obsolete/old-whitespace.el
@@ -809,5 +809,4 @@ This is meant to be added buffer-locally to `write-file-functions'."
(provide 'whitespace)
-;; arch-tag: 4ff44e87-b63c-402d-95a6-15e51e58bd0c
;;; whitespace.el ends here
diff --git a/lisp/obsolete/options.el b/lisp/obsolete/options.el
index 5bb5dbb84b..57bdba9940 100644
--- a/lisp/obsolete/options.el
+++ b/lisp/obsolete/options.el
@@ -147,5 +147,4 @@ For convenience, the characters \\[backward-paragraph] and \\[forward-paragraph]
(provide 'options)
-;; arch-tag: d18211a1-f3fb-48c9-a449-d5acde406a3c
;;; options.el ends here
diff --git a/lisp/obsolete/resume.el b/lisp/obsolete/resume.el
index 64031533da..54c7ddf889 100644
--- a/lisp/obsolete/resume.el
+++ b/lisp/obsolete/resume.el
@@ -124,5 +124,4 @@
(provide 'resume)
-;; arch-tag: c90b2761-4803-4e58-a0ae-c4721368b628
;;; resume.el ends here
diff --git a/lisp/obsolete/s-region.el b/lisp/obsolete/s-region.el
index 2b8c4a38bf..225ce8f949 100644
--- a/lisp/obsolete/s-region.el
+++ b/lisp/obsolete/s-region.el
@@ -121,5 +121,4 @@ to global keymap."
(provide 's-region)
-;; arch-tag: a471e912-18d7-4247-a29b-2100bca180ff
;;; s-region.el ends here
diff --git a/lisp/obsolete/scribe.el b/lisp/obsolete/scribe.el
index 8820aff3ef..bf56c9fd56 100644
--- a/lisp/obsolete/scribe.el
+++ b/lisp/obsolete/scribe.el
@@ -326,5 +326,4 @@ preceding text is of the form @Command."
(provide 'scribe)
-;; arch-tag: 64f454c4-7544-4ea2-9d14-f0b668f2cdc6
;;; scribe.el ends here
diff --git a/lisp/obsolete/sregex.el b/lisp/obsolete/sregex.el
index e6bebc861a..5f5b79379b 100644
--- a/lisp/obsolete/sregex.el
+++ b/lisp/obsolete/sregex.el
@@ -605,5 +605,4 @@ has one of the following forms:
(provide 'sregex)
-;; arch-tag: 460c1f5a-eb6e-42ec-a451-ffac78bdf492
;;; sregex.el ends here
diff --git a/lisp/obsolete/swedish.el b/lisp/obsolete/swedish.el
index e753e93b11..ec572c7858 100644
--- a/lisp/obsolete/swedish.el
+++ b/lisp/obsolete/swedish.el
@@ -159,5 +159,4 @@ Leaves point just after the word that looks Swedish."
(provide 'swedish)
-;; arch-tag: a117019d-acac-4ac4-8eac-0dbd49a41d32
;;; swedish.el ends here
diff --git a/lisp/obsolete/sym-comp.el b/lisp/obsolete/sym-comp.el
index fc2da0ff69..bc6e72420d 100644
--- a/lisp/obsolete/sym-comp.el
+++ b/lisp/obsolete/sym-comp.el
@@ -227,5 +227,4 @@ completion:
(provide 'sym-comp)
-;; arch-tag: 6fcce616-f3c4-4751-94b4-710e83144124
;;; sym-comp.el ends here
diff --git a/lisp/obsolete/vc-mcvs.el b/lisp/obsolete/vc-mcvs.el
index 064458a705..2d791a5934 100644
--- a/lisp/obsolete/vc-mcvs.el
+++ b/lisp/obsolete/vc-mcvs.el
@@ -585,5 +585,4 @@ and that it passes `vc-mcvs-global-switches' to it before FLAGS."
;;
;; ********** READ THIS! **********
-;; arch-tag: a39c7c1c-5247-429d-88df-dd7187d2e704
;;; vc-mcvs.el ends here
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 0075346763..25d08a96bc 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -12900,4 +12900,3 @@
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: a9bdcf06-7c2d-4b5a-bf7a-c5e7b706f67c
diff --git a/lisp/org/ob-C.el b/lisp/org/ob-C.el
index da0e76894f..1b6ef7caea 100644
--- a/lisp/org/ob-C.el
+++ b/lisp/org/ob-C.el
@@ -1,6 +1,6 @@
;;; ob-C.el --- org-babel functions for C and similar languages
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -189,6 +189,5 @@ of the same value."
(provide 'ob-C)
-;; arch-tag: 8f49e462-54e3-417b-9a8d-423864893b37
;;; ob-C.el ends here
diff --git a/lisp/org/ob-R.el b/lisp/org/ob-R.el
index 1f4fd87b0a..8aabe537bc 100644
--- a/lisp/org/ob-R.el
+++ b/lisp/org/ob-R.el
@@ -1,6 +1,6 @@
;;; ob-R.el --- org-babel functions for R code evaluation
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte, Dan Davison
;; Keywords: literate programming, reproducible research, R, statistics
@@ -298,6 +298,5 @@ Insert hline if column names in output have been requested."
(provide 'ob-R)
-;; arch-tag: cd4c7298-503b-450f-a3c2-f3e74b630237
;;; ob-R.el ends here
diff --git a/lisp/org/ob-asymptote.el b/lisp/org/ob-asymptote.el
index ab2abda28d..92cc8a7075 100644
--- a/lisp/org/ob-asymptote.el
+++ b/lisp/org/ob-asymptote.el
@@ -1,6 +1,6 @@
;;; ob-asymptote.el --- org-babel functions for asymptote evaluation
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -159,6 +159,5 @@ of int, where every cell must be of int type."
(provide 'ob-asymptote)
-;; arch-tag: f2f5bd0d-78e8-412b-8e6c-6dadc94cc06b
;;; ob-asymptote.el ends here
diff --git a/lisp/org/ob-calc.el b/lisp/org/ob-calc.el
index 287bad31a2..d6fbf3f92e 100644
--- a/lisp/org/ob-calc.el
+++ b/lisp/org/ob-calc.el
@@ -1,6 +1,6 @@
;;; ob-calc.el --- org-babel functions for calc code evaluation
-;; Copyright (C) 2010 Free Software Foundation, Inc
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -92,6 +92,5 @@
(provide 'ob-calc)
-;; arch-tag: 5c57a3b7-5818-4c6c-acda-7a94831a6449
;;; ob-calc.el ends here
diff --git a/lisp/org/ob-clojure.el b/lisp/org/ob-clojure.el
index d88c54b6db..9ec8a5782b 100644
--- a/lisp/org/ob-clojure.el
+++ b/lisp/org/ob-clojure.el
@@ -1,6 +1,6 @@
;;; ob-clojure.el --- org-babel functions for clojure evaluation
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Joel Boehland, Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -83,6 +83,5 @@
(provide 'ob-clojure)
-;; arch-tag: a43b33f2-653e-46b1-ac56-2805cf05b7d1
;;; ob-clojure.el ends here
diff --git a/lisp/org/ob-comint.el b/lisp/org/ob-comint.el
index 064aad539c..9d1cfed1d2 100644
--- a/lisp/org/ob-comint.el
+++ b/lisp/org/ob-comint.el
@@ -1,6 +1,6 @@
;;; ob-comint.el --- org-babel functions for interaction with comint buffers
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, comint
@@ -158,6 +158,5 @@ FILE exists at end of evaluation."
(provide 'ob-comint)
-;; arch-tag: 9adddce6-0864-4be3-b0b5-6c5157dc7889
;;; ob-comint.el ends here
diff --git a/lisp/org/ob-css.el b/lisp/org/ob-css.el
index 48ea9e3f93..1c3aad5d0c 100644
--- a/lisp/org/ob-css.el
+++ b/lisp/org/ob-css.el
@@ -1,6 +1,6 @@
;;; ob-css.el --- org-babel functions for css evaluation
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -44,6 +44,5 @@ CSS does not support sessions."
(provide 'ob-css)
-;; arch-tag: f4447e8c-50ab-41f9-b322-b7b9574d9fbe
;;; ob-css.el ends here
diff --git a/lisp/org/ob-ditaa.el b/lisp/org/ob-ditaa.el
index 097f938e92..4d00b16127 100644
--- a/lisp/org/ob-ditaa.el
+++ b/lisp/org/ob-ditaa.el
@@ -1,6 +1,6 @@
;;; ob-ditaa.el --- org-babel functions for ditaa evaluation
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -69,6 +69,5 @@ This function is called by `org-babel-execute-src-block'."
(provide 'ob-ditaa)
-;; arch-tag: 492cd006-07d9-4fac-bef6-5bb60b48842e
;;; ob-ditaa.el ends here
diff --git a/lisp/org/ob-dot.el b/lisp/org/ob-dot.el
index 36baddb1cd..845d527a70 100644
--- a/lisp/org/ob-dot.el
+++ b/lisp/org/ob-dot.el
@@ -1,6 +1,6 @@
;;; ob-dot.el --- org-babel functions for dot evaluation
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -85,6 +85,5 @@ This function is called by `org-babel-execute-src-block'."
(provide 'ob-dot)
-;; arch-tag: 817d0516-7b47-4f77-a8b2-2aadd8e4d0e2
;;; ob-dot.el ends here
diff --git a/lisp/org/ob-emacs-lisp.el b/lisp/org/ob-emacs-lisp.el
index df6f505ffe..3fd694eeda 100644
--- a/lisp/org/ob-emacs-lisp.el
+++ b/lisp/org/ob-emacs-lisp.el
@@ -1,6 +1,6 @@
;;; ob-emacs-lisp.el --- org-babel functions for emacs-lisp code evaluation
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -66,6 +66,5 @@
(provide 'ob-emacs-lisp)
-;; arch-tag: e9a3acca-dc84-472a-9f5a-23c35befbcd6
;;; ob-emacs-lisp.el ends here
diff --git a/lisp/org/ob-eval.el b/lisp/org/ob-eval.el
index a71cb0dd69..7685eff14f 100644
--- a/lisp/org/ob-eval.el
+++ b/lisp/org/ob-eval.el
@@ -1,6 +1,6 @@
;;; ob-eval.el --- org-babel functions for external code evaluation
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, comint
@@ -257,6 +257,5 @@ This buffer is named by `org-babel-error-buffer-name'."
(provide 'ob-eval)
-;; arch-tag: 5328b17f-957d-42d9-94da-a2952682d04d
;;; ob-eval.el ends here
diff --git a/lisp/org/ob-exp.el b/lisp/org/ob-exp.el
index 8b6914c903..ef3ec9fdfa 100644
--- a/lisp/org/ob-exp.el
+++ b/lisp/org/ob-exp.el
@@ -1,6 +1,6 @@
;;; ob-exp.el --- Exportation of org-babel source blocks
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte, Dan Davison
;; Keywords: literate programming, reproducible research
@@ -323,6 +323,5 @@ inhibit insertion of results into the buffer."
(provide 'ob-exp)
-;; arch-tag: 523abf4c-76d1-44ed-9f27-e3bddf34bf0f
;;; ob-exp.el ends here
diff --git a/lisp/org/ob-gnuplot.el b/lisp/org/ob-gnuplot.el
index 423e47e866..fa6473d784 100644
--- a/lisp/org/ob-gnuplot.el
+++ b/lisp/org/ob-gnuplot.el
@@ -1,6 +1,6 @@
;;; ob-gnuplot.el --- org-babel functions for gnuplot evaluation
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -230,6 +230,5 @@ Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE."
(provide 'ob-gnuplot)
-;; arch-tag: 50490ace-a9e1-4b29-a6e5-0db9f16c610b
;;; ob-gnuplot.el ends here
diff --git a/lisp/org/ob-haskell.el b/lisp/org/ob-haskell.el
index 734e1f6c89..e03b81e47e 100644
--- a/lisp/org/ob-haskell.el
+++ b/lisp/org/ob-haskell.el
@@ -1,6 +1,6 @@
;;; ob-haskell.el --- org-babel functions for haskell evaluation
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -212,6 +212,5 @@ constructs (header arguments, no-web syntax etc...) are ignored."
(provide 'ob-haskell)
-;; arch-tag: b53f75f3-ba1a-4b05-82d9-a2a0d4e70804
;;; ob-haskell.el ends here
diff --git a/lisp/org/ob-js.el b/lisp/org/ob-js.el
index 05f8ea4175..d2d739cc94 100644
--- a/lisp/org/ob-js.el
+++ b/lisp/org/ob-js.el
@@ -1,6 +1,6 @@
;;; ob-js.el --- org-babel functions for Javascript
-;; Copyright (C) 2010 Free Software Foundation
+;; Copyright (C) 2010, 2011 Free Software Foundation
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, js
@@ -160,6 +160,5 @@ then create. Return the initialized session."
(provide 'ob-js)
-;; arch-tag: 84401fb3-b8d9-4bb6-9a90-cbe2d103d494
;;; ob-js.el ends here
diff --git a/lisp/org/ob-keys.el b/lisp/org/ob-keys.el
index af8190692c..f12ee7ebd6 100644
--- a/lisp/org/ob-keys.el
+++ b/lisp/org/ob-keys.el
@@ -1,6 +1,6 @@
;;; ob-keys.el --- key bindings for org-babel
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -93,6 +93,5 @@ a-list placed behind the generic `org-babel-key-prefix'.")
(provide 'ob-keys)
-;; arch-tag: 01e348ee-4906-46fa-839a-6b7b6f989048
;;; ob-keys.el ends here
diff --git a/lisp/org/ob-latex.el b/lisp/org/ob-latex.el
index 96afbcd92a..ed8cdcc4d8 100644
--- a/lisp/org/ob-latex.el
+++ b/lisp/org/ob-latex.el
@@ -1,6 +1,6 @@
;;; ob-latex.el --- org-babel functions for latex "evaluation"
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -175,6 +175,5 @@ Extracted from `org-export-as-pdf' in org-latex.el."
(provide 'ob-latex)
-;; arch-tag: 1f13f7e2-26de-4c24-9274-9f331d4c6ff3
;;; ob-latex.el ends here
diff --git a/lisp/org/ob-ledger.el b/lisp/org/ob-ledger.el
index a02eb6fec8..875044e8f0 100644
--- a/lisp/org/ob-ledger.el
+++ b/lisp/org/ob-ledger.el
@@ -1,6 +1,6 @@
;;; ob-ledger.el --- org-babel functions for ledger evaluation
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric S Fraga
;; Keywords: literate programming, reproducible research, accounting
@@ -67,6 +67,5 @@ called by `org-babel-execute-src-block'."
(provide 'ob-ledger)
-;; arch-tag: 7bbb529e-95a1-4236-9d29-b0000b918c7c
;;; ob-ledger.el ends here
diff --git a/lisp/org/ob-lisp.el b/lisp/org/ob-lisp.el
index 600b79ee7a..1cf23adba4 100644
--- a/lisp/org/ob-lisp.el
+++ b/lisp/org/ob-lisp.el
@@ -1,6 +1,6 @@
;;; ob-lisp.el --- org-babel functions for Common Lisp
-;; Copyright (C) 2010 Free Software Foundation
+;; Copyright (C) 2010, 2011 Free Software Foundation
;; Author: David T. O'Toole <dto@gnu.org>, Eric Schulte
;; Keywords: literate programming, reproducible research, lisp
@@ -108,6 +108,5 @@ then create. Return the initialized session."
(provide 'ob-lisp)
-;; arch-tag: 18086168-009f-4947-bbb5-3532375d851d
;;; ob-lisp.el ends here
diff --git a/lisp/org/ob-lob.el b/lisp/org/ob-lob.el
index 137a6bce9a..0df45a312e 100644
--- a/lisp/org/ob-lob.el
+++ b/lisp/org/ob-lob.el
@@ -1,6 +1,6 @@
;;; ob-lob.el --- functions supporting the Library of Babel
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte, Dan Davison
;; Keywords: literate programming, reproducible research
@@ -119,6 +119,5 @@ if so then run the appropriate source block from the Library."
(provide 'ob-lob)
-;; arch-tag: ce0712c9-2147-4019-ba3f-42341b8b474b
;;; ob-lob.el ends here
diff --git a/lisp/org/ob-matlab.el b/lisp/org/ob-matlab.el
index 192c73d908..08edb7dcb7 100644
--- a/lisp/org/ob-matlab.el
+++ b/lisp/org/ob-matlab.el
@@ -1,6 +1,6 @@
;;; ob-matlab.el --- org-babel support for matlab evaluation
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Dan Davison
;; Keywords: literate programming, reproducible research
@@ -43,6 +43,5 @@
(provide 'ob-matlab)
-;; arch-tag: 6b234299-c1f7-4eb1-ace8-7b93344065ac
;;; ob-matlab.el ends here
diff --git a/lisp/org/ob-mscgen.el b/lisp/org/ob-mscgen.el
index 98230da56a..df7a8f11b3 100644
--- a/lisp/org/ob-mscgen.el
+++ b/lisp/org/ob-mscgen.el
@@ -1,6 +1,6 @@
;;; ob-msc.el --- org-babel functions for mscgen evaluation
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Juan Pechiar
;; Keywords: literate programming, reproducible research
@@ -81,6 +81,5 @@ ERROR: no output file specified. Add \":file name.png\" to the src header"))
(provide 'ob-mscgen)
-;; arch-tag: 74695b1e-715f-4b5a-a3a9-d78ee39ba5c8
;;; ob-msc.el ends here
diff --git a/lisp/org/ob-ocaml.el b/lisp/org/ob-ocaml.el
index 459dcf336f..5a3c362562 100644
--- a/lisp/org/ob-ocaml.el
+++ b/lisp/org/ob-ocaml.el
@@ -1,6 +1,6 @@
;;; ob-ocaml.el --- org-babel functions for ocaml evaluation
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -152,6 +152,5 @@ Emacs-lisp table, otherwise return the results as a string."
(provide 'ob-ocaml)
-;; arch-tag: 2e815f4d-365e-4d69-b1df-dd17fdd7b7b7
;;; ob-ocaml.el ends here
diff --git a/lisp/org/ob-octave.el b/lisp/org/ob-octave.el
index 9fcd825f91..4181de05b2 100644
--- a/lisp/org/ob-octave.el
+++ b/lisp/org/ob-octave.el
@@ -1,6 +1,6 @@
;;; ob-octave.el --- org-babel functions for octave and matlab evaluation
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Dan Davison
;; Keywords: literate programming, reproducible research
@@ -259,6 +259,5 @@ This removes initial blank and comment lines and then calls
(provide 'ob-octave)
-;; arch-tag: d8e5f68b-ba13-440a-a495-b653e989e704
;;; ob-octave.el ends here
diff --git a/lisp/org/ob-org.el b/lisp/org/ob-org.el
index c03fa07602..2b22c899bb 100644
--- a/lisp/org/ob-org.el
+++ b/lisp/org/ob-org.el
@@ -1,6 +1,6 @@
;;; ob-org.el --- org-babel functions for org code block evaluation
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -57,6 +57,5 @@ This function is called by `org-babel-execute-src-block'."
(provide 'ob-org)
-;; arch-tag: 130af5fe-cc56-46bd-9508-fa0ebd94cb1f
;;; ob-org.el ends here
diff --git a/lisp/org/ob-perl.el b/lisp/org/ob-perl.el
index 1e0cecb1af..159333f5a0 100644
--- a/lisp/org/ob-perl.el
+++ b/lisp/org/ob-perl.el
@@ -1,6 +1,6 @@
;;; ob-perl.el --- org-babel functions for perl evaluation
-;; Copyright (C) 2009, 2010 Free Software Foundation
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation
;; Author: Dan Davison, Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -112,6 +112,5 @@ return the value of the last statement in BODY, as elisp."
(provide 'ob-perl)
-;; arch-tag: 88ef9396-d857-4dc3-8946-5a72bdfa2337
;;; ob-perl.el ends here
diff --git a/lisp/org/ob-plantuml.el b/lisp/org/ob-plantuml.el
index fb81dc8e60..83fa415014 100644
--- a/lisp/org/ob-plantuml.el
+++ b/lisp/org/ob-plantuml.el
@@ -1,6 +1,6 @@
;;; ob-plantuml.el --- org-babel functions for plantuml evaluation
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Zhang Weize
;; Keywords: literate programming, reproducible research
@@ -78,6 +78,5 @@ This function is called by `org-babel-execute-src-block'."
(provide 'ob-plantuml)
-;; arch-tag: 451f50c5-e779-407e-ad64-70e0e8f161d1
;;; ob-plantuml.el ends here
diff --git a/lisp/org/ob-python.el b/lisp/org/ob-python.el
index 27b69bff5a..3bf7ce6ec5 100644
--- a/lisp/org/ob-python.el
+++ b/lisp/org/ob-python.el
@@ -1,6 +1,6 @@
;;; ob-python.el --- org-babel functions for python evaluation
-;; Copyright (C) 2009, 2010 Free Software Foundation
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation
;; Author: Eric Schulte, Dan Davison
;; Keywords: literate programming, reproducible research
@@ -277,6 +277,5 @@ last statement in BODY, as elisp."
(provide 'ob-python)
-;; arch-tag: f19b6c3d-dfcb-4a1a-9ce0-45ade1ebc212
;;; ob-python.el ends here
diff --git a/lisp/org/ob-ref.el b/lisp/org/ob-ref.el
index 2ca99ca651..597f0dcce8 100644
--- a/lisp/org/ob-ref.el
+++ b/lisp/org/ob-ref.el
@@ -1,6 +1,6 @@
;;; ob-ref.el --- org-babel functions for referencing external data
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte, Dan Davison
;; Keywords: literate programming, reproducible research
@@ -224,6 +224,5 @@ Supported reference types are tables and source blocks."
(provide 'ob-ref)
-;; arch-tag: ace4a4f4-ea38-4dac-8fe6-6f52fcc43b6d
;;; ob-ref.el ends here
diff --git a/lisp/org/ob-ruby.el b/lisp/org/ob-ruby.el
index 3f2af39460..b9c122c86c 100644
--- a/lisp/org/ob-ruby.el
+++ b/lisp/org/ob-ruby.el
@@ -1,6 +1,6 @@
;;; ob-ruby.el --- org-babel functions for ruby evaluation
-;; Copyright (C) 2009, 2010 Free Software Foundation
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -234,6 +234,5 @@ return the value of the last statement in BODY, as elisp."
(provide 'ob-ruby)
-;; arch-tag: 3e9726db-4520-49e2-b263-e8f571ac88f5
;;; ob-ruby.el ends here
diff --git a/lisp/org/ob-sass.el b/lisp/org/ob-sass.el
index b3acc8b8d2..5300682c15 100644
--- a/lisp/org/ob-sass.el
+++ b/lisp/org/ob-sass.el
@@ -1,6 +1,6 @@
;;; ob-sass.el --- org-babel functions for the sass css generation language
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -64,6 +64,5 @@ This function is called by `org-babel-execute-src-block'."
(provide 'ob-sass)
-;; arch-tag: 2954b169-eef4-45ce-a8e5-3e619f0f07ac
;;; ob-sass.el ends here
diff --git a/lisp/org/ob-scheme.el b/lisp/org/ob-scheme.el
index b2b9fa6a01..1581f8a622 100644
--- a/lisp/org/ob-scheme.el
+++ b/lisp/org/ob-scheme.el
@@ -1,6 +1,6 @@
;;; ob-scheme.el --- org-babel functions for Scheme
-;; Copyright (C) 2010 Free Software Foundation
+;; Copyright (C) 2010, 2011 Free Software Foundation
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, scheme
@@ -134,6 +134,5 @@ then create. Return the initialized session."
(provide 'ob-scheme)
-;; arch-tag: 6b2fe76f-4b25-4e87-ad1c-225b2f282a71
;;; ob-scheme.el ends here
diff --git a/lisp/org/ob-screen.el b/lisp/org/ob-screen.el
index 7f4af79549..2325d434de 100644
--- a/lisp/org/ob-screen.el
+++ b/lisp/org/ob-screen.el
@@ -1,6 +1,6 @@
;;; ob-screen.el --- org-babel support for interactive terminal
-;; Copyright (C) 2009, 2010 Free Software Foundation
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation
;; Author: Benjamin Andresen
;; Keywords: literate programming, interactive shell
@@ -142,6 +142,5 @@ The terminal should shortly flicker."
(provide 'ob-screen)
-;; arch-tag: 908e5afe-89a0-4f27-b982-23f1f2e3bac9
;;; ob-screen.el ends here
diff --git a/lisp/org/ob-sh.el b/lisp/org/ob-sh.el
index e153d68b57..0d52fd3eed 100644
--- a/lisp/org/ob-sh.el
+++ b/lisp/org/ob-sh.el
@@ -1,6 +1,6 @@
;;; ob-sh.el --- org-babel functions for shell evaluation
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -166,6 +166,5 @@ return the value of the last statement in BODY."
(provide 'ob-sh)
-;; arch-tag: 416dd531-c230-4b0a-a5bf-8d948f990f2d
;;; ob-sh.el ends here
diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el
index 5bb123d631..1d2d4faed7 100644
--- a/lisp/org/ob-sql.el
+++ b/lisp/org/ob-sql.el
@@ -1,6 +1,6 @@
;;; ob-sql.el --- org-babel functions for sql evaluation
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -121,6 +121,5 @@ This function is called by `org-babel-execute-src-block'."
(provide 'ob-sql)
-;; arch-tag: a43ff944-6de1-4566-a83c-626814e3dad2
;;; ob-sql.el ends here
diff --git a/lisp/org/ob-sqlite.el b/lisp/org/ob-sqlite.el
index 65e8091741..4157dca40b 100644
--- a/lisp/org/ob-sqlite.el
+++ b/lisp/org/ob-sqlite.el
@@ -1,6 +1,6 @@
;;; ob-sqlite.el --- org-babel functions for sqlite database interaction
-;; Copyright (C) 2010 Free Software Foundation
+;; Copyright (C) 2010, 2011 Free Software Foundation
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -144,6 +144,5 @@ Prepare SESSION according to the header arguments specified in PARAMS."
(provide 'ob-sqlite)
-;; arch-tag: 5c03d7f2-0f72-48b8-bbd1-35aafea248ac
;;; ob-sqlite.el ends here
diff --git a/lisp/org/ob-table.el b/lisp/org/ob-table.el
index b7f9673c67..090646685d 100644
--- a/lisp/org/ob-table.el
+++ b/lisp/org/ob-table.el
@@ -1,6 +1,6 @@
;;; ob-table.el --- support for calling org-babel functions from tables
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -120,6 +120,5 @@ example above."
(provide 'ob-table)
-;; arch-tag: 4234cc7c-4fc8-4e92-abb0-2892de1a493b
;;; ob-table.el ends here
diff --git a/lisp/org/ob-tangle.el b/lisp/org/ob-tangle.el
index c5ef2a1fce..c6e549cddb 100644
--- a/lisp/org/ob-tangle.el
+++ b/lisp/org/ob-tangle.el
@@ -1,6 +1,6 @@
;;; ob-tangle.el --- extract source code from org-mode files
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
@@ -449,6 +449,5 @@ which enable the original code blocks to be found."
(provide 'ob-tangle)
-;; arch-tag: 413ced93-48f5-4216-86e4-3fc5df8c8f24
;;; ob-tangle.el ends here
diff --git a/lisp/org/ob.el b/lisp/org/ob.el
index 1c9f9fdbc1..82859b0a03 100644
--- a/lisp/org/ob.el
+++ b/lisp/org/ob.el
@@ -1,6 +1,6 @@
;;; ob.el --- working with code blocks in org-mode
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eric Schulte, Dan Davison
;; Keywords: literate programming, reproducible research
@@ -1963,6 +1963,5 @@ of `org-babel-temporary-directory'."
(provide 'ob)
-;; arch-tag: 01a7ebee-06c5-4ee4-a709-e660d28c0af1
;;; ob.el ends here
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index bb9f4be096..1cabb74b04 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -8058,6 +8058,5 @@ belonging to the \"Work\" category."
(provide 'org-agenda)
-;; arch-tag: 77f7565d-7c4b-44af-a2df-9f6f7070cff1
;;; org-agenda.el ends here
diff --git a/lisp/org/org-archive.el b/lisp/org/org-archive.el
index ae52df65bd..506c87e986 100644
--- a/lisp/org/org-archive.el
+++ b/lisp/org/org-archive.el
@@ -466,6 +466,5 @@ This command is set with the variable `org-archive-default-command'."
(provide 'org-archive)
-;; arch-tag: 0837f601-9699-43c3-8b90-631572ae6c85
;;; org-archive.el ends here
diff --git a/lisp/org/org-ascii.el b/lisp/org/org-ascii.el
index 7de895eb93..8b21ebabaa 100644
--- a/lisp/org/org-ascii.el
+++ b/lisp/org/org-ascii.el
@@ -719,5 +719,4 @@ publishing directory."
(provide 'org-ascii)
-;; arch-tag: aa96f882-f477-4e13-86f5-70d43e7adf3c
;;; org-ascii.el ends here
diff --git a/lisp/org/org-attach.el b/lisp/org/org-attach.el
index 7f0f32b08b..8f4260bb91 100644
--- a/lisp/org/org-attach.el
+++ b/lisp/org/org-attach.el
@@ -418,5 +418,4 @@ prefix."
(provide 'org-attach)
-;; arch-tag: fce93c2e-fe07-4fa3-a905-e10dcc7a6248
;;; org-attach.el ends here
diff --git a/lisp/org/org-bbdb.el b/lisp/org/org-bbdb.el
index 2d3e9298c2..4d56c29fc6 100644
--- a/lisp/org/org-bbdb.el
+++ b/lisp/org/org-bbdb.el
@@ -381,6 +381,5 @@ END:VEVENT\n"
(provide 'org-bbdb)
-;; arch-tag: 9e4f275d-d080-48c1-b040-62247f66b5c2
;;; org-bbdb.el ends here
diff --git a/lisp/org/org-beamer.el b/lisp/org/org-beamer.el
index c88df859f7..cccbcb2782 100644
--- a/lisp/org/org-beamer.el
+++ b/lisp/org/org-beamer.el
@@ -1,6 +1,6 @@
;;; org-beamer.el --- Beamer-specific LaTeX export for org-mode
;;
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;;
;; Version: 7.4
;; Author: Carsten Dominik <carsten.dominik AT gmail DOT com>
@@ -631,6 +631,5 @@ include square brackets."
(provide 'org-beamer)
-;; arch-tag: 68bac91a-a946-43a3-8173-a9269306f67c
;;; org-beamer.el ends here
diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el
index 4ecde0c47c..21a9779aa5 100644
--- a/lisp/org/org-bibtex.el
+++ b/lisp/org/org-bibtex.el
@@ -200,6 +200,5 @@
(provide 'org-bibtex)
-;; arch-tag: 83987d5a-01b8-41c7-85bc-77700f1285f5
;;; org-bibtex.el ends here
diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el
index 2ca9845214..29ca9e0ba8 100644
--- a/lisp/org/org-capture.el
+++ b/lisp/org/org-capture.el
@@ -1385,6 +1385,5 @@ The template may still contain \"%?\" for cursor positioning."
(provide 'org-capture)
-;; arch-tag: 986bf41b-8ada-4e28-bf20-e8388a7205a0
;;; org-capture.el ends here
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index d2f8317a07..f29d9a1676 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -2493,7 +2493,6 @@ The details of what will be saved are regulated by the variable
(provide 'org-clock)
-;; arch-tag: 7b42c5d4-9b36-48be-97c0-66a869daed4c
;;; org-clock.el ends here
diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el
index 955dd7cd45..d5a3e98bf1 100644
--- a/lisp/org/org-colview.el
+++ b/lisp/org/org-colview.el
@@ -1537,6 +1537,5 @@ The string should be two numbers joined with a \"-\"."
(provide 'org-colview)
-;; arch-tag: 61f5128d-747c-4983-9479-e3871fa3d73c
;;; org-colview.el ends here
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index b739d6d1b1..ec76b5cb39 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -426,6 +426,5 @@ With two arguments, return floor and remainder of their quotient."
(provide 'org-compat)
-;; arch-tag: a0a0579f-e68c-4bdf-9e55-93768b846bbe
;;; org-compat.el ends here
diff --git a/lisp/org/org-complete.el b/lisp/org/org-complete.el
index 2eb1f4c3ff..1487c4f364 100644
--- a/lisp/org/org-complete.el
+++ b/lisp/org/org-complete.el
@@ -1,6 +1,6 @@
;;; org-complete.el --- In-buffer completion code
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
;; Free Software Foundation, Inc.
;;
;; Author: Carsten Dominik <carsten at orgmode dot org>
@@ -274,6 +274,5 @@ Complete a language in the first field, the header arguments and switches."
(provide 'org-complete)
-;; arch-tag:
;;; org-complete.el ends here
diff --git a/lisp/org/org-crypt.el b/lisp/org/org-crypt.el
index 4d35cdcf71..59e44ac00a 100644
--- a/lisp/org/org-crypt.el
+++ b/lisp/org/org-crypt.el
@@ -182,6 +182,5 @@ This setting can also be overridden in the CRYPTKEY property."
(provide 'org-crypt)
-;; arch-tag: 8202ed2c-221e-4001-9e4b-54674a7e846e
;;; org-crypt.el ends here
diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el
index f2c631afe2..5d3902a999 100644
--- a/lisp/org/org-ctags.el
+++ b/lisp/org/org-ctags.el
@@ -1,6 +1,6 @@
;;; org-ctags.el - Integrate Emacs "tags" facility with org mode.
;;
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Paul Sexton <eeeickythump@gmail.com>
;; Version: 7.4
@@ -537,5 +537,4 @@ a new topic."
(provide 'org-ctags)
-;; arch-tag: 4b1ddd5a-8529-4b17-bcde-96a922d26343
;;; org-ctags.el ends here
diff --git a/lisp/org/org-datetree.el b/lisp/org/org-datetree.el
index 7746109d45..3cf62ad380 100644
--- a/lisp/org/org-datetree.el
+++ b/lisp/org/org-datetree.el
@@ -195,6 +195,5 @@ before running this command, even though the command tries to be smart."
(provide 'org-datetree)
-;; arch-tag: 1daea962-fd08-448b-9f98-6e8b511b3601
;;; org-datetree.el ends here
diff --git a/lisp/org/org-docbook.el b/lisp/org/org-docbook.el
index ca82d8ffcb..df50e49c3b 100644
--- a/lisp/org/org-docbook.el
+++ b/lisp/org/org-docbook.el
@@ -1440,5 +1440,4 @@ that need to be preserved in later phase of DocBook exporting."
(provide 'org-docbook)
-;; arch-tag: a24a127c-d365-4c2a-9e9b-f7dcb0ebfdc3
;;; org-docbook.el ends here
diff --git a/lisp/org/org-docview.el b/lisp/org/org-docview.el
index cb0f24139a..ee37d5eefd 100644
--- a/lisp/org/org-docview.el
+++ b/lisp/org/org-docview.el
@@ -1,6 +1,6 @@
;;; org-docview.el --- support for links to doc-view-mode buffers
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Jan Böcker <jan.boecker at jboecker dot de>
;; Keywords: outlines, hypermedia, calendar, wp
@@ -88,6 +88,5 @@ and append it."
(provide 'org-docview)
-;; arch-tag: dd147a78-cce1-481b-b40a-15869417debe
;;; org-docview.el ends here
diff --git a/lisp/org/org-entities.el b/lisp/org/org-entities.el
index 1c99b9eb5a..02edff2888 100644
--- a/lisp/org/org-entities.el
+++ b/lisp/org/org-entities.el
@@ -1,6 +1,6 @@
;;; org-entities.el --- Support for special entities in Org-mode
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Carsten Dominik <carsten at orgmode dot org>,
;; Ulf Stegemann <ulf at zeitform dot de>
@@ -568,6 +568,5 @@ Kind can be any of `latex', `html', `ascii', `latin1', or `utf8'."
;; coding: utf-8
;; End:
-;; arch-tag: e6bd163f-7419-4009-9c93-a74623016424
;;; org-entities.el ends here
diff --git a/lisp/org/org-exp-blocks.el b/lisp/org/org-exp-blocks.el
index 3723c1d2d2..6f1898d84a 100644
--- a/lisp/org/org-exp-blocks.el
+++ b/lisp/org/org-exp-blocks.el
@@ -352,5 +352,4 @@ other backends, it converts the comment into an EXAMPLE segment."
(provide 'org-exp-blocks)
-;; arch-tag: 1c365fe9-8808-4f72-bb15-0b00f36d8024
;;; org-exp-blocks.el ends here
diff --git a/lisp/org/org-exp.el b/lisp/org/org-exp.el
index a334c45a7f..a94a5dcfb1 100644
--- a/lisp/org/org-exp.el
+++ b/lisp/org/org-exp.el
@@ -2962,7 +2962,6 @@ The depends on the variable `org-export-copy-to-kill'."
(provide 'org-exp)
-;; arch-tag: 65985fe9-095c-49c7-a7b6-cb4ee15c0a95
;;; org-exp.el ends here
diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el
index d4f458232c..0dbd767873 100644
--- a/lisp/org/org-faces.el
+++ b/lisp/org/org-faces.el
@@ -716,6 +716,5 @@ level org-n-level-faces"
(provide 'org-faces)
-;; arch-tag: 9dab5f91-c4b9-4d6f-bac3-1f6211ad0a04
;;; org-faces.el ends here
diff --git a/lisp/org/org-feed.el b/lisp/org/org-feed.el
index 27a96f7be2..5b3da305d0 100644
--- a/lisp/org/org-feed.el
+++ b/lisp/org/org-feed.el
@@ -674,5 +674,4 @@ formatted as a string, not the original XML data."
(provide 'org-feed)
-;; arch-tag: 0929b557-9bc4-47f4-9633-30a12dbb5ae2
;;; org-feed.el ends here
diff --git a/lisp/org/org-footnote.el b/lisp/org/org-footnote.el
index 24ec581e75..18f1bb76ff 100644
--- a/lisp/org/org-footnote.el
+++ b/lisp/org/org-footnote.el
@@ -585,6 +585,5 @@ and all references of a footnote label."
(provide 'org-footnote)
-;; arch-tag: 1b5954df-fb5d-4da5-8709-78d944dbfc37
;;; org-footnote.el ends here
diff --git a/lisp/org/org-freemind.el b/lisp/org/org-freemind.el
index 8027eb505e..7022b41f4f 100644
--- a/lisp/org/org-freemind.el
+++ b/lisp/org/org-freemind.el
@@ -1237,7 +1237,6 @@ PATH should be a list of steps, where each step has the form
(provide 'org-freemind)
-;; arch-tag: e7b0d776-94fd-404a-b35e-0f855fae3627
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; org-freemind.el ends here
diff --git a/lisp/org/org-gnus.el b/lisp/org/org-gnus.el
index 7a449c793f..7e20e541a1 100644
--- a/lisp/org/org-gnus.el
+++ b/lisp/org/org-gnus.el
@@ -258,6 +258,5 @@ If `org-store-link' was called with a prefix arg the meaning of
(provide 'org-gnus)
-;; arch-tag: 512e0840-58fa-45b3-b456-71e10fa2376d
;;; org-gnus.el ends here
diff --git a/lisp/org/org-habit.el b/lisp/org/org-habit.el
index ec58b746d6..4812bea927 100644
--- a/lisp/org/org-habit.el
+++ b/lisp/org/org-habit.el
@@ -350,6 +350,5 @@ current time."
(provide 'org-habit)
-;; arch-tag: 64e070d9-bd09-4917-bd44-44465f5ed348
;;; org-habit.el ends here
diff --git a/lisp/org/org-html.el b/lisp/org/org-html.el
index 8be5709e1d..fe2b888c07 100644
--- a/lisp/org/org-html.el
+++ b/lisp/org/org-html.el
@@ -2415,5 +2415,4 @@ Replaces invalid characters with \"_\" and then prepends a prefix."
(provide 'org-html)
-;; arch-tag: 8109d84d-eb8f-460b-b1a8-f45f3a6c7ea1
;;; org-html.el ends here
diff --git a/lisp/org/org-icalendar.el b/lisp/org/org-icalendar.el
index 346e049653..8665a3be8c 100644
--- a/lisp/org/org-icalendar.el
+++ b/lisp/org/org-icalendar.el
@@ -651,5 +651,4 @@ a time), or the day by one (if it does not contain a time)."
(provide 'org-icalendar)
-;; arch-tag: 2dee2b6e-9211-4aee-8a47-a3c7e5bc30cf
;;; org-icalendar.el ends here
diff --git a/lisp/org/org-id.el b/lisp/org/org-id.el
index 9c5ac9ec62..5e704fa872 100644
--- a/lisp/org/org-id.el
+++ b/lisp/org/org-id.el
@@ -642,6 +642,5 @@ optional argument MARKERP, return the position as a new marker."
;;; org-id.el ends here
-;; arch-tag: e5abaca4-e16f-4b25-832a-540cfb63a712
diff --git a/lisp/org/org-indent.el b/lisp/org/org-indent.el
index 43c7a2bb1c..b77b63a4f2 100644
--- a/lisp/org/org-indent.el
+++ b/lisp/org/org-indent.el
@@ -322,5 +322,4 @@ Point is assumed to be at the beginning of a headline."
(provide 'org-indent)
-;; arch-tag: b76736bc-9f4a-43cd-977c-ecfd6689846a
;;; org-indent.el ends here
diff --git a/lisp/org/org-info.el b/lisp/org/org-info.el
index f3a4bddbc4..8b5a542c64 100644
--- a/lisp/org/org-info.el
+++ b/lisp/org/org-info.el
@@ -78,6 +78,5 @@
(provide 'org-info)
-;; arch-tag: 1e289f54-7176-487f-b575-dd4854bab15e
;;; org-info.el ends here
diff --git a/lisp/org/org-install.el b/lisp/org/org-install.el
index 3bd9d9356f..65c131f180 100644
--- a/lisp/org/org-install.el
+++ b/lisp/org/org-install.el
@@ -35,5 +35,4 @@
(provide 'org-install)
-;; arch-tag: 0614acb4-47a3-4e7b-918a-aa3149792bcc
;;; org-install.el ends here
diff --git a/lisp/org/org-irc.el b/lisp/org/org-irc.el
index f5a6e8168a..7bd530d872 100644
--- a/lisp/org/org-irc.el
+++ b/lisp/org/org-irc.el
@@ -251,6 +251,5 @@ default."
(provide 'org-irc)
-;; arch-tag: 018d7dda-53b8-4a35-ba92-6670939e525a
;;; org-irc.el ends here
diff --git a/lisp/org/org-jsinfo.el b/lisp/org/org-jsinfo.el
index edd13be2b9..770b0cd363 100644
--- a/lisp/org/org-jsinfo.el
+++ b/lisp/org/org-jsinfo.el
@@ -205,6 +205,5 @@ Option settings will replace the %MANAGER-OPTIONS cookie."
(provide 'org-infojs)
(provide 'org-jsinfo)
-;; arch-tag: c71d1d85-3337-4817-a066-725e74ac9eac
;;; org-jsinfo.el ends here
diff --git a/lisp/org/org-latex.el b/lisp/org/org-latex.el
index 7f07052ee5..b1650fd948 100644
--- a/lisp/org/org-latex.el
+++ b/lisp/org/org-latex.el
@@ -2573,6 +2573,5 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
(provide 'org-export-latex)
(provide 'org-latex)
-;; arch-tag: 23c2b87d-da04-4c2d-ad2d-1eb6487bc3ad
;;; org-latex.el ends here
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index 0bbc7f33c5..11491dfe69 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -2288,5 +2288,4 @@ with overruling parameters for `org-list-to-generic'."
(provide 'org-list)
-;; arch-tag: 73cf50c1-200f-4d1d-8a53-4e842a5b11c8
;;; org-list.el ends here
diff --git a/lisp/org/org-mac-message.el b/lisp/org/org-mac-message.el
index 6190fe7938..908473b513 100644
--- a/lisp/org/org-mac-message.el
+++ b/lisp/org/org-mac-message.el
@@ -214,6 +214,5 @@ list of message:// links to flagged mail after heading."
(provide 'org-mac-message)
-;; arch-tag: 3806d0c1-abe1-4db6-9c31-f3ed7d4a9b32
;;; org-mac-message.el ends here
diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index 2af2deb61b..b1f3d81a18 100644
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -344,6 +344,5 @@ The number of levels is controlled by `org-inlinetask-min-level'"
(provide 'org-macs)
-;; arch-tag: 7e6a73ce-aac9-4fc0-9b30-ce6f89dc6668
;;; org-macs.el ends here
diff --git a/lisp/org/org-mew.el b/lisp/org/org-mew.el
index d1800093d0..3a1efa15d2 100644
--- a/lisp/org/org-mew.el
+++ b/lisp/org/org-mew.el
@@ -135,6 +135,5 @@
(provide 'org-mew)
-;; arch-tag: 07ccdca7-6020-4941-a593-588a1e51b870
;;; org-mew.el ends here
diff --git a/lisp/org/org-mhe.el b/lisp/org/org-mhe.el
index d3314ce3f5..f6df2fc58d 100644
--- a/lisp/org/org-mhe.el
+++ b/lisp/org/org-mhe.el
@@ -225,6 +225,5 @@ folders."
(provide 'org-mhe)
-;; arch-tag: dcb05484-8627-491d-a8c1-01dbd2bde4ae
;;; org-mhe.el ends here
diff --git a/lisp/org/org-mks.el b/lisp/org/org-mks.el
index df4ab3e2e7..8acf7ce094 100644
--- a/lisp/org/org-mks.el
+++ b/lisp/org/org-mks.el
@@ -1,6 +1,6 @@
;;; org-mks.el --- Multi-key-selection for Org-mode
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
@@ -132,6 +132,5 @@ only the bare key is returned."
(provide 'org-mks)
-;; arch-tag: 4ea90d0e-c6e4-4684-bd61-baf878712f9f
;;; org-mks.el ends here
diff --git a/lisp/org/org-mobile.el b/lisp/org/org-mobile.el
index 86c2e34639..833b672c49 100644
--- a/lisp/org/org-mobile.el
+++ b/lisp/org/org-mobile.el
@@ -1083,7 +1083,6 @@ A and B must be strings or nil."
(provide 'org-mobile)
-;; arch-tag: ace0e26c-58f2-4309-8a61-05ec1535f658
;;; org-mobile.el ends here
diff --git a/lisp/org/org-mouse.el b/lisp/org/org-mouse.el
index b26fcc7db6..26db67fd4f 100644
--- a/lisp/org/org-mouse.el
+++ b/lisp/org/org-mouse.el
@@ -1143,6 +1143,5 @@ This means, between the beginning of line and the point."
(provide 'org-mouse)
-;; arch-tag: ff1ae557-3529-41a3-95c6-baaebdcc280f
;;; org-mouse.el ends here
diff --git a/lisp/org/org-plot.el b/lisp/org/org-plot.el
index eea05716c3..bb3e77abce 100644
--- a/lisp/org/org-plot.el
+++ b/lisp/org/org-plot.el
@@ -350,5 +350,4 @@ line directly before or after the table."
(provide 'org-plot)
-;; arch-tag: 5763f7c6-0c75-416d-b070-398ee4ec0eca
;;; org-plot.el ends here
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index 889303717c..c6791386b6 100644
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -704,5 +704,4 @@ project-plist is the CDR of an element in `org-publish-project-alist', reuse
(provide 'org-protocol)
-;; arch-tag: b5c5c2ac-77cf-4a94-a649-2163dff95846
;;; org-protocol.el ends here
diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el
index 46d9d9e1a3..4a0a46f991 100644
--- a/lisp/org/org-publish.el
+++ b/lisp/org/org-publish.el
@@ -1,5 +1,6 @@
;;; org-publish.el --- publish related org-mode files as a website
-;; Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: David O'Toole <dto@gnu.org>
;; Maintainer: Carsten Dominik <carsten DOT dominik AT gmail DOT com>
@@ -1076,6 +1077,5 @@ Returns value on success, else nil."
(provide 'org-publish)
-;; arch-tag: 72807f3c-8af0-4a6b-8dca-c3376eb25adb
;;; org-publish.el ends here
diff --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el
index 20227d42d6..c3b5109798 100644
--- a/lisp/org/org-remember.el
+++ b/lisp/org/org-remember.el
@@ -1148,7 +1148,6 @@ See also the variable `org-reverse-note-order'."
(provide 'org-remember)
-;; arch-tag: 497f30d0-4bc3-4097-8622-2d27ac5f2698
;;; org-remember.el ends here
diff --git a/lisp/org/org-rmail.el b/lisp/org/org-rmail.el
index c3b7d4532c..0410841862 100644
--- a/lisp/org/org-rmail.el
+++ b/lisp/org/org-rmail.el
@@ -115,6 +115,5 @@
(provide 'org-rmail)
-;; arch-tag: c6cf4a8b-6639-4b7f-821f-bdf10746b173
;;; org-rmail.el ends here
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el
index 16760461e8..105245d6e6 100644
--- a/lisp/org/org-src.el
+++ b/lisp/org/org-src.el
@@ -807,5 +807,4 @@ LANG is a string, and the returned major mode is a symbol."
(provide 'org-src)
-;; arch-tag: 6a1fc84f-dec7-47be-a416-64be56bea5d8
;;; org-src.el ends here
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index b8f781e90a..905fbda2c1 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -4393,6 +4393,5 @@ list of the fields in the rectangle ."
(provide 'org-table)
-;; arch-tag: 4d21cfdd-0268-440a-84b0-09237a0fe0ef
;;; org-table.el ends here
diff --git a/lisp/org/org-taskjuggler.el b/lisp/org/org-taskjuggler.el
index d78e10d56a..ff6e9ffc71 100644
--- a/lisp/org/org-taskjuggler.el
+++ b/lisp/org/org-taskjuggler.el
@@ -1,6 +1,6 @@
;;; org-taskjuggler.el --- TaskJuggler exporter for org-mode
;;
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;;
;; Emacs Lisp Archive Entry
;; Filename: org-taskjuggler.el
diff --git a/lisp/org/org-timer.el b/lisp/org/org-timer.el
index ccac0790af..a999522023 100644
--- a/lisp/org/org-timer.el
+++ b/lisp/org/org-timer.el
@@ -394,6 +394,5 @@ replace any running timer."
(provide 'org-timer)
-;; arch-tag: 97538f8c-3871-4509-8f23-1e7b3ff3d107
;;; org-timer.el ends here
diff --git a/lisp/org/org-vm.el b/lisp/org/org-vm.el
index f1fbca7aaa..4f13823652 100644
--- a/lisp/org/org-vm.el
+++ b/lisp/org/org-vm.el
@@ -138,6 +138,5 @@
(provide 'org-vm)
-;; arch-tag: cbc3047b-935e-4d2a-96e7-c5b0117aaa6d
;;; org-vm.el ends here
diff --git a/lisp/org/org-w3m.el b/lisp/org/org-w3m.el
index 759f6eefd6..fe7a8ef97f 100644
--- a/lisp/org/org-w3m.el
+++ b/lisp/org/org-w3m.el
@@ -168,6 +168,5 @@ Return t if there is no previous link; otherwise, return nil."
(provide 'org-w3m)
-;; arch-tag: 851d7447-488d-49f0-a14d-46c092e84352
;;; org-w3m.el ends here
diff --git a/lisp/org/org-wl.el b/lisp/org/org-wl.el
index 3b1c895f2b..7094536a61 100644
--- a/lisp/org/org-wl.el
+++ b/lisp/org/org-wl.el
@@ -310,6 +310,5 @@ for namazu index."
(provide 'org-wl)
-;; arch-tag: 29b75a0f-ef2e-430b-8abc-acff75bde54a
;;; org-wl.el ends here
diff --git a/lisp/org/org-xoxo.el b/lisp/org/org-xoxo.el
index f1ce87a2fb..4236765a3b 100644
--- a/lisp/org/org-xoxo.el
+++ b/lisp/org/org-xoxo.el
@@ -124,5 +124,4 @@ The XOXO buffer is named *xoxo-<source buffer name>*"
(provide 'org-xoxo)
-;; arch-tag: 16e6a31f-f4f5-46f1-af18-48dc89faa702
;;; org-xoxo.el ends here
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 33d01e4896..9640dbbe01 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -19642,6 +19642,5 @@ Still experimental, may disappear in the future."
(run-hooks 'org-load-hook)
-;; arch-tag: e77da1a7-acc7-4336-b19e-efa25af3f9fd
;;; org.el ends here
diff --git a/lisp/outline.el b/lisp/outline.el
index 4729f3665d..14754372c2 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -1,7 +1,8 @@
;;; outline.el --- outline mode commands for Emacs
;; Copyright (C) 1986, 1993, 1994, 1995, 1997, 2000, 2001, 2002,
-;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: outlines
@@ -1118,5 +1119,4 @@ convenient way to make a table of contents of the buffer."
(provide 'outline)
(provide 'noutline)
-;; arch-tag: 1724410e-7d4d-4f46-b801-49e18171e874
;;; outline.el ends here
diff --git a/lisp/password-cache.el b/lisp/password-cache.el
index fe2d1ec271..7011a76665 100644
--- a/lisp/password-cache.el
+++ b/lisp/password-cache.el
@@ -1,7 +1,7 @@
;;; password-cache.el --- Read passwords, possibly using a password cache.
-;; Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+;; 2010, 2011 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org>
;; Created: 2003-12-21
diff --git a/lisp/patcomp.el b/lisp/patcomp.el
index b542dc27f4..c1965a763c 100644
--- a/lisp/patcomp.el
+++ b/lisp/patcomp.el
@@ -19,5 +19,4 @@ It uses the command line arguments to specify the files to compile."
(let ((load-path (list (expand-file-name "lisp"))))
(batch-byte-compile)))
-;; arch-tag: cb299b78-1d6c-4c02-945b-12fa2e856d6f
;;; patcomp.el ends here
diff --git a/lisp/paths.el b/lisp/paths.el
index f18bba90a1..b7d476a763 100644
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -186,5 +186,4 @@ If non-nil, Emacs startup does (load (concat term-file-prefix (getenv \"TERM\"))
You may set this variable to nil in your `.emacs' file if you do not wish
the terminal-initialization file to be loaded.")
-;; arch-tag: bae27ffb-9944-4c87-b569-30d4635a99e1
;;; paths.el ends here
diff --git a/lisp/pcmpl-cvs.el b/lisp/pcmpl-cvs.el
index b960ec215e..b12c7170eb 100644
--- a/lisp/pcmpl-cvs.el
+++ b/lisp/pcmpl-cvs.el
@@ -185,5 +185,4 @@ operation character applies, as displayed by 'cvs -n update'."
(setq pcomplete-stub nondir)
(pcomplete-uniqify-list entries)))
-;; arch-tag: d2aeac43-4bf5-4509-a496-74b863c6642b
;;; pcmpl-cvs.el ends here
diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el
index 196be69abd..60e2e6aa2d 100644
--- a/lisp/pcmpl-gnu.el
+++ b/lisp/pcmpl-gnu.el
@@ -307,5 +307,4 @@
;;;###autoload
(defalias 'pcomplete/gdb 'pcomplete/xargs)
-;; arch-tag: 06d2b429-dcb1-4a57-84e1-f70d87781183
;;; pcmpl-gnu.el ends here
diff --git a/lisp/pcmpl-linux.el b/lisp/pcmpl-linux.el
index 38e7270482..85731a83a8 100644
--- a/lisp/pcmpl-linux.el
+++ b/lisp/pcmpl-linux.el
@@ -99,5 +99,4 @@
(pcomplete-uniqify-list points)
(cons "swap" (pcmpl-linux-mounted-directories))))))
-;; arch-tag: bb0961a6-a623-463d-92c6-497c317293b1
;;; pcmpl-linux.el ends here
diff --git a/lisp/pcmpl-rpm.el b/lisp/pcmpl-rpm.el
index cf6158da3f..4cf2a3055e 100644
--- a/lisp/pcmpl-rpm.el
+++ b/lisp/pcmpl-rpm.el
@@ -322,5 +322,4 @@
(provide 'pcmpl-rpm)
-;; arch-tag: 4e64b490-fecf-430e-b2b9-70a8ad64b8c1
;;; pcmpl-rpm.el ends here
diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el
index b4c79831a5..9b3857842f 100644
--- a/lisp/pcmpl-unix.el
+++ b/lisp/pcmpl-unix.el
@@ -171,5 +171,4 @@ Includes files as well as host names followed by a colon."
(provide 'pcmpl-unix)
-;; arch-tag: 3f9eb5af-7e0e-449d-b586-381cbbf8fc5c
;;; pcmpl-unix.el ends here
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index 369285a565..d51fb22e53 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -1391,5 +1391,4 @@ Returns the resultant list."
(provide 'pcomplete)
-;; arch-tag: ae32ef2d-dbed-4244-8b0f-cf5a2a3b07a4
;;; pcomplete.el ends here
diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el
index b921f86a65..34b9f4b38a 100644
--- a/lisp/play/5x5.el
+++ b/lisp/play/5x5.el
@@ -512,5 +512,4 @@ in progress because it is an animated attempt."
(provide '5x5)
-;; arch-tag: ec4dabd5-572d-41ea-b48c-ec5ce0d68fa9
;;; 5x5.el ends here
diff --git a/lisp/play/animate.el b/lisp/play/animate.el
index 505468b363..48e1bc4fde 100644
--- a/lisp/play/animate.el
+++ b/lisp/play/animate.el
@@ -191,5 +191,4 @@ You can specify the one's name by NAME; the default value is \"Sarah\"."
(provide 'animate)
-;; arch-tag: 275289a3-6ac4-41da-b527-a1147045392f
;;; animate.el ends here
diff --git a/lisp/play/blackbox.el b/lisp/play/blackbox.el
index b197060a75..db901576af 100644
--- a/lisp/play/blackbox.el
+++ b/lisp/play/blackbox.el
@@ -434,5 +434,4 @@ a reflection."
(provide 'blackbox)
-;; arch-tag: 6c474c62-5617-4b10-9b44-ac430168c0e2
;;; blackbox.el ends here
diff --git a/lisp/play/bruce.el b/lisp/play/bruce.el
index 22772f4e3d..4a9d61a3f9 100644
--- a/lisp/play/bruce.el
+++ b/lisp/play/bruce.el
@@ -146,5 +146,4 @@
(provide 'bruce)
-;; arch-tag: b83ded51-4ccb-41ef-8bd6-3b521e81dd9b
;;; bruce.el ends here
diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el
index eb624ca959..5cf813fa95 100644
--- a/lisp/play/bubbles.el
+++ b/lisp/play/bubbles.el
@@ -1460,5 +1460,4 @@ Return t if new char is non-empty."
(provide 'bubbles)
-;; arch-tag: 2cd7237a-b0ad-400d-a7fd-75f676dceb70
;;; bubbles.el ends here
diff --git a/lisp/play/cookie1.el b/lisp/play/cookie1.el
index dc984d1094..8073758c91 100644
--- a/lisp/play/cookie1.el
+++ b/lisp/play/cookie1.el
@@ -164,5 +164,4 @@ Optional fifth arg REQUIRE-MATCH non-nil forces a matching cookie."
(provide 'cookie1)
-;; arch-tag: 4a8a8712-df6a-4f34-b030-108a1b47f9f2
;;; cookie1.el ends here
diff --git a/lisp/play/dissociate.el b/lisp/play/dissociate.el
index 17ec375035..dacaf6e7b6 100644
--- a/lisp/play/dissociate.el
+++ b/lisp/play/dissociate.el
@@ -99,5 +99,4 @@ Default is 2."
(provide 'dissociate)
-;; arch-tag: 90d197d1-409b-45c5-a0b5-fbfb2e06334f
;;; dissociate.el ends here
diff --git a/lisp/play/dunnet.el b/lisp/play/dunnet.el
index 2d59d205f3..c93260c69f 100644
--- a/lisp/play/dunnet.el
+++ b/lisp/play/dunnet.el
@@ -3357,5 +3357,4 @@ File not found")))
(provide 'dunnet)
-;; arch-tag: 4cc8e47c-d9e1-4ef4-936b-578e7f529558
;;; dunnet.el ends here
diff --git a/lisp/play/gamegrid.el b/lisp/play/gamegrid.el
index 82be2bfbca..10c2c45c17 100644
--- a/lisp/play/gamegrid.el
+++ b/lisp/play/gamegrid.el
@@ -597,5 +597,4 @@ FILE is created there."
(provide 'gamegrid)
-;; arch-tag: a96c2ff4-1c12-427e-bd3d-faeaf174cd46
;;; gamegrid.el ends here
diff --git a/lisp/play/handwrite.el b/lisp/play/handwrite.el
index 21e3d912fe..a055ecaa7d 100644
--- a/lisp/play/handwrite.el
+++ b/lisp/play/handwrite.el
@@ -1323,5 +1323,4 @@ end
(provide 'handwrite)
-;; arch-tag: f2285ae9-e41b-4c96-8343-87dce41e44b7
;;; handwrite.el ends here
diff --git a/lisp/play/hanoi.el b/lisp/play/hanoi.el
index 5185b81091..767792babb 100644
--- a/lisp/play/hanoi.el
+++ b/lisp/play/hanoi.el
@@ -447,5 +447,4 @@ BITS must be of length nrings. Start at START-TIME."
(provide 'hanoi)
-;; arch-tag: 7a901659-4346-495c-8883-14cbf540610c
;;; hanoi.el ends here
diff --git a/lisp/play/life.el b/lisp/play/life.el
index b4f9848baa..36bfa633d1 100644
--- a/lisp/play/life.el
+++ b/lisp/play/life.el
@@ -1,7 +1,7 @@
;;; life.el --- John Horton Conway's `Life' game for GNU Emacs
-;; Copyright (C) 1988, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Kyle Jones <kyleuunet.uu.net>
;; Maintainer: FSF
diff --git a/lisp/play/meese.el b/lisp/play/meese.el
index 115befa6c3..d811dacb9b 100644
--- a/lisp/play/meese.el
+++ b/lisp/play/meese.el
@@ -34,5 +34,4 @@
(add-hook 'find-file-hook 'protect-innocence-hook)
(provide 'meese)
-;; arch-tag: 47af12d2-6a7d-4e2e-a1ea-eae75a77e3f0
;;; meese.el ends here
diff --git a/lisp/play/morse.el b/lisp/play/morse.el
index 75fe4a9552..8ae8b0366a 100644
--- a/lisp/play/morse.el
+++ b/lisp/play/morse.el
@@ -139,5 +139,4 @@
(provide 'morse)
-;; arch-tag: 3331e6c1-9a9e-453f-abfd-163a9c3f93a6
;;; morse.el ends here
diff --git a/lisp/play/mpuz.el b/lisp/play/mpuz.el
index bb7cac1bce..fd4951f7b4 100644
--- a/lisp/play/mpuz.el
+++ b/lisp/play/mpuz.el
@@ -519,5 +519,4 @@ You may abort a game by typing \\<mpuz-mode-map>\\[mpuz-offer-abort]."
(provide 'mpuz)
-;; arch-tag: 2781d6ba-89e7-43b5-85c7-5d3a2e73feb1
;;; mpuz.el ends here
diff --git a/lisp/play/pong.el b/lisp/play/pong.el
index a697e27ae7..2e17ebff36 100644
--- a/lisp/play/pong.el
+++ b/lisp/play/pong.el
@@ -458,5 +458,4 @@ pong-mode keybindings:\\<pong-mode-map>
(provide 'pong)
-;; arch-tag: 1fdf0fc5-13e2-4de4-aae4-09bdd5af99f3
;;; pong.el ends here
diff --git a/lisp/play/snake.el b/lisp/play/snake.el
index 7716ab6bb7..810b38454d 100644
--- a/lisp/play/snake.el
+++ b/lisp/play/snake.el
@@ -412,5 +412,4 @@ Snake mode keybindings:
(provide 'snake)
-;; arch-tag: 512ffc92-cfac-4287-9a4e-92890701a5c8
;;; snake.el ends here
diff --git a/lisp/play/solitaire.el b/lisp/play/solitaire.el
index 51d32740ca..a0da99ef42 100644
--- a/lisp/play/solitaire.el
+++ b/lisp/play/solitaire.el
@@ -447,5 +447,4 @@ Seen in info on text lines."
(provide 'solitaire)
-;; arch-tag: 1b18ee1c-1e79-4a5b-8658-9560b82e63dd
;;; solitaire.el ends here
diff --git a/lisp/play/spook.el b/lisp/play/spook.el
index d96e6159cb..fc9d671d43 100644
--- a/lisp/play/spook.el
+++ b/lisp/play/spook.el
@@ -76,5 +76,4 @@
(provide 'spook)
-;; arch-tag: c682b61f-92b6-4492-9c0d-2367e562449c
;;; spook.el ends here
diff --git a/lisp/play/studly.el b/lisp/play/studly.el
index b9bd173d5f..d28304df1e 100644
--- a/lisp/play/studly.el
+++ b/lisp/play/studly.el
@@ -68,5 +68,4 @@
(provide 'studly)
-;; arch-tag: 0dbf5a60-d2e6-48c2-86ae-77fc8575ac67
;;; studly.el ends here
diff --git a/lisp/play/tetris.el b/lisp/play/tetris.el
index 9d8ae7026d..b6613f7a54 100644
--- a/lisp/play/tetris.el
+++ b/lisp/play/tetris.el
@@ -641,5 +641,4 @@ tetris-mode keybindings:
(provide 'tetris)
-;; arch-tag: fb780d53-3ff0-49f0-8e19-f7f13cf2d49e
;;; tetris.el ends here
diff --git a/lisp/play/yow.el b/lisp/play/yow.el
index 6d5be50cbf..3ec594f884 100644
--- a/lisp/play/yow.el
+++ b/lisp/play/yow.el
@@ -128,5 +128,4 @@ If called interactively, display a list of matches."
(provide 'yow)
-;; arch-tag: d13db89b-84f1-4141-a5ce-261d1733a65c
;;; yow.el ends here
diff --git a/lisp/play/zone.el b/lisp/play/zone.el
index 71a2f86d30..a1782377af 100644
--- a/lisp/play/zone.el
+++ b/lisp/play/zone.el
@@ -684,5 +684,4 @@ If nil, `zone-pgm-random-life' chooses a value from 0-3 (inclusive).")
;;;;;;;;;;;;;;;
(provide 'zone)
-;; arch-tag: 7092503d-74a9-4325-a55c-a026ede58cea
;;; zone.el ends here
diff --git a/lisp/proced.el b/lisp/proced.el
index 8ed30a7968..c6c7dfd89e 100644
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -1880,5 +1880,4 @@ Killed processes cannot be recovered by Emacs."))
(provide 'proced)
-;; arch-tag: a6e312ad-9032-45aa-972d-31a8cfc545af
;;; proced.el ends here
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index e41206d438..249063fafd 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -1,7 +1,8 @@
;;; ada-mode.el --- major-mode for editing Ada sources
-;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Rolf Ebert <ebert@inf.enst.fr>
;; Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
diff --git a/lisp/progmodes/ada-stmt.el b/lisp/progmodes/ada-stmt.el
index d6d6f0c064..e35925e15d 100644
--- a/lisp/progmodes/ada-stmt.el
+++ b/lisp/progmodes/ada-stmt.el
@@ -484,5 +484,4 @@ Invoke right after `ada-function-spec' or `ada-procedure-spec'."
(provide 'ada-stmt)
-;; arch-tag: 94f51555-cc0e-44e5-8865-8788aae8ecd3
;;; ada-stmt.el ends here
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index c2950e33ed..190029f606 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -1,7 +1,8 @@
;; ada-xref.el --- for lookup and completion in Ada mode
-;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
;; Rolf Ebert <ebert@inf.enst.fr>
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index f704eec2c0..d9b036b67b 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -2667,5 +2667,4 @@ Used in `antlr-mode'. Also a useful function in `java-mode-hook'."
;;; Local IspellPersDict: .ispell_antlr
-;; arch-tag: 5de2be79-3d13-4560-8fbc-f7d0234dcb5c
;;; antlr-mode.el ends here
diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el
index 15126c4b32..b38dd169d0 100644
--- a/lisp/progmodes/asm-mode.el
+++ b/lisp/progmodes/asm-mode.el
@@ -243,5 +243,4 @@ repeatedly until you are satisfied with the kind of comment."
(provide 'asm-mode)
-;; arch-tag: 210e695f-f338-4376-8913-a4c5c72ac848
;;; asm-mode.el ends here
diff --git a/lisp/progmodes/autoconf.el b/lisp/progmodes/autoconf.el
index 7e94692c6e..1922d09d0c 100644
--- a/lisp/progmodes/autoconf.el
+++ b/lisp/progmodes/autoconf.el
@@ -99,5 +99,4 @@ searching backwards at another AC_... command."
(provide 'autoconf-mode)
(provide 'autoconf)
-;; arch-tag: 4f44778f-2ab3-49a1-a103-f0acb9df2de4
;;; autoconf.el ends here
diff --git a/lisp/progmodes/bug-reference.el b/lisp/progmodes/bug-reference.el
index c82e3ddfd8..3adb068867 100644
--- a/lisp/progmodes/bug-reference.el
+++ b/lisp/progmodes/bug-reference.el
@@ -151,5 +151,4 @@ so that it is considered safe, see `enable-local-variables'.")
(widen)
(bug-reference-unfontify (point-min) (point-max)))))
-;; arch-tag: b138abce-e5c3-475e-bd58-7afba40387ea
;;; bug-reference.el ends here
diff --git a/lisp/progmodes/cap-words.el b/lisp/progmodes/cap-words.el
index 48b1d19e01..4a6e0c3761 100644
--- a/lisp/progmodes/cap-words.el
+++ b/lisp/progmodes/cap-words.el
@@ -92,5 +92,4 @@ Obsoletes `c-forward-into-nomenclature'."
(provide 'cap-words)
-;; arch-tag: 46513b64-fe5a-4c0b-902c-ed235c22975f
;;; cap-words.el ends here
diff --git a/lisp/progmodes/cc-align.el b/lisp/progmodes/cc-align.el
index a51380ee80..b08c13248d 100644
--- a/lisp/progmodes/cc-align.el
+++ b/lisp/progmodes/cc-align.el
@@ -1333,5 +1333,4 @@ For other semicolon contexts, no determination is made."
(cc-provide 'cc-align)
-;; arch-tag: 4d71ed28-bf51-4509-a148-f39669669a2e
;;; cc-align.el ends here
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el
index 53edd81b68..d166d13b81 100644
--- a/lisp/progmodes/cc-awk.el
+++ b/lisp/progmodes/cc-awk.el
@@ -1096,5 +1096,4 @@ comment at the start of cc-engine.el for more info."
(cc-provide 'cc-awk) ; Changed from 'awk-mode, ACM 2002/5/21
-;; arch-tag: c4836289-3aa4-4a59-9934-9ccc2bacccf3
;;; awk-mode.el ends here
diff --git a/lisp/progmodes/cc-bytecomp.el b/lisp/progmodes/cc-bytecomp.el
index 126e53e3bc..1e6d9606df 100644
--- a/lisp/progmodes/cc-bytecomp.el
+++ b/lisp/progmodes/cc-bytecomp.el
@@ -434,5 +434,4 @@ exclude any functions that have been bound during compilation with
(provide 'cc-bytecomp)
-;; arch-tag: 2d71b3ad-57b0-4b13-abd3-ab836e08f975
;;; cc-bytecomp.el ends here
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 84b4ed0231..2bab7c16bd 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -4574,5 +4574,4 @@ normally bound to C-o. See `c-context-line-break' for the details."
(cc-provide 'cc-cmds)
-;; arch-tag: bf0611dc-d1f4-449e-9e45-4ec7c6936677
;;; cc-cmds.el ends here
diff --git a/lisp/progmodes/cc-compat.el b/lisp/progmodes/cc-compat.el
index e88ceed03d..a863d3da99 100644
--- a/lisp/progmodes/cc-compat.el
+++ b/lisp/progmodes/cc-compat.el
@@ -163,5 +163,4 @@ This is in addition to c-continued-statement-offset.")
(cc-provide 'cc-compat)
-;; arch-tag: 564dab2f-e6ad-499c-a4a3-fedec3ecc192
;;; cc-compat.el ends here
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index f0d9bee159..8b12aa91ce 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -2259,5 +2259,4 @@ quoted."
(cc-provide 'cc-defs)
-;; arch-tag: 3bb2629d-dd84-4ff0-ad39-584be0fe3cda
;;; cc-defs.el ends here
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 4f9e9e4e33..09ce3be018 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -1,8 +1,8 @@
;;; cc-engine.el --- core syntax guessing engine for CC mode
;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+;; 2010, 2011 Free Software Foundation, Inc.
;; Authors: 2001- Alan Mackenzie
;; 1998- Martin Stjernholm
@@ -10337,5 +10337,4 @@ Cannot combine absolute offsets %S and %S in `add' method"
(cc-provide 'cc-engine)
-;; arch-tag: 149add18-4673-4da5-ac47-6805e4eae089
;;; cc-engine.el ends here
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 44f590b332..ae5a8012e0 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -2460,5 +2460,4 @@ need for `pike-font-lock-extra-types'.")
;; 2006-07-10: awk-font-lock-keywords has been moved back to cc-awk.el.
(cc-provide 'cc-fonts)
-;; arch-tag: 2f65f405-735f-4da5-8d4b-b957844c5203
;;; cc-fonts.el ends here
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index fb0e4462d9..4fe209d97a 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -3137,5 +3137,4 @@ evaluated and should not be quoted."
(cc-provide 'cc-langs)
-;; arch-tag: 1ab57482-cfc2-4c5b-b628-3539c3098822
;;; cc-langs.el ends here
diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el
index cd14661fbc..15e85bccff 100644
--- a/lisp/progmodes/cc-menus.el
+++ b/lisp/progmodes/cc-menus.el
@@ -442,5 +442,4 @@ Example:
(cc-provide 'cc-menus)
-;; arch-tag: f6b60933-91f0-4145-ab44-70ca6d1b919b
;;; cc-menus.el ends here
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index b201a40752..c245ef2144 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1,8 +1,8 @@
;;; cc-mode.el --- major mode for editing C and similar languages
;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+;; 2010, 2011 Free Software Foundation, Inc.
;; Authors: 2003- Alan Mackenzie
;; 1998- Martin Stjernholm
@@ -1685,5 +1685,4 @@ Key bindings:
(cc-provide 'cc-mode)
-;; arch-tag: 7825e5c4-fd09-439f-a04d-4c13208ba3d7
;;; cc-mode.el ends here
diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el
index 212f0a50b0..b25061d2eb 100644
--- a/lisp/progmodes/cc-styles.el
+++ b/lisp/progmodes/cc-styles.el
@@ -656,5 +656,4 @@ any reason to call this function directly."
(cc-provide 'cc-styles)
-;; arch-tag: c764f61a-96ba-484a-a68f-101c0e9d5d2c
;;; cc-styles.el ends here
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index 215c0073e9..f39fa52ca6 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -1712,5 +1712,4 @@ It treats escaped EOLs as whitespace.")
(cc-provide 'cc-vars)
-;; arch-tag: d62e9a55-c9fe-409b-b5b6-050b6aa202c9
;;; cc-vars.el ends here
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index f380a93bef..f0140a39e8 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -250,5 +250,4 @@ to the action header."
(provide 'cfengine)
-;; arch-tag: 6b931be2-1505-4124-afa6-9675971e26d4
;;; cfengine.el ends here
diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index 4f74e40709..2a1821d559 100644
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -403,5 +403,4 @@ Optional arg DISPLAY non-nil means show messages in the echo area."
;; Cleanup.
(kill-buffer outbuf))))
-;; arch-tag: 4f20253c-71ef-4e6d-a774-19087060910e
;;; cmacexp.el ends here
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 3b4dba31cd..2542980129 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -2431,5 +2431,4 @@ The file-structure looks like this:
(provide 'compile)
-;; arch-tag: 12465727-7382-4f72-b234-79855a00dd8c
;;; compile.el ends here
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index f439cf0ef8..3bc9b467ef 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -1,8 +1,8 @@
;;; cperl-mode.el --- Perl code editing commands for Emacs
-;; Copyright (C) 1985, 1986, 1987, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
-;; 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1987, 1991, 1992, 1993, 1994, 1995, 1996,
+;; 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Ilya Zakharevich
;; Bob Olson
diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el
index c33df2d527..d47635107e 100644
--- a/lisp/progmodes/cpp.el
+++ b/lisp/progmodes/cpp.el
@@ -826,5 +826,4 @@ BRANCH should be either nil (false branch), t (true branch) or 'both."
(provide 'cpp)
-;; arch-tag: fb7d433d-745d-495a-96f0-86908ab63f74
;;; cpp.el ends here
diff --git a/lisp/progmodes/cwarn.el b/lisp/progmodes/cwarn.el
index c22f03f231..920fd3a7db 100644
--- a/lisp/progmodes/cwarn.el
+++ b/lisp/progmodes/cwarn.el
@@ -381,5 +381,4 @@ The mode is turned if some feature is enabled for the current
;;}}}
-;; arch-tag: 225fb5e2-0838-4eb1-88ce-3811c5e4d738
;;; cwarn.el ends here
diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el
index 2ee02ea6f4..8ec833c8f2 100644
--- a/lisp/progmodes/dcl-mode.el
+++ b/lisp/progmodes/dcl-mode.el
@@ -1,7 +1,7 @@
;;; dcl-mode.el --- major mode for editing DCL command files
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Odd Gripenstam <gripenstamol@decus.se>
;; Maintainer: Odd Gripenstam <gripenstamol@decus.se>
diff --git a/lisp/progmodes/delphi.el b/lisp/progmodes/delphi.el
index 9613cce7c4..68fd802629 100644
--- a/lisp/progmodes/delphi.el
+++ b/lisp/progmodes/delphi.el
@@ -2047,5 +2047,4 @@ no args, if that value is non-nil."
(run-mode-hooks 'delphi-mode-hook))
-;; arch-tag: 410e192d-e9b5-4397-ad62-12340fc3fa41
;;; delphi.el ends here
diff --git a/lisp/progmodes/ebnf-abn.el b/lisp/progmodes/ebnf-abn.el
index 88f430ad93..1151bebae6 100644
--- a/lisp/progmodes/ebnf-abn.el
+++ b/lisp/progmodes/ebnf-abn.el
@@ -664,5 +664,4 @@ See documentation for variable `ebnf-abn-lex'."
(provide 'ebnf-abn)
-;; arch-tag: 8d1b3c4d-4226-4393-b9ae-b7ccf07cf779
;;; ebnf-abn.el ends here
diff --git a/lisp/progmodes/ebnf-bnf.el b/lisp/progmodes/ebnf-bnf.el
index e7d3dcc0c9..059031f8eb 100644
--- a/lisp/progmodes/ebnf-bnf.el
+++ b/lisp/progmodes/ebnf-bnf.el
@@ -605,5 +605,4 @@ See documentation for variable `ebnf-bnf-lex'."
(provide 'ebnf-bnf)
-;; arch-tag: 3b1834d3-8367-475b-80d5-8e0bbd00ce50
;;; ebnf-bnf.el ends here
diff --git a/lisp/progmodes/ebnf-dtd.el b/lisp/progmodes/ebnf-dtd.el
index 7d86b72989..2689f1c362 100644
--- a/lisp/progmodes/ebnf-dtd.el
+++ b/lisp/progmodes/ebnf-dtd.el
@@ -1350,5 +1350,4 @@ See documentation for variable `ebnf-dtd-lex'."
(provide 'ebnf-dtd)
-;; arch-tag: c21bb640-135f-4afa-8712-fa11d86301c4
;;; ebnf-dtd.el ends here
diff --git a/lisp/progmodes/ebnf-ebx.el b/lisp/progmodes/ebnf-ebx.el
index 723343c47e..88b7be0ba2 100644
--- a/lisp/progmodes/ebnf-ebx.el
+++ b/lisp/progmodes/ebnf-ebx.el
@@ -669,5 +669,4 @@ See documentation for variable `ebnf-ebx-lex'."
(provide 'ebnf-ebx)
-;; arch-tag: bfe2f95b-66bc-4dc6-8b7e-b7831e68f5fb
;;; ebnf-ebx.el ends here
diff --git a/lisp/progmodes/ebnf-iso.el b/lisp/progmodes/ebnf-iso.el
index 36048c737a..e606f1767d 100644
--- a/lisp/progmodes/ebnf-iso.el
+++ b/lisp/progmodes/ebnf-iso.el
@@ -612,5 +612,4 @@ See documentation for variable `ebnf-iso-lex'."
(provide 'ebnf-iso)
-;; arch-tag: 03315eef-8f64-404a-bf9d-256d42442ee3
;;; ebnf-iso.el ends here
diff --git a/lisp/progmodes/ebnf-otz.el b/lisp/progmodes/ebnf-otz.el
index af602eafac..169ea128e8 100644
--- a/lisp/progmodes/ebnf-otz.el
+++ b/lisp/progmodes/ebnf-otz.el
@@ -697,5 +697,4 @@
(provide 'ebnf-otz)
-;; arch-tag: 7ef2249d-9e8b-4bc1-999f-95d784690636
;;; ebnf-otz.el ends here
diff --git a/lisp/progmodes/ebnf-yac.el b/lisp/progmodes/ebnf-yac.el
index 5dde3758e4..d1341a391a 100644
--- a/lisp/progmodes/ebnf-yac.el
+++ b/lisp/progmodes/ebnf-yac.el
@@ -513,5 +513,4 @@ See documentation for variable `ebnf-yac-lex'."
(provide 'ebnf-yac)
-;; arch-tag: 8a96989c-0b1d-42ba-a020-b2901f9a2a4d
;;; ebnf-yac.el ends here
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index 6bb4ca6908..2cdc9fedcb 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -1,7 +1,7 @@
;;; ebnf2ps.el --- translate an EBNF to a syntactic chart on PostScript
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index 36ff0703b6..f3c9178d9f 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -1,7 +1,7 @@
;;; ebrowse.el --- Emacs C++ class browser & tags facility
-;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-;; 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
;; Free Software Foundation Inc.
;; Author: Gerd Moellmann <gerd@gnu.org>
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 225e3fe8d0..20a6c221db 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1,8 +1,8 @@
;;; etags.el --- etags facility for Emacs
-;; Copyright (C) 1985, 1986, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1998,
-;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1988, 1989, 1992, 1993, 1994, 1995, 1996,
+;; 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+;; 2010, 2011 Free Software Foundation, Inc.
;; Author: Roland McGrath <roland@gnu.org>
;; Maintainer: FSF
diff --git a/lisp/progmodes/executable.el b/lisp/progmodes/executable.el
index 61d0c5ec5c..c200d99eb8 100644
--- a/lisp/progmodes/executable.el
+++ b/lisp/progmodes/executable.el
@@ -276,5 +276,4 @@ file modes."
(provide 'executable)
-;; arch-tag: 58458d1c-d9db-45ec-942b-8bbb1d5e319d
;;; executable.el ends here
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index d8c7cd3e7d..111c12754e 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -2214,5 +2214,4 @@ escape character."
(provide 'f90)
-;; arch-tag: fceac97c-c147-44bd-aec0-172d4b560ef8
;;; f90.el ends here
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index f3f7e61737..a6b1b473be 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -1,6 +1,6 @@
;;; gdb-mi.el --- User Interface for running GDB
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Nick Roberts <nickrob@gnu.org>
;; Maintainer: FSF
diff --git a/lisp/progmodes/glasses.el b/lisp/progmodes/glasses.el
index a95d1a5c00..aaa37280b0 100644
--- a/lisp/progmodes/glasses.el
+++ b/lisp/progmodes/glasses.el
@@ -329,5 +329,4 @@ at places they belong to."
(provide 'glasses)
-;; arch-tag: a3515167-c89e-484f-90a1-d85143e52b12
;;; glasses.el ends here
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 8e36d3f5c6..b709c6b94c 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -565,7 +565,10 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
(unless grep-find-command
(setq grep-find-command
(cond ((eq grep-find-use-xargs 'gnu)
- (format "%s . -type f -print0 | %s -0 -e %s"
+ ;; Windows shells need the program file name
+ ;; after the pipe symbol be quoted if they use
+ ;; forward slashes as directory separators.
+ (format "%s . -type f -print0 | \"%s\" -0 -e %s"
find-program xargs-program grep-command))
((eq grep-find-use-xargs 'exec)
(let ((cmd0 (format "%s . -type f -exec %s"
@@ -576,21 +579,21 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
(shell-quote-argument ";"))
(1+ (length cmd0)))))
(t
- (format "%s . -type f -print | %s %s"
+ (format "%s . -type f -print | \"%s\" %s"
find-program xargs-program grep-command)))))
(unless grep-find-template
(setq grep-find-template
(let ((gcmd (format "%s <C> %s <R>"
grep-program grep-options)))
(cond ((eq grep-find-use-xargs 'gnu)
- (format "%s . <X> -type f <F> -print0 | %s -0 -e %s"
+ (format "%s . <X> -type f <F> -print0 | \"%s\" -0 -e %s"
find-program xargs-program gcmd))
((eq grep-find-use-xargs 'exec)
(format "%s . <X> -type f <F> -exec %s {} %s %s"
find-program gcmd null-device
(shell-quote-argument ";")))
(t
- (format "%s . <X> -type f <F> -print | %s %s"
+ (format "%s . <X> -type f <F> -print | \"%s\" %s"
find-program xargs-program gcmd))))))))
(when (eq grep-highlight-matches 'auto-detect)
(setq grep-highlight-matches
@@ -1046,5 +1049,4 @@ file name to `*.gz', and sets `grep-highlight-matches' to `always'."
(provide 'grep)
-;; arch-tag: 5a5b9169-a79d-4f38-9c38-f69615f39c4d
;;; grep.el ends here
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 7d5a219e86..dc97b0913d 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -3471,5 +3471,4 @@ so they have been disabled."))
(provide 'gud)
-;; arch-tag: 6d990948-df65-461a-be39-1c7fb83ac4c4
;;; gud.el ends here
diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index a3bf7e5d17..114d7fbed6 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -965,5 +965,4 @@ Key bindings:
(provide 'hideshow)
-;; arch-tag: 378b6852-e82a-466a-aee8-d9c73859a65e
;;; hideshow.el ends here
diff --git a/lisp/progmodes/icon.el b/lisp/progmodes/icon.el
index a6ce47bc07..e256c1f410 100644
--- a/lisp/progmodes/icon.el
+++ b/lisp/progmodes/icon.el
@@ -1,7 +1,7 @@
;;; icon.el --- mode for editing Icon code
-;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Chris Smith <csmith@convex.com>
;; Created: 15 Feb 89
diff --git a/lisp/progmodes/idlw-complete-structtag.el b/lisp/progmodes/idlw-complete-structtag.el
index c51ffe4402..032399eb05 100644
--- a/lisp/progmodes/idlw-complete-structtag.el
+++ b/lisp/progmodes/idlw-complete-structtag.el
@@ -1,7 +1,7 @@
;;; idlw-complete-structtag.el --- Completion of structure tags.
-;; 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: Carsten Dominik <dominik@astro.uva.nl>
;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
diff --git a/lisp/progmodes/idlw-toolbar.el b/lisp/progmodes/idlw-toolbar.el
index e325a01777..b4183065e4 100644
--- a/lisp/progmodes/idlw-toolbar.el
+++ b/lisp/progmodes/idlw-toolbar.el
@@ -969,5 +969,4 @@ static char * file[] = {
(provide 'idlw-toolbar)
(provide 'idlwave-toolbar)
-;; arch-tag: ec9a3717-c44c-4716-9bda-cdacbe5ddb62
;;; idlw-toolbar.el ends here
diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el
index 21a701e7d5..dd3f6a1262 100644
--- a/lisp/progmodes/inf-lisp.el
+++ b/lisp/progmodes/inf-lisp.el
@@ -653,5 +653,4 @@ See variable `lisp-describe-sym-command'."
(provide 'inf-lisp)
-;; arch-tag: 5b74abc3-a085-4b91-8ab8-8da6899d3b92
;;; inf-lisp.el ends here
diff --git a/lisp/progmodes/ld-script.el b/lisp/progmodes/ld-script.el
index 4db90261fa..d6071c2cde 100644
--- a/lisp/progmodes/ld-script.el
+++ b/lisp/progmodes/ld-script.el
@@ -1,7 +1,7 @@
;;; ld-script.el --- GNU linker script editing mode for Emacs
-;; 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: Masatake YAMATO<jet@gyve.org>
;; Keywords: languages, faces
@@ -167,5 +167,4 @@
(provide 'ld-script)
-;; arch-tag: 83280b6b-e6fc-4d00-a630-922d7aec5593
;;; ld-script.el ends here
diff --git a/lisp/progmodes/m4-mode.el b/lisp/progmodes/m4-mode.el
index a1ae99b1b6..dd570ffb22 100644
--- a/lisp/progmodes/m4-mode.el
+++ b/lisp/progmodes/m4-mode.el
@@ -172,5 +172,4 @@
;;; "m4_syscmd" "m4_sysval" "m4_traceoff" "m4_traceon" "m4_translit"
;;; "m4_m4_undefine" "m4_undivert"))
-;; arch-tag: 87811d86-94c1-474b-9666-587f6da74af1
;;; m4-mode.el ends here
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 0ce797c46d..bc9ad25195 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -1839,5 +1839,4 @@ If it isn't in one, return nil."
(provide 'make-mode)
-;; arch-tag: bd23545a-de91-44fb-b1b2-feafbb2635a0
;;; make-mode.el ends here
diff --git a/lisp/progmodes/mantemp.el b/lisp/progmodes/mantemp.el
index ea4492053c..31966727e0 100644
--- a/lisp/progmodes/mantemp.el
+++ b/lisp/progmodes/mantemp.el
@@ -202,5 +202,4 @@ but operates on the region."
(provide 'mantemp)
-;; arch-tag: 49794712-3b1b-4baa-9785-39556cb52c94
;;; mantemp.el ends here
diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el
index d4926f35a3..24fd8f4bbe 100644
--- a/lisp/progmodes/meta-mode.el
+++ b/lisp/progmodes/meta-mode.el
@@ -1,7 +1,7 @@
;;; meta-mode.el --- major mode for editing Metafont or MetaPost sources
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Ulrik Vieth <vieth@thphy.uni-duesseldorf.de>
;; Version: 1.0
diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el
index 8df4bde335..fa2c256abe 100644
--- a/lisp/progmodes/mixal-mode.el
+++ b/lisp/progmodes/mixal-mode.el
@@ -1120,5 +1120,4 @@ Assumes that file has been compiled with debugging support."
(provide 'mixal-mode)
-;; arch-tag: be7c128a-bf61-4951-a90e-9398267ce3f3
;;; mixal-mode.el ends here
diff --git a/lisp/progmodes/modula2.el b/lisp/progmodes/modula2.el
index 2fc3bc59d8..f0b8f7cbca 100644
--- a/lisp/progmodes/modula2.el
+++ b/lisp/progmodes/modula2.el
@@ -613,5 +613,4 @@ followed by the first character of the construct.
(provide 'modula2)
-;; arch-tag: a21df1cb-5ece-4709-9219-1e7cd2d85d90
;;; modula2.el ends here
diff --git a/lisp/progmodes/octave-inf.el b/lisp/progmodes/octave-inf.el
index efb1682688..37eff607a7 100644
--- a/lisp/progmodes/octave-inf.el
+++ b/lisp/progmodes/octave-inf.el
@@ -391,5 +391,4 @@ directory and makes this the current buffer's default directory."
(provide 'octave-inf)
-;; arch-tag: bdce0395-24d1-4bb4-bfba-6fb1eeb1a660
;;; octave-inf.el ends here
diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el
index 2911b97db8..f523ea84ab 100644
--- a/lisp/progmodes/octave-mod.el
+++ b/lisp/progmodes/octave-mod.el
@@ -1,7 +1,7 @@
;;; octave-mod.el --- editing Octave source files under Emacs
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at>
;; Author: John Eaton <jwe@octave.org>
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index efbffa4350..0ca392c709 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -1,7 +1,7 @@
;;; pascal.el --- major mode for editing pascal source in Emacs
-;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+;; 2002 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
;; Free Software Foundation, Inc.
;; Author: Espen Skoglund <esk@gnu.org>
diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el
index b3fe1c918e..689f93736d 100644
--- a/lisp/progmodes/ps-mode.el
+++ b/lisp/progmodes/ps-mode.el
@@ -1167,5 +1167,4 @@ Use line numbers if `ps-run-error-line-numbers' is not nil"
(provide 'ps-mode)
-;; arch-tag: dce13d2d-69fb-4ec4-9d5d-6dd29c3f0e6e
;;; ps-mode.el ends here
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index b0b527266d..2f10a7f2a9 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1,7 +1,7 @@
;;; ruby-mode.el --- Major mode for editing Ruby files
-;; Copyright (C) 1994, 1995, 1996 1997, 1998, 1999, 2000, 2001,
-;; 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Copyright (C) 1994, 1995, 1996 1997, 1998, 1999, 2000, 2001, 2002,
+;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
;; Free Software Foundation, Inc.
;; Authors: Yukihiro Matsumoto
diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el
index 23274b4e39..fb135d717e 100644
--- a/lisp/progmodes/scheme.el
+++ b/lisp/progmodes/scheme.el
@@ -580,5 +580,4 @@ that variable's value is a string."
(provide 'scheme)
-;; arch-tag: a8f06bc1-ad11-42d2-9e36-ce651df37a90
;;; scheme.el ends here
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index adf3f9d1a5..9ff58489c7 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1,7 +1,8 @@
;;; sh-script.el --- shell-script editing commands for Emacs
;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Daniel Pfeiffer <occitan@esperanto.org>
;; Version: 2.0f
diff --git a/lisp/progmodes/subword.el b/lisp/progmodes/subword.el
index 5e3462327c..b66b477e4e 100644
--- a/lisp/progmodes/subword.el
+++ b/lisp/progmodes/subword.el
@@ -277,5 +277,4 @@ Optional argument ARG is the same as for `capitalize-word'."
(provide 'subword)
-;; arch-tag: b8a01202-8a52-4a71-ae0a-d753fafd67ef
;;; subword.el ends here
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index 9138ce1d01..b7fe9ef71f 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -332,5 +332,4 @@ If no function name is found, return nil."
(provide 'which-func)
-;; arch-tag: fa8a55c7-bfe3-4ffc-95ab-01bf21796827
;;; which-func.el ends here
diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el
index 3d8b1ffbe3..b24f184e70 100644
--- a/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@ -448,5 +448,4 @@ BITMAP-STRING is a string representing bits by hexadecimal digits."
(provide 'ps-bdf)
-;; arch-tag: 9b875ba8-565a-4ecf-acaa-30cee732c898
;;; ps-bdf.el ends here
diff --git a/lisp/ps-def.el b/lisp/ps-def.el
index 3be01d9eab..0a7a6e0157 100644
--- a/lisp/ps-def.el
+++ b/lisp/ps-def.el
@@ -402,5 +402,4 @@
(provide 'ps-def)
-;; arch-tag: 4edde45b-af10-4685-b8ee-7cd0f951095a
;;; ps-def.el ends here
diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index c24779c6f3..c8de53b667 100644
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -1211,5 +1211,4 @@ V%s 0 /%s-latin1 /%s Latin1Encoding put\n"
;; generated-autoload-file: "ps-print.el"
;; End:
-;; arch-tag: bca017b2-66a7-4e59-8584-103e749eadbe
;;; ps-mule.el ends here
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 4b89a72c31..3c4d03af78 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -6659,7 +6659,7 @@ If FACE is not a valid face name, use default face."
;; But autoload them here to make the separation invisible.
;;;### (autoloads (ps-mule-end-job ps-mule-begin-job ps-mule-initialize
-;;;;;; ps-multibyte-buffer) "ps-mule" "ps-mule.el" "0bd9e024b9d49ac10c708171ec319d9a")
+;;;;;; ps-multibyte-buffer) "ps-mule" "ps-mule.el" "84d550158bdd60da7af54df17b7a38f7")
;;; Generated autoloads from ps-mule.el
(defvar ps-multibyte-buffer nil "\
diff --git a/lisp/ps-samp.el b/lisp/ps-samp.el
index 53bfdb9558..e85b0f4e8d 100644
--- a/lisp/ps-samp.el
+++ b/lisp/ps-samp.el
@@ -309,5 +309,4 @@
(provide 'ps-samp)
-;; arch-tag: 99c415d3-be39-43c6-aa32-7ee33ba19600
;;; ps-samp.el ends here
diff --git a/lisp/recentf.el b/lisp/recentf.el
index b54a355c8f..7df2dd0539 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -1367,5 +1367,4 @@ that were operated on recently."
(run-hooks 'recentf-load-hook)
-;; arch-tag: 78f1eec9-0d16-4d19-a4eb-2e4529edb62a
;;; recentf.el ends here
diff --git a/lisp/rect.el b/lisp/rect.el
index 8a3cf47673..1adb95257e 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -412,5 +412,4 @@ with a prefix argument, prompt for START-AT and FORMAT."
(provide 'rect)
-;; arch-tag: 178847b3-1f50-4b03-83de-a6e911cc1d16
;;; rect.el ends here
diff --git a/lisp/register.el b/lisp/register.el
index 48762342c4..622a1561f9 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -353,5 +353,4 @@ START and END are buffer positions giving two corners of rectangle."
(extract-rectangle start end))))
(provide 'register)
-;; arch-tag: ce14dd68-8265-475f-9341-5d4ec5a53035
;;; register.el ends here
diff --git a/lisp/repeat.el b/lisp/repeat.el
index 455fb05ea9..06efd7071f 100644
--- a/lisp/repeat.el
+++ b/lisp/repeat.el
@@ -392,5 +392,4 @@ recently executed command not bound to an input event\"."
(provide 'repeat)
-;; arch-tag: cd569600-a1ad-4fa7-9062-bb91dfeaf1db
;;; repeat.el ends here
diff --git a/lisp/replace.el b/lisp/replace.el
index 6946987070..a8496c4765 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -2047,5 +2047,4 @@ make, or the user didn't cancel the call."
(lazy-highlight-cleanup lazy-highlight-cleanup)
(setq isearch-lazy-highlight-last-string nil)))
-;; arch-tag: 16b4cd61-fd40-497b-b86f-b667c4cf88e4
;;; replace.el ends here
diff --git a/lisp/reposition.el b/lisp/reposition.el
index f9f54ce734..d2bde0a452 100644
--- a/lisp/reposition.el
+++ b/lisp/reposition.el
@@ -1,7 +1,7 @@
;;; reposition.el --- center a Lisp function or comment on the screen
-;; Copyright (C) 1991, 1994, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Michael D. Ernst <mernst@theory.lcs.mit.edu>
;; Created: Jan 1991
diff --git a/lisp/reveal.el b/lisp/reveal.el
index fd775c7d01..db519d54e2 100644
--- a/lisp/reveal.el
+++ b/lisp/reveal.el
@@ -225,5 +225,4 @@ With zero or negative ARG turn mode off."
(provide 'reveal)
-;; arch-tag: 96ba0242-2274-4ed7-8e10-26bc0707b4d8
;;; reveal.el ends here
diff --git a/lisp/rfn-eshadow.el b/lisp/rfn-eshadow.el
index 97f23a9dc1..ea35c488dd 100644
--- a/lisp/rfn-eshadow.el
+++ b/lisp/rfn-eshadow.el
@@ -240,5 +240,4 @@ Returns non-nil if the new state is enabled."
(provide 'rfn-eshadow)
-;; arch-tag: dcf70a52-0115-4ec2-b1e3-4f8d3541a888
;;; rfn-eshadow.el ends here
diff --git a/lisp/rot13.el b/lisp/rot13.el
index 88a380775d..7afc0c892d 100644
--- a/lisp/rot13.el
+++ b/lisp/rot13.el
@@ -109,5 +109,4 @@ See also `toggle-rot13-mode'."
(provide 'rot13)
-;; arch-tag: ad5b9ca8-946c-4414-996f-e9b1bf9ec79f
;;; rot13.el ends here
diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el
index 13e3fdffa6..533a42838b 100644
--- a/lisp/ruler-mode.el
+++ b/lisp/ruler-mode.el
@@ -776,5 +776,4 @@ Optional argument PROPS specifies other text properties to apply."
;; coding: iso-latin-1
;; End:
-;; arch-tag: b2f24546-5605-44c4-b67b-c9a4eeba3ee8
;;; ruler-mode.el ends here
diff --git a/lisp/savehist.el b/lisp/savehist.el
index dc233e26dd..19dd1a0e68 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -389,6 +389,5 @@ trimming of history lists to `history-length' items."
(provide 'savehist)
-;; arch-tag: b3ce47f4-c5ad-4ebc-ad02-73aba705cf9f
;;; savehist.el ends here
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index ee1107e339..a72d3c4345 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -307,5 +307,4 @@ may have changed\) back to `save-place-alist'."
(provide 'saveplace) ; why not...
-;; arch-tag: 3c2ef47b-0a22-4558-b116-118c9ef454a0
;;; saveplace.el ends here
diff --git a/lisp/sb-image.el b/lisp/sb-image.el
index e4af3c0d7e..4e91199b5e 100644
--- a/lisp/sb-image.el
+++ b/lisp/sb-image.el
@@ -105,5 +105,4 @@ See `speedbar-expand-image-button-alist' for details."
(provide 'sb-image)
-;; arch-tag: 6b05accd-e8b8-4290-8379-f063f3dacabb
;;; sb-image.el ends here
diff --git a/lisp/scroll-all.el b/lisp/scroll-all.el
index b152970825..96dd72b895 100644
--- a/lisp/scroll-all.el
+++ b/lisp/scroll-all.el
@@ -116,5 +116,4 @@ apply to all visible windows in the same frame."
(provide 'scroll-all)
-;; arch-tag: db20089a-b157-45df-b5d4-2430e60acdd8
;;; scroll-all.el ends here
diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index 2d299b3c9a..4f2df6e0e0 100644
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -351,5 +351,4 @@ EVENT should be a scroll bar click."
(provide 'scroll-bar)
-;; arch-tag: 6f1d01d0-0b1e-4bf8-86db-d491e0f399f3
;;; scroll-bar.el ends here
diff --git a/lisp/scroll-lock.el b/lisp/scroll-lock.el
index f8af384ba0..0375ed32d4 100644
--- a/lisp/scroll-lock.el
+++ b/lisp/scroll-lock.el
@@ -123,5 +123,4 @@ during scrolling."
(provide 'scroll-lock)
-;; arch-tag: 148fc8e8-67e0-4638-bb34-3291595ab7e1
;;; scroll-lock.el ends here
diff --git a/lisp/ses.el b/lisp/ses.el
index 36a7b8ded0..8704f611cc 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -3017,5 +3017,4 @@ current column and continues until the next nonblank column."
(provide 'ses)
-;; arch-tag: 88c1ccf0-4293-4824-8c5d-0757b52217f3
;;; ses.el ends here
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index 20d793619c..9bd2e26b2a 100644
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -832,5 +832,4 @@ look for files that have been changed and need to be copied to other systems."
(provide 'shadowfile)
-;; arch-tag: e2f4cdd7-2bab-4def-9130-9e69b412b79e
;;; shadowfile.el ends here
diff --git a/lisp/shell.el b/lisp/shell.el
index 57cc11f9d4..5d27efa8ae 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -1,7 +1,8 @@
;;; shell.el --- specialized comint.el for running the shell
-;; Copyright (C) 1988, 1993, 1994, 1995, 1996, 1997, 2000, 2001,
-;; 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2002,
+;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Olin Shivers <shivers@cs.cmu.edu>
;; Simon Marshall <simon@gnu.org>
diff --git a/lisp/simple.el b/lisp/simple.el
index fb0c23afde..78ba99a5bf 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1,8 +1,8 @@
;;; simple.el --- basic editing commands for Emacs
-;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998,
+;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+;; 2010, 2011 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index ae6859d95a..b3ba621599 100644
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -1,7 +1,7 @@
;;; skeleton.el --- Lisp language extension for writing statement skeletons -*- coding: utf-8 -*-
-;; Copyright (C) 1993, 1994, 1995, 1996, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Daniel Pfeiffer <occitan@esperanto.org>
;; Maintainer: FSF
diff --git a/lisp/sort.el b/lisp/sort.el
index 404601a6f8..605cac5521 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -1,7 +1,7 @@
;;; sort.el --- commands to sort text in an Emacs buffer
-;; Copyright (C) 1986, 1987, 1994, 1995, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1987, 1994, 1995, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Howie Kaye
;; Maintainer: FSF
diff --git a/lisp/soundex.el b/lisp/soundex.el
index e2b969f6b7..aafb2eae62 100644
--- a/lisp/soundex.el
+++ b/lisp/soundex.el
@@ -72,5 +72,4 @@ and Searching\", Addison-Wesley (1973), pp. 391-392."
(provide 'soundex)
-;; arch-tag: b2615a98-feb7-430e-a717-171086738953
;;; soundex.el ends here
diff --git a/lisp/startup.el b/lisp/startup.el
index c413a29bc6..207297f3d3 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1,8 +1,8 @@
;;; startup.el --- process Emacs shell arguments
-;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1998, 1999,
+;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+;; 2011 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
diff --git a/lisp/strokes.el b/lisp/strokes.el
index 4742954b20..85258cf621 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -736,6 +736,11 @@ Optional EVENT is acceptable as the starting event of the stroke."
;; display the stroke as it's being read
(save-window-excursion
(set-window-configuration strokes-window-configuration)
+ ;; The frame has been resized, so we need to refill the
+ ;; strokes buffer so that the strokes canvas is the whole
+ ;; visible buffer.
+ (unless (> 1 (abs (- (line-end-position) (window-width))))
+ (strokes-fill-current-buffer-with-whitespace))
(when prompt
(message "%s" prompt)
(setq event (read-event))
@@ -1000,7 +1005,7 @@ If you'd like to create graphical files with strokes, you'll have to
be running a version of Emacs with XPM support. You use the binding
to `strokes-compose-complex-stroke' to start drawing your strokes.
These are just complex strokes, and thus continue drawing with mouse-1
-or mouse-2 and end with mouse-3. Then the stroke image gets inserted
+or mouse-2 and end with mouse-3. Then the stroke image gets inserted
into the buffer. You treat it somewhat like any other character,
which you can copy, paste, delete, move, etc. When all is done, you
may want to send the file, or save it. This is done with
@@ -1749,5 +1754,4 @@ Store XPM in buffer BUFNAME if supplied \(default is ` *strokes-xpm*'\)"
(run-hooks 'strokes-load-hook)
(provide 'strokes)
-;; arch-tag: 8377f60e-43fb-467a-bbcd-2774f91f833e
;;; strokes.el ends here
diff --git a/lisp/subr.el b/lisp/subr.el
index 293d71b891..25f36269df 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -853,24 +853,37 @@ in the current Emacs session, then this function may return nil."
(defsubst event-start (event)
"Return the starting position of EVENT.
-If EVENT is a mouse or key press or a mouse click, this returns the location
-of the event.
-If EVENT is a drag, this returns the drag's starting position.
-The return value is of the form
+EVENT should be a click, drag, or key press event.
+If it is a key press event, the return value has the form
+ (WINDOW POS (0 . 0) 0)
+If it is a click or drag event, it has the form
(WINDOW AREA-OR-POS (X . Y) TIMESTAMP OBJECT POS (COL . ROW)
IMAGE (DX . DY) (WIDTH . HEIGHT))
-The `posn-' functions access elements of such lists."
+The `posn-' functions access elements of such lists.
+For more information, see Info node `(elisp)Click Events'.
+
+If EVENT is a mouse or key press or a mouse click, this is the
+position of the event. If EVENT is a drag, this is the starting
+position of the drag."
(if (consp event) (nth 1 event)
(list (selected-window) (point) '(0 . 0) 0)))
(defsubst event-end (event)
"Return the ending location of EVENT.
EVENT should be a click, drag, or key press event.
-If EVENT is a click event, this function is the same as `event-start'.
-The return value is of the form
+If EVENT is a key press event, the return value has the form
+ (WINDOW POS (0 . 0) 0)
+If EVENT is a click event, this function is the same as
+`event-start'. For click and drag events, the return value has
+the form
(WINDOW AREA-OR-POS (X . Y) TIMESTAMP OBJECT POS (COL . ROW)
IMAGE (DX . DY) (WIDTH . HEIGHT))
-The `posn-' functions access elements of such lists."
+The `posn-' functions access elements of such lists.
+For more information, see Info node `(elisp)Click Events'.
+
+If EVENT is a mouse or key press or a mouse click, this is the
+position of the event. If EVENT is a drag, this is the starting
+position of the drag."
(if (consp event) (nth (if (consp (nth 2 event)) 2 1) event)
(list (selected-window) (point) '(0 . 0) 0)))
@@ -2364,11 +2377,16 @@ directory if it does not exist."
;; unless we're in batch mode or dumping Emacs
(or noninteractive
purify-flag
- (file-accessible-directory-p (directory-file-name user-emacs-directory))
- (make-directory user-emacs-directory))
+ (file-accessible-directory-p
+ (directory-file-name user-emacs-directory))
+ (let ((umask (default-file-modes)))
+ (unwind-protect
+ (progn
+ (set-default-file-modes ?\700)
+ (make-directory user-emacs-directory))
+ (set-default-file-modes umask))))
(abbreviate-file-name
(expand-file-name new-name user-emacs-directory))))))
-
;;;; Misc. useful functions.
diff --git a/lisp/t-mouse.el b/lisp/t-mouse.el
index bd9bccb4dc..63a0d2bdaf 100644
--- a/lisp/t-mouse.el
+++ b/lisp/t-mouse.el
@@ -84,5 +84,4 @@ It relies on the `gpm' daemon being activated."
(provide 't-mouse)
-;; arch-tag: a63163b3-bfbe-4eb2-ab4f-201cd164b05d
;;; t-mouse.el ends here
diff --git a/lisp/tabify.el b/lisp/tabify.el
index 0c5ca8413e..10672675c1 100644
--- a/lisp/tabify.el
+++ b/lisp/tabify.el
@@ -90,5 +90,4 @@ The variable `tab-width' controls the spacing of tab stops."
(provide 'tabify)
-;; arch-tag: c83893b1-e0cc-4e57-8a09-73fd03466416
;;; tabify.el ends here
diff --git a/lisp/talk.el b/lisp/talk.el
index 0999b21db4..27b7caff4f 100644
--- a/lisp/talk.el
+++ b/lisp/talk.el
@@ -120,5 +120,4 @@ Select the first of these windows, displaying the first of the buffers."
(provide 'talk)
-;; arch-tag: 7ab0ad88-1788-4886-a44c-ae685e6f8a1a
;;; talk.el ends here
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index 8d19e320c8..0049c8aab3 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -1247,5 +1247,4 @@ Leaves the region wide."
(provide 'tar-mode)
-;; arch-tag: 8a585a4a-340e-42c2-89e7-d3b1013a4b78
;;; tar-mode.el ends here
diff --git a/lisp/tempo.el b/lisp/tempo.el
index dca6ac14d2..905c9af174 100644
--- a/lisp/tempo.el
+++ b/lisp/tempo.el
@@ -763,5 +763,4 @@ space bar, and looks something like this:
(provide 'tempo)
-;; arch-tag: b3c0ee36-db3b-47bc-875f-091b4e27a063
;;; tempo.el ends here
diff --git a/lisp/term.el b/lisp/term.el
index 0ea9acee69..2eb999b03d 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -1,7 +1,8 @@
;;; term.el --- general command interpreter in a window stuff
-;; Copyright (C) 1988, 1990, 1992, 1994, 1995, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1990, 1992, 1994, 1995, 2001, 2002, 2003, 2004,
+;; 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Per Bothner <per@bothner.com>
;; Maintainer: Dan Nicolaescu <dann@ics.uci.edu>, Per Bothner <per@bothner.com>
diff --git a/lisp/term/AT386.el b/lisp/term/AT386.el
index 90725a781f..5894bed598 100644
--- a/lisp/term/AT386.el
+++ b/lisp/term/AT386.el
@@ -57,5 +57,4 @@
(define-key local-function-key-map [ALT] [27])
))
-;; arch-tag: abec1b03-582f-49f8-b8cb-e2fd52ea4bd7
;;; AT386.el ends here
diff --git a/lisp/term/apollo.el b/lisp/term/apollo.el
index fc75a3e559..c570a20112 100644
--- a/lisp/term/apollo.el
+++ b/lisp/term/apollo.el
@@ -3,5 +3,4 @@
"Terminal initialization function for apollo."
(tty-run-terminal-initialization (selected-frame) "vt100"))
-;; arch-tag: c72f446f-e6b7-4749-90a4-bd68632adacf
;;; apollo.el ends here
diff --git a/lisp/term/bobcat.el b/lisp/term/bobcat.el
index e7723b0706..d9ab1a5fb1 100644
--- a/lisp/term/bobcat.el
+++ b/lisp/term/bobcat.el
@@ -6,5 +6,4 @@
(keyboard-translate ?\177 ?\^h)
(keyboard-translate ?\^h ?\177))
-;; arch-tag: 754e4520-0a3e-4e6e-8ca5-9481b1f85cf7
;;; bobcat.el ends here
diff --git a/lisp/term/cygwin.el b/lisp/term/cygwin.el
index df857ba662..cfce07035c 100644
--- a/lisp/term/cygwin.el
+++ b/lisp/term/cygwin.el
@@ -6,5 +6,4 @@
"Terminal initialization function for cygwin."
(tty-no-underline))
-;; arch-tag: ca81ce67-3c41-4883-a29b-4c3d64a21191
;;; cygwin.el ends here
diff --git a/lisp/term/internal.el b/lisp/term/internal.el
index ab4c5ec39d..a190c84f99 100644
--- a/lisp/term/internal.el
+++ b/lisp/term/internal.el
@@ -604,5 +604,4 @@ list. You can (and should) also run it if and when the value of
(run-hooks 'dos-codepage-setup-hook)
))
-;; arch-tag: eea04c06-7311-4b5a-b531-3c1be1b070af
;;; internal.el ends here
diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el
index 82da165e0f..f5d88c9447 100644
--- a/lisp/term/iris-ansi.el
+++ b/lisp/term/iris-ansi.el
@@ -328,5 +328,4 @@
(set-keymap-parent m (keymap-parent input-decode-map))
(set-keymap-parent input-decode-map m)))
-;; arch-tag: b1d0e73a-bb7d-47be-9fb2-6fb126469a1b
;;; iris-ansi.el ends here
diff --git a/lisp/term/linux.el b/lisp/term/linux.el
index 5ac369721a..76115e7d58 100644
--- a/lisp/term/linux.el
+++ b/lisp/term/linux.el
@@ -18,5 +18,4 @@
;; The arg only matters in that it is not t or nil.
(set-input-meta-mode 'iso-latin-1))
-;; arch-tag: 5d0c4f63-739b-4862-abf3-041fe42adb8f
;;; linux.el ends here
diff --git a/lisp/term/lk201.el b/lisp/term/lk201.el
index 7bcbd8d754..23f4d0dbd2 100644
--- a/lisp/term/lk201.el
+++ b/lisp/term/lk201.el
@@ -79,5 +79,4 @@
(set-keymap-parent m (keymap-parent input-decode-map))
(set-keymap-parent input-decode-map m)))
-;; arch-tag: 7ffb4444-6a23-43e1-b457-43cf4f673c0d
;;; lk201.el ends here
diff --git a/lisp/term/news.el b/lisp/term/news.el
index 8918bee3b8..4f9d39b3d1 100644
--- a/lisp/term/news.el
+++ b/lisp/term/news.el
@@ -69,5 +69,4 @@
(define-key news-fkey-prefix "x" [kp-8])
))
-;; arch-tag: bfe141a0-623b-4b42-b753-5d9353776c5e
;;; news.el ends here
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index e4041bdef2..d84d0fe9b2 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -1,7 +1,7 @@
;;; pc-win.el --- setup support for `PC windows' (whatever that is)
-;; Copyright (C) 1994, 1996, 1997, 1999, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1996, 1997, 1999, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Morten Welinder <terra@diku.dk>
;; Maintainer: FSF
diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el
index 18ceff62de..6e9f57571c 100644
--- a/lisp/term/rxvt.el
+++ b/lisp/term/rxvt.el
@@ -310,5 +310,4 @@ for the currently selected frame."
(* (apply '+ (car (cddr (nth 15 rxvt-standard-colors)))) 0.6))
(set-terminal-parameter nil 'background-mode 'dark)))))
-;; arch-tag: 20cf2fb6-6318-4bab-9dbf-1d15048f2257
;;; rxvt.el ends here
diff --git a/lisp/term/sun.el b/lisp/term/sun.el
index 705d67a213..210f694f35 100644
--- a/lisp/term/sun.el
+++ b/lisp/term/sun.el
@@ -155,5 +155,4 @@
(eval (car hooks))
(setq hooks (cdr hooks))))))
-;; arch-tag: db761d47-fd7d-42b4-aae1-04fa116b6ba6
;;; sun.el ends here
diff --git a/lisp/term/sup-mouse.el b/lisp/term/sup-mouse.el
index 84b4a8d270..5bce08ed7b 100644
--- a/lisp/term/sup-mouse.el
+++ b/lisp/term/sup-mouse.el
@@ -195,5 +195,4 @@ X and Y are 0-based character positions on the frame."
(get-window-with-predicate (lambda (w)
(coordinates-in-window-p (cons x y) w))))
-;; arch-tag: ec644ed4-cac4-43b8-b3db-cfe83e9098d7
;;; sup-mouse.el ends here
diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el
index 8705d9d8cb..bb6974482d 100644
--- a/lisp/term/tty-colors.el
+++ b/lisp/term/tty-colors.el
@@ -1,7 +1,7 @@
;;; tty-colors.el --- color support for character terminals
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Eli Zaretskii
;; Maintainer: FSF
diff --git a/lisp/term/tvi970.el b/lisp/term/tvi970.el
index 48e2464ebf..914825b8e2 100644
--- a/lisp/term/tvi970.el
+++ b/lisp/term/tvi970.el
@@ -117,5 +117,4 @@ With a negative argument, select numeric keypad mode."
(send-string-to-terminal
(if (terminal-parameter nil 'tvi970-keypad-numeric) "\e=" "\e>")))
-;; arch-tag: c1334cf0-1462-41c3-a963-c077d175f8f0
;;; tvi970.el ends here
diff --git a/lisp/term/vt100.el b/lisp/term/vt100.el
index cc861e6386..d3b800e3f8 100644
--- a/lisp/term/vt100.el
+++ b/lisp/term/vt100.el
@@ -49,5 +49,4 @@ With negative argument, switch to 80-column mode."
(send-string-to-terminal (if vt100-wide-mode "\e[?3h" "\e[?3l"))
(set-frame-width terminal-frame (if vt100-wide-mode 132 80)))
-;; arch-tag: 9ff41f24-a7c9-4dee-9cf2-fbaa951eb840
;;; vt100.el ends here
diff --git a/lisp/term/vt102.el b/lisp/term/vt102.el
index 1f9bb00efa..0f2e3805f5 100644
--- a/lisp/term/vt102.el
+++ b/lisp/term/vt102.el
@@ -4,5 +4,4 @@
"Terminal initialization function for vt102."
(tty-run-terminal-initialization (selected-frame) "vt100"))
-;; arch-tag: 6e839cfc-125a-4574-82f1-c23a51f7c50f
;;; vt102.el ends here
diff --git a/lisp/term/vt125.el b/lisp/term/vt125.el
index b5a31e8a0f..029f762ef3 100644
--- a/lisp/term/vt125.el
+++ b/lisp/term/vt125.el
@@ -4,5 +4,4 @@
"Terminal initialization function for vt125."
(tty-run-terminal-initialization (selected-frame) "vt100"))
-;; arch-tag: 1d92d70f-dd55-4a1d-9088-e215a4883801
;;; vt125.el ends here
diff --git a/lisp/term/vt200.el b/lisp/term/vt200.el
index 78c65c084c..09ad64d01f 100644
--- a/lisp/term/vt200.el
+++ b/lisp/term/vt200.el
@@ -8,5 +8,4 @@
(define-key input-decode-map "\e[23~" [f11]) ;Probably redundant.
(define-key local-function-key-map [f11] [?\e]))
-;; arch-tag: 0f78f583-9f32-4237-b106-28bcfff21d89
;;; vt200.el ends here
diff --git a/lisp/term/vt201.el b/lisp/term/vt201.el
index 987aee09f3..cbeba00b65 100644
--- a/lisp/term/vt201.el
+++ b/lisp/term/vt201.el
@@ -8,5 +8,4 @@
(define-key input-decode-map "\e[23~" [f11]) ;Probably redundant.
(define-key local-function-key-map [f11] [?\e]))
-;; arch-tag: a6abb38f-60ea-449e-a9e9-3fb8572c52ae
;;; vt201.el ends here
diff --git a/lisp/term/vt220.el b/lisp/term/vt220.el
index f9439e0eff..647b79ea35 100644
--- a/lisp/term/vt220.el
+++ b/lisp/term/vt220.el
@@ -8,5 +8,4 @@
(define-key input-decode-map "\e[23~" [f11]) ;Probably redundant.
(define-key local-function-key-map [f11] [?\e]))
-;; arch-tag: 98fc4867-a20d-46a1-a276-d7be31e49871
;;; vt220.el ends here
diff --git a/lisp/term/vt240.el b/lisp/term/vt240.el
index 0aea10bf98..2da4e7ed3c 100644
--- a/lisp/term/vt240.el
+++ b/lisp/term/vt240.el
@@ -8,5 +8,4 @@
(define-key input-decode-map "\e[23~" [f11]) ;Probably redundant.
(define-key local-function-key-map [f11] [?\e]))
-;; arch-tag: d9f88e9c-02dc-49ff-871c-a415f08e4eb7
;;; vt240.el ends here
diff --git a/lisp/term/vt300.el b/lisp/term/vt300.el
index d19f847588..52198d840a 100644
--- a/lisp/term/vt300.el
+++ b/lisp/term/vt300.el
@@ -6,5 +6,4 @@
(define-key input-decode-map "\e[23~" [f11]) ;Probably redundant.
(define-key local-function-key-map [f11] [?\e]))
-;; arch-tag: 876831c9-a6f2-444a-b033-706e6fbc149f
;;; vt300.el ends here
diff --git a/lisp/term/vt320.el b/lisp/term/vt320.el
index 1d36c9d933..9b04a5d6ee 100644
--- a/lisp/term/vt320.el
+++ b/lisp/term/vt320.el
@@ -6,5 +6,4 @@
(define-key input-decode-map "\e[23~" [f11]) ;Probably redundant.
(define-key local-function-key-map [f11] [?\e]))
-;; arch-tag: f9f4c954-0b9e-45f9-b450-a320d32abd9c
;;; vt320.el ends here
diff --git a/lisp/term/vt400.el b/lisp/term/vt400.el
index 78af2a3719..4c5870c5ad 100644
--- a/lisp/term/vt400.el
+++ b/lisp/term/vt400.el
@@ -6,5 +6,4 @@
(define-key input-decode-map "\e[23~" [f11]) ;Probably redundant.
(define-key local-function-key-map [f11] [?\e]))
-;; arch-tag: a70809c5-6b21-42cc-ba20-536683e5e7d5
;;; vt400.el ends here
diff --git a/lisp/term/vt420.el b/lisp/term/vt420.el
index 69b1b31abd..0476b639c2 100644
--- a/lisp/term/vt420.el
+++ b/lisp/term/vt420.el
@@ -6,5 +6,4 @@
(define-key input-decode-map "\e[23~" [f11]) ;Probably redundant.
(define-key local-function-key-map [f11] [?\e]))
-;; arch-tag: df2f897c-3a12-4b3c-9259-df089f96c160
;;; vt420.el ends here
diff --git a/lisp/term/wyse50.el b/lisp/term/wyse50.el
index 813f6be248..dbe4d3ae3b 100644
--- a/lisp/term/wyse50.el
+++ b/lisp/term/wyse50.el
@@ -156,5 +156,4 @@ M-r M-x move-to-window-line, Funct up-arrow or down-arrow are similar"
;; (nth 1 key-definition)))
(fset 'enable-arrow-keys nil))
-;; arch-tag: b6a05d37-eead-4cf6-b997-0f956c68881c
;;; wyse50.el ends here
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index aacee8dd7b..7e5c83d7f1 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -682,5 +682,4 @@ versions of xterm."
(set-terminal-parameter nil 'background-mode 'dark)
t))
-;; arch-tag: 12e7ebdd-1e6c-4b25-b0f9-35ace25e855a
;;; xterm.el ends here
diff --git a/lisp/terminal.el b/lisp/terminal.el
index 26778fcd5a..ad1e1a7b64 100644
--- a/lisp/terminal.el
+++ b/lisp/terminal.el
@@ -1335,5 +1335,4 @@ in the directory specified by `te-terminfo-directory'."
(provide 'terminal)
-;; arch-tag: 0ae1d7d7-90ef-4566-a531-6e7ff8c79b2f
;;; terminal.el ends here
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index ce6b491827..a4fc32b58b 100644
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -1,7 +1,7 @@
;;; artist.el --- draw ascii graphics with your mouse
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Tomas Abrahamsson <tab@lysator.liu.se>
;; Maintainer: Tomas Abrahamsson <tab@lysator.liu.se>
@@ -5557,5 +5557,4 @@ The event, EV, is the mouse event."
;; Don't hesitate to ask me any questions.
-;; arch-tag: 3e63b881-aaaa-4b83-a072-220d4661a8a3
;;; artist.el ends here
diff --git a/lisp/textmodes/bib-mode.el b/lisp/textmodes/bib-mode.el
index dcd6baa53b..708e43b37d 100644
--- a/lisp/textmodes/bib-mode.el
+++ b/lisp/textmodes/bib-mode.el
@@ -236,5 +236,4 @@ named by variable `unread-bib-file'."
(provide 'bib-mode)
-;; arch-tag: e3a97958-3c2c-487f-9557-fafc3c98452d
;;; bib-mode.el ends here
diff --git a/lisp/textmodes/bibtex-style.el b/lisp/textmodes/bibtex-style.el
index 092de4bcbf..b3a0faa759 100644
--- a/lisp/textmodes/bibtex-style.el
+++ b/lisp/textmodes/bibtex-style.el
@@ -1,6 +1,7 @@
;;; bibtex-style.el --- Major mode for BibTeX Style files
-;; Copyright (C) 2005, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: tex
@@ -151,5 +152,4 @@
(provide 'bibtex-style)
-;; arch-tag: b20ad41a-fd36-466e-8fd2-cc6137f9c55c
;;; bibtex-style.el ends here
diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index ff6d4761ae..530126629e 100644
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -621,5 +621,4 @@ For details see `conf-mode'. Example:
(provide 'conf-mode)
-;; arch-tag: 0a3805b2-0371-4d3a-8498-8897116b2356
;;; conf-mode.el ends here
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 20ea2bc7b8..fbdadc2623 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -483,5 +483,4 @@
(indent-line-to indent)))))
(provide 'css-mode)
-;; arch-tag: b4d8b8e2-b130-4e74-b3aa-cd8f1ab659d0
;;; css-mode.el ends here
diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el
index 1e46d9453f..e3aa6a667f 100644
--- a/lisp/textmodes/enriched.el
+++ b/lisp/textmodes/enriched.el
@@ -1,7 +1,7 @@
;;; enriched.el --- read and save files in text/enriched format
-;; Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006,
+;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Boris Goldowsky <boris@gnu.org>
;; Keywords: wp, faces
@@ -502,5 +502,4 @@ the range of text to assign text property SYMBOL with value VALUE."
(message "Warning: invalid <x-display> parameter %s" param))
(list start end 'display prop)))
-;; arch-tag: 05cae488-3fea-45cd-ac29-5b02cb64e42b
;;; enriched.el ends here
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index d396c673fe..d288e864ae 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -1,7 +1,8 @@
;;; fill.el --- fill commands for Emacs -*- coding: utf-8 -*-
-;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1999, 2001, 2002,
-;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1999, 2001,
+;; 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: wp
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 610fa39cd6..53e3cf4334 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1,7 +1,8 @@
;;; ispell.el --- interface to International Ispell Versions 3.1 and 3.2
;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Ken Stevens <k.stevens@ieee.org>
;; Maintainer: Ken Stevens <k.stevens@ieee.org>
diff --git a/lisp/textmodes/makeinfo.el b/lisp/textmodes/makeinfo.el
index 5cf1ea9c5f..2b5fa6671a 100644
--- a/lisp/textmodes/makeinfo.el
+++ b/lisp/textmodes/makeinfo.el
@@ -1,7 +1,7 @@
;;; makeinfo.el --- run makeinfo conveniently
-;; Copyright (C) 1991, 1993, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Robert J. Chassell
;; Maintainer: FSF
@@ -289,5 +289,4 @@ line LINE of the window, or centered if LINE is nil."
;;; Place `provide' at end of file.
(provide 'makeinfo)
-;; arch-tag: 5f810713-3de2-4e20-8030-4bc3dd0d9604
;;; makeinfo.el ends here
diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el
index 420472fc5f..309f42cd6e 100644
--- a/lisp/textmodes/nroff-mode.el
+++ b/lisp/textmodes/nroff-mode.el
@@ -331,5 +331,4 @@ turns it on if arg is positive, otherwise off."
(provide 'nroff-mode)
-;; arch-tag: 6e276340-6c65-4f65-b4e3-0ca431ddfb6c
;;; nroff-mode.el ends here
diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el
index 9d9013cd70..8550cf998b 100644
--- a/lisp/textmodes/page-ext.el
+++ b/lisp/textmodes/page-ext.el
@@ -1,7 +1,7 @@
;;; page-ext.el --- extended page handling commands
-;; Copyright (C) 1990, 1991, 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006,
-;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1993, 1994, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Robert J. Chassell <bob@gnu.org>
;; (according to ack.texi)
diff --git a/lisp/textmodes/page.el b/lisp/textmodes/page.el
index 0229369146..6636780a05 100644
--- a/lisp/textmodes/page.el
+++ b/lisp/textmodes/page.el
@@ -164,5 +164,4 @@ thus showing a page other than the one point was originally in."
;;; Place `provide' at end of file.
(provide 'page)
-;; arch-tag: e8d7a0bd-8655-4b6e-b852-f2ee25316a1d
;;; page.el ends here
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index 9433aa90a6..8b12c5f7ba 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -529,5 +529,4 @@ the current sentence with the one containing the mark."
;; coding: utf-8
;; End:
-;; arch-tag: e727eb1a-527a-4464-b9d7-9d3ec0d1a575
;;; paragraphs.el ends here
diff --git a/lisp/textmodes/po.el b/lisp/textmodes/po.el
index fe3a249458..1f89cd8373 100644
--- a/lisp/textmodes/po.el
+++ b/lisp/textmodes/po.el
@@ -131,5 +131,4 @@ Called through `file-coding-system-alist', before the file is visited for real."
(provide 'po)
-;; arch-tag: 56748a57-d64c-4200-8f6b-c3a70496eb8c
;;; po.el ends here
diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el
index 611a1de5d0..37649128b2 100644
--- a/lisp/textmodes/refbib.el
+++ b/lisp/textmodes/refbib.el
@@ -746,5 +746,4 @@ Please send bug reports and suggestions to
(provide 'refbib)
(provide 'refer-to-bibtex)
-;; arch-tag: 664afee2-6e76-4408-ba56-981d8a179586
;;; refbib.el ends here
diff --git a/lisp/textmodes/refer.el b/lisp/textmodes/refer.el
index 50f2353f14..58bd0e8546 100644
--- a/lisp/textmodes/refer.el
+++ b/lisp/textmodes/refer.el
@@ -1,7 +1,7 @@
;;; refer.el --- look up references in bibliography files
-;; Copyright (C) 1992, 1996, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Ashwin Ram <ashwin@cc.gatech.edu>
;; Maintainer: Gernot Heiser <gernot@acm.org>
@@ -396,5 +396,4 @@ found on the last `refer-find-entry' or `refer-find-next-entry'."
(setq refer-bib-files files))
files))
-;; arch-tag: 151f641b-e79b-462b-9a29-a95c3793f300
;;; refer.el ends here
diff --git a/lisp/textmodes/refill.el b/lisp/textmodes/refill.el
index 7e4570c399..61a4ce0548 100644
--- a/lisp/textmodes/refill.el
+++ b/lisp/textmodes/refill.el
@@ -258,5 +258,4 @@ refilling if they would cause auto-filling."
(provide 'refill)
-;; arch-tag: 2c4ce9e8-1daa-4a3b-b6f8-fd6ac5bf6138
;;; refill.el ends here
diff --git a/lisp/textmodes/reftex-auc.el b/lisp/textmodes/reftex-auc.el
index 4f3cc69d58..81016a96f9 100644
--- a/lisp/textmodes/reftex-auc.el
+++ b/lisp/textmodes/reftex-auc.el
@@ -224,5 +224,4 @@ of ENTRY-LIST is a list of cons cells (\"MACRONAME\" . LEVEL). See
(defun reftex-notice-new-section ()
(reftex-notice-new 1 'force))
-;; arch-tag: 4a798e68-3405-421c-a09b-0269aac64ab4
;;; reftex-auc.el ends here
diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el
index 19663f81bd..83a157f4f3 100644
--- a/lisp/textmodes/reftex-cite.el
+++ b/lisp/textmodes/reftex-cite.el
@@ -1174,5 +1174,4 @@ The sequence in the new file is the same as it was in the old database."
(length entries))))
-;; arch-tag: d53d0a5a-ab32-4b52-a846-2a7c3527cd89
;;; reftex-cite.el ends here
diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el
index 152698127c..0fd9ae7f6f 100644
--- a/lisp/textmodes/reftex-dcr.el
+++ b/lisp/textmodes/reftex-dcr.el
@@ -482,5 +482,4 @@ Calling this function several times find successive citation locations."
(move-marker reftex-global-search-marker nil)
(error "All files processed"))))
-;; arch-tag: d2f52b56-744e-44ad-830d-1fc193b90eda
;;; reftex-dcr.el ends here
diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el
index b679d5ddfa..daab186b76 100644
--- a/lisp/textmodes/reftex-global.el
+++ b/lisp/textmodes/reftex-global.el
@@ -475,5 +475,4 @@ With no argument, this command toggles
(add-minor-mode 'reftex-isearch-minor-mode "/I" nil nil
'reftex-isearch-minor-mode)
-;; arch-tag: 2dbf7633-92c8-4340-8656-7aa019d0f80d
;;; reftex-global.el ends here
diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el
index 8fc8c72c7d..12bf8b7046 100644
--- a/lisp/textmodes/reftex-parse.el
+++ b/lisp/textmodes/reftex-parse.el
@@ -1070,5 +1070,4 @@ of master file."
nrest (- nrest i))))
string))
-;; arch-tag: 6a8168f7-abb9-4576-99dc-fcbc7ba901a3
;;; reftex-parse.el ends here
diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index e725be7652..53673ef2d5 100644
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -1917,5 +1917,4 @@ construct: \\bbb [xxx] {aaa}."
(provide 'reftex-vars)
-;; arch-tag: 9591ea34-ef39-4431-90b7-c115eaf5e16f
;;; reftex-vars.el ends here
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index 9b8a19a62a..ab99e56551 100644
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -2582,5 +2582,4 @@ With optional NODE, go directly to that node."
;;;============================================================================
-;; arch-tag: 49e0da4e-bd5e-4cfc-a717-fb444fccb9e6
;;; reftex.el ends here
diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index 632473f3f0..e2b41364f1 100644
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -1,7 +1,7 @@
;;; remember --- a mode for quickly jotting down things to remember
-;; Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007,
-;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
;; Created: 29 Mar 1999
diff --git a/lisp/textmodes/spell.el b/lisp/textmodes/spell.el
index 58d2088e3e..253ebab07f 100644
--- a/lisp/textmodes/spell.el
+++ b/lisp/textmodes/spell.el
@@ -1,7 +1,7 @@
;;; spell.el --- spelling correction interface for Emacs
-;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010, 2011 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: wp, unix
@@ -168,5 +168,4 @@ for example, \"word\"."
(provide 'spell)
-;; arch-tag: 7eabb848-9c76-431a-bcdb-0e0592d2db04
;;; spell.el ends here
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index ca5b5d99e7..77a4309ca0 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -2915,5 +2915,4 @@ There might be text before point."
(provide 'tex-mode)
-;; arch-tag: c0a680b1-63aa-4547-84b9-4193c29c0080
;;; tex-mode.el ends here
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index 47842d2888..22fbdc9e07 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -1,8 +1,8 @@
;;; texinfmt.el --- format Texinfo files into Info files
-;; Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993,
-;; 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
+;; 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Maintainer: Robert J. Chassell <bug-texinfo@gnu.org>
;; Keywords: maint, tex, docs
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index 16b7d21b37..9273173dc9 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -1024,5 +1024,4 @@ You are prompted for the job number (use a number shown by a previous
(provide 'texinfo)
-;; arch-tag: 005d7c38-43b9-4b7d-aa1d-aea69bae73e1
;;; texinfo.el ends here
diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el
index e331923353..b6d5a932fa 100644
--- a/lisp/textmodes/texnfo-upd.el
+++ b/lisp/textmodes/texnfo-upd.el
@@ -1,7 +1,7 @@
;;; texnfo-upd.el --- utilities for updating nodes and menus in Texinfo files
-;; Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Robert J. Chassell
;; Maintainer: bug-texinfo@gnu.org
diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el
index 07e8b8dd2b..bb59bf6382 100644
--- a/lisp/textmodes/text-mode.el
+++ b/lisp/textmodes/text-mode.el
@@ -182,5 +182,4 @@ The argument NLINES says how many lines to center."
(setq nlines (1+ nlines))
(forward-line -1)))))
-;; arch-tag: a07ccaad-da13-4d7b-9c61-cd04f5926aab
;;; text-mode.el ends here
diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el
index 0f5c0a43a5..6e09657f44 100644
--- a/lisp/textmodes/tildify.el
+++ b/lisp/textmodes/tildify.el
@@ -353,5 +353,4 @@ further questions)."
;; coding: iso-latin-2
;; End:
-;; arch-tag: fc9b05a6-7355-4639-8170-dcf57853ba22
;;; tildify.el ends here
diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el
index 0d410f9f3b..fd50ce4d00 100644
--- a/lisp/textmodes/two-column.el
+++ b/lisp/textmodes/two-column.el
@@ -632,5 +632,4 @@ on, this also realigns the two buffers."
(provide 'two-column)
-;; arch-tag: 2021b5ab-d3a4-4a8c-a21c-1936b0f9e6b1
;;; two-column.el ends here
diff --git a/lisp/textmodes/underline.el b/lisp/textmodes/underline.el
index f7507f6d6a..e2f64edf92 100644
--- a/lisp/textmodes/underline.el
+++ b/lisp/textmodes/underline.el
@@ -61,5 +61,4 @@ which specify the range to operate on."
(provide 'underline)
-;; arch-tag: e7b48582-c3ea-4386-987a-87415f3c372a
;;; underline.el ends here
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index 4389d54e70..548b7220c3 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -472,5 +472,4 @@ Signal an error if the entire string was not used."
"Return the Lisp list at point, or nil if none is found."
(form-at-point 'list 'listp))
-;; arch-tag: bb65a163-dae2-4055-aedc-fe11f497f698
;;; thingatpt.el ends here
diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index b312c88121..48018c7090 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -816,5 +816,4 @@ ACTION and ARG should be a valid convert command."
(provide 'thumbs)
-;; arch-tag: f9ac1ef8-83fc-42c0-8069-1fae43fd2e5c
;;; thumbs.el ends here
diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index fb5d4303d7..3404709588 100644
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -706,5 +706,4 @@ around literals."
(provide 'time-stamp)
-;; arch-tag: 8a12c5c3-25d6-4a71-adc5-24b0e025a1e7
;;; time-stamp.el ends here
diff --git a/lisp/time.el b/lisp/time.el
index 40e612adad..5f2e8752ab 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -576,5 +576,4 @@ For example, the Unix uptime command format is \"%D, %z%2h:%.2m\"."
(provide 'time)
-;; arch-tag: b9c1623f-b5cb-48e4-b650-482a4d23c5a6
;;; time.el ends here
diff --git a/lisp/timezone.el b/lisp/timezone.el
index 397027d577..2c3b2f4d26 100644
--- a/lisp/timezone.el
+++ b/lisp/timezone.el
@@ -403,5 +403,4 @@ The Gregorian date Sunday, December 31, 1 BC is imaginary."
(provide 'timezone)
-;; arch-tag: e23d5bc6-f32d-48ba-8996-323e9d654b3f
;;; timezone.el ends here
diff --git a/lisp/tmm.el b/lisp/tmm.el
index 3d8433e281..c62a4adeab 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -168,14 +168,13 @@ Its value should be an event that has a binding in MENU."
;; It has no other elements.
;; The order of elements in tmm-km-list is the order of the menu bar.
(mapc (lambda (elt)
- (if (stringp elt)
- (setq gl-str elt)
- (cond
- ((listp elt) (tmm-get-keymap elt not-menu))
- ((vectorp elt)
- (dotimes (i (length elt))
- (tmm-get-keymap (cons i (aref elt i)) not-menu))))))
- menu)
+ (cond
+ ((stringp elt) (setq gl-str elt))
+ ((listp elt) (tmm-get-keymap elt not-menu))
+ ((vectorp elt)
+ (dotimes (i (length elt))
+ (tmm-get-keymap (cons i (aref elt i)) not-menu)))))
+ menu)
;; Choose an element of tmm-km-list; put it in choice.
(if (and not-menu (= 1 (length tmm-km-list)))
;; If this is the top-level of an x-popup-menu menu,
@@ -368,32 +367,31 @@ Stores a list of all the shortcuts in the free variable `tmm-short-cuts'."
(add-hook 'minibuffer-exit-hook 'tmm-delete-map nil t)
(unless tmm-c-prompt
(error "No active menu entries"))
- (let ((win (selected-window)))
- (setq tmm-old-mb-map (tmm-define-keys t))
- ;; Get window and hide it for electric mode to get correct size
- (save-window-excursion
- (let ((completions
- (mapcar 'car minibuffer-completion-table)))
- (or tmm-completion-prompt
- (add-hook 'completion-setup-hook
- 'tmm-completion-delete-prompt 'append))
- (unwind-protect
- (with-output-to-temp-buffer "*Completions*"
- (display-completion-list completions))
- (remove-hook 'completion-setup-hook 'tmm-completion-delete-prompt)))
- (set-buffer "*Completions*")
- (tmm-remove-inactive-mouse-face)
- (when tmm-completion-prompt
- (let ((buffer-read-only nil))
- (goto-char (point-min))
- (insert tmm-completion-prompt))))
- (save-selected-window
- (other-window 1) ; Electric-pop-up-window does
+ (setq tmm-old-mb-map (tmm-define-keys t))
+ ;; Get window and hide it for electric mode to get correct size
+ (save-window-excursion
+ (let ((completions
+ (mapcar 'car minibuffer-completion-table)))
+ (or tmm-completion-prompt
+ (add-hook 'completion-setup-hook
+ 'tmm-completion-delete-prompt 'append))
+ (unwind-protect
+ (with-output-to-temp-buffer "*Completions*"
+ (display-completion-list completions))
+ (remove-hook 'completion-setup-hook 'tmm-completion-delete-prompt)))
+ (set-buffer "*Completions*")
+ (tmm-remove-inactive-mouse-face)
+ (when tmm-completion-prompt
+ (let ((buffer-read-only nil))
+ (goto-char (point-min))
+ (insert tmm-completion-prompt))))
+ (save-selected-window
+ (other-window 1) ; Electric-pop-up-window does
; not work in minibuffer
- (Electric-pop-up-window "*Completions*")
- (with-current-buffer "*Completions*"
- (setq tmm-old-comp-map (tmm-define-keys nil))))
- (insert tmm-c-prompt)))
+ (Electric-pop-up-window "*Completions*")
+ (with-current-buffer "*Completions*"
+ (setq tmm-old-comp-map (tmm-define-keys nil))))
+ (insert tmm-c-prompt))
(defun tmm-delete-map ()
(remove-hook 'minibuffer-exit-hook 'tmm-delete-map t)
@@ -497,7 +495,7 @@ It uses the free variable `tmm-table-undef' to keep undefined keys."
(if (or in-x-menu (stringp (car-safe elt)))
(setq str event event nil km elt)
(setq str event event nil km (cons 'keymap elt)))))
- (unless (eq km 'ignore)
+ (unless (or (eq km 'ignore) (null str))
(let ((binding (where-is-internal km nil t)))
(when binding
(setq binding (key-description binding))
@@ -568,5 +566,4 @@ of `menu-bar-final-items'."
(provide 'tmm)
-;; arch-tag: e7ddbdb6-4b95-4da3-afbe-ad6063d112f4
;;; tmm.el ends here
diff --git a/lisp/tool-bar.el b/lisp/tool-bar.el
index 7339dcecc2..60b34547bf 100644
--- a/lisp/tool-bar.el
+++ b/lisp/tool-bar.el
@@ -1,8 +1,8 @@
;;; tool-bar.el --- setting up the tool bar
-;;
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-;;
+
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010, 2011 Free Software Foundation, Inc.
+
;; Author: Dave Love <fx@gnu.org>
;; Keywords: mouse frames
;; Package: emacs
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 3e4538a5ea..dcbdb069a7 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -385,5 +385,4 @@ Value is non-nil if this function handled the tip."
(provide 'tooltip)
-;; arch-tag: 3d61135e-4618-4a78-af28-183f6df5636f
;;; tooltip.el ends here
diff --git a/lisp/tree-widget.el b/lisp/tree-widget.el
index 83b1e60a38..9ccc28e859 100644
--- a/lisp/tree-widget.el
+++ b/lisp/tree-widget.el
@@ -818,5 +818,4 @@ That is, if TREE :args is nil."
(provide 'tree-widget)
-;; arch-tag: c3a1ada2-1663-41dc-9d16-2479ed8320e8
;;; tree-widget.el ends here
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 9759b6a61f..97646e5a01 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -963,5 +963,4 @@ Currently this feature is only used in `help-with-tutorial'."
(provide 'tutorial)
-;; arch-tag: c8e80aef-c3bb-4ffb-8af6-22171bf0c100
;;; tutorial.el ends here
diff --git a/lisp/type-break.el b/lisp/type-break.el
index cda4a5d8e3..5af88fa362 100644
--- a/lisp/type-break.el
+++ b/lisp/type-break.el
@@ -1,7 +1,7 @@
;;; type-break.el --- encourage rests from typing at appropriate intervals
-;; Copyright (C) 1994, 1995, 1997, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1997, 2000, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Noah Friedman
;; Maintainer: Noah Friedman <friedman@splode.com>
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index 919afeba01..fb67487f32 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -508,5 +508,4 @@ For use on `kill-buffer-hook'."
(provide 'uniquify)
-;; arch-tag: e763faa3-56c9-4903-8eb8-26e1c45a0065
;;; uniquify.el ends here
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index dc6fd97923..f6f73a7ccc 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -2377,8 +2377,8 @@
;; coding: utf-8
;; End:
- Copyright (C) 1999, 2001, 2002, 2004, 2005,
- 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009,
+ 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/lisp/url/url-about.el b/lisp/url/url-about.el
index 7f78de18fe..71be17b437 100644
--- a/lisp/url/url-about.el
+++ b/lisp/url/url-about.el
@@ -99,5 +99,4 @@
(provide 'url-about)
-;; arch-tag: 65dd7fca-db3f-4cb1-8026-7dd37d4a460e
;;; url-about.el ends here
diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el
index b3f058748f..c82546f08f 100644
--- a/lisp/url/url-auth.el
+++ b/lisp/url/url-auth.el
@@ -345,5 +345,4 @@ RATING a rating between 1 and 10 of the strength of the authentication.
(provide 'url-auth)
-;; arch-tag: 04058625-616d-44e4-9dbf-4b46b00b2a91
;;; url-auth.el ends here
diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el
index be2931e090..730c248e49 100644
--- a/lisp/url/url-cache.el
+++ b/lisp/url/url-cache.el
@@ -211,5 +211,4 @@ If `url-standalone-mode' is non-nil, cached items never expire."
(provide 'url-cache)
-;; arch-tag: 95b050a6-8e81-4f23-8e63-191b9d1d657c
;;; url-cache.el ends here
diff --git a/lisp/url/url-cid.el b/lisp/url/url-cid.el
index 3d34404763..31eab3f523 100644
--- a/lisp/url/url-cid.el
+++ b/lisp/url/url-cid.el
@@ -59,5 +59,4 @@
(t
(message "Unable to handle CID URL: %s" url))))
-;; arch-tag: 23d9ab74-fad4-4dba-b1e7-292871e8bda5
;;; url-cid.el ends here
diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index bd6907df64..99d98d2bd2 100644
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -963,5 +963,4 @@ Returns nil if URL contains no name starting with FILE."
(provide 'url-dav)
-;; arch-tag: 2b14b7b3-888a-49b8-a490-17276a40e78e
;;; url-dav.el ends here
diff --git a/lisp/url/url-dired.el b/lisp/url/url-dired.el
index 17c056fbe5..723183121a 100644
--- a/lisp/url/url-dired.el
+++ b/lisp/url/url-dired.el
@@ -55,5 +55,4 @@
(provide 'url-dired)
-;; arch-tag: 2694f21a-43e1-4391-b3cb-cf6e5349f15f
;;; url-dired.el ends here
diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el
index c420ea930b..9d2e7e9fe5 100644
--- a/lisp/url/url-expand.el
+++ b/lisp/url/url-expand.el
@@ -144,5 +144,4 @@ path components followed by `..' are removed, along with the `..' itself."
(provide 'url-expand)
-;; arch-tag: 7b5f744b-b721-49da-be47-484631680a5a
;;; url-expand.el ends here
diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index 28917fb08a..c55bc40f42 100644
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -241,5 +241,4 @@ to them."
(provide 'url-file)
-;; arch-tag: 010e914a-7313-494b-8a8c-6495a862157d
;;; url-file.el ends here
diff --git a/lisp/url/url-ftp.el b/lisp/url/url-ftp.el
index fdfaecbf8f..977dc3b239 100644
--- a/lisp/url/url-ftp.el
+++ b/lisp/url/url-ftp.el
@@ -41,5 +41,4 @@
(provide 'url-ftp)
-;; arch-tag: 9c3e70c4-350f-4d4a-bb51-a1e9b459e7dc
;;; url-ftp.el ends here
diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el
index 7d3427743b..49f3481e29 100644
--- a/lisp/url/url-gw.el
+++ b/lisp/url/url-gw.el
@@ -276,5 +276,4 @@ Might do a non-blocking connection; use `process-status' to check."
(provide 'url-gw)
-;; arch-tag: 1c4c0317-6d03-45b8-b3f3-838bd8f9d838
;;; url-gw.el ends here
diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index 9b77c3c5cd..d54d0d82de 100644
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -325,5 +325,4 @@ They count bytes from the beginning of the body."
(provide 'url-handlers)
-;; arch-tag: 7300b99c-cc83-42ff-9147-79b2723c62ac
;;; url-handlers.el ends here
diff --git a/lisp/url/url-history.el b/lisp/url/url-history.el
index 9e933332e3..c0649db57c 100644
--- a/lisp/url/url-history.el
+++ b/lisp/url/url-history.el
@@ -1,7 +1,7 @@
;;; url-history.el --- Global history tracking for URL package
-;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010, 2011 Free Software Foundation, Inc.
;; Keywords: comm, data, processes, hypermedia
@@ -184,5 +184,4 @@ user for what type to save as."
(provide 'url-history)
-;; arch-tag: fbbbaf63-db36-4e88-bc9f-2939aa93afb2
;;; url-history.el ends here
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index f1b687cfca..5b0b6e969e 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1,7 +1,7 @@
;;; url-http.el --- HTTP retrieval routines
-;; Copyright (C) 1999, 2001, 2004, 2005, 2006, 2007, 2008,
-;; 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001, 2004, 2005, 2006, 2007, 2008, 2009,
+;; 2010, 2011 Free Software Foundation, Inc.
;; Author: Bill Perry <wmperry@gnu.org>
;; Keywords: comm, data, processes
@@ -1453,5 +1453,4 @@ p3p
(provide 'url-http)
-;; arch-tag: ba7c59ae-c0f4-4a31-9617-d85f221732ee
;;; url-http.el ends here
diff --git a/lisp/url/url-imap.el b/lisp/url/url-imap.el
index d901bb00c2..e012a7d9c1 100644
--- a/lisp/url/url-imap.el
+++ b/lisp/url/url-imap.el
@@ -76,5 +76,4 @@
)))
(current-buffer)))
-;; arch-tag: 034991ff-5425-48ea-b911-c96c90e6f47d
;;; url-imap.el ends here
diff --git a/lisp/url/url-irc.el b/lisp/url/url-irc.el
index 5270aab7b4..30ab437d5c 100644
--- a/lisp/url/url-irc.el
+++ b/lisp/url/url-irc.el
@@ -1,7 +1,7 @@
;;; url-irc.el --- IRC URL interface
-;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010, 2011 Free Software Foundation, Inc.
;; Keywords: comm, data, processes
@@ -91,5 +91,4 @@ PASSWORD - What password to use"
(provide 'url-irc)
-;; arch-tag: 2e5eecf8-9eb3-436b-9fbd-c26f2fb2bf3e
;;; url-irc.el ends here
diff --git a/lisp/url/url-ldap.el b/lisp/url/url-ldap.el
index 0a99f7344d..efe301c8b3 100644
--- a/lisp/url/url-ldap.el
+++ b/lisp/url/url-ldap.el
@@ -237,5 +237,4 @@ URL can be a URL string, or a URL vector of the type returned by
(provide 'url-ldap)
-;; arch-tag: 6230e21c-41ae-4174-bd83-82c835676fc8
;;; url-ldap.el ends here
diff --git a/lisp/url/url-mailto.el b/lisp/url/url-mailto.el
index fec991c3ff..51d00259fb 100644
--- a/lisp/url/url-mailto.el
+++ b/lisp/url/url-mailto.el
@@ -142,5 +142,4 @@
(provide 'url-mailto)
-;; arch-tag: 7b7ad52e-8760-497b-9444-75fae14e34c5
;;; url-mailto.el ends here
diff --git a/lisp/url/url-methods.el b/lisp/url/url-methods.el
index aeb78880a8..e7da5254f8 100644
--- a/lisp/url/url-methods.el
+++ b/lisp/url/url-methods.el
@@ -154,5 +154,4 @@ it has not already been loaded."
(provide 'url-methods)
-;; arch-tag: 336863f8-5a07-4906-9be5-b3c6bcebbe67
;;; url-methods.el ends here
diff --git a/lisp/url/url-misc.el b/lisp/url/url-misc.el
index bfcc9db6ba..fb4c6cc998 100644
--- a/lisp/url/url-misc.el
+++ b/lisp/url/url-misc.el
@@ -115,5 +115,4 @@
(provide 'url-misc)
-;; arch-tag: 8c544e1b-d8bc-40a6-b319-f1f37fef65a0
;;; url-misc.el ends here
diff --git a/lisp/url/url-news.el b/lisp/url/url-news.el
index 7f788119c5..71e77cf3a1 100644
--- a/lisp/url/url-news.el
+++ b/lisp/url/url-news.el
@@ -130,5 +130,4 @@
(provide 'url-news)
-;; arch-tag: 8975be13-04e8-4d38-bfff-47918e3ad311
;;; url-news.el ends here
diff --git a/lisp/url/url-nfs.el b/lisp/url/url-nfs.el
index f10b8ce395..6261b6fddb 100644
--- a/lisp/url/url-nfs.el
+++ b/lisp/url/url-nfs.el
@@ -89,5 +89,4 @@ Each can be used any number of times.")
(provide 'url-nfs)
-;; arch-tag: cdf9c9ba-b7d2-4c29-8b48-7ae9bbc0d437
;;; url-nfs.el ends here
diff --git a/lisp/url/url-ns.el b/lisp/url/url-ns.el
index b42052aa33..915d354e64 100644
--- a/lisp/url/url-ns.el
+++ b/lisp/url/url-ns.el
@@ -102,5 +102,4 @@
(provide 'url-ns)
-;; arch-tag: 69520992-cf97-40b4-9ad1-c866d3cae5bf
;;; url-ns.el ends here
diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el
index 2ac7685c6c..0be55e10ab 100644
--- a/lisp/url/url-parse.el
+++ b/lisp/url/url-parse.el
@@ -196,5 +196,4 @@ TYPE USER PASSWORD HOST PORTSPEC FILENAME TARGET ATTRIBUTES FULLNESS."
(provide 'url-parse)
-;; arch-tag: f338325f-71ab-4bee-93cc-78fb9a03d403
;;; url-parse.el ends here
diff --git a/lisp/url/url-privacy.el b/lisp/url/url-privacy.el
index 563ef97418..f15fe97cde 100644
--- a/lisp/url/url-privacy.el
+++ b/lisp/url/url-privacy.el
@@ -75,5 +75,4 @@
(provide 'url-privacy)
-;; arch-tag: fdaf95e4-98f0-4680-94c3-f3eadafabe1d
;;; url-privacy.el ends here
diff --git a/lisp/url/url-proxy.el b/lisp/url/url-proxy.el
index bfea09e831..421c736412 100644
--- a/lisp/url/url-proxy.el
+++ b/lisp/url/url-proxy.el
@@ -76,5 +76,4 @@
(provide 'url-proxy)
-;; arch-tag: 4ff8882e-e498-42b7-abc5-acb449cdbc62
;;; url-proxy.el ends here
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index cce153bdb6..a5971816b1 100644
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -532,5 +532,4 @@ Creates FILE and its parent directories if they do not exist."
(provide 'url-util)
-;; arch-tag: 24352abc-5a5a-412e-90cd-313b26bed5c9
;;; url-util.el ends here
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index f64ef38b8d..b4428a4d0e 100644
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -1,7 +1,7 @@
;;; url-vars.el --- Variables for Uniform Resource Locator tool
-;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Keywords: comm, data, processes, hypermedia
@@ -390,5 +390,4 @@ This should be set, e.g. by mail user agents rendering HTML to avoid
(provide 'url-vars)
-;; arch-tag: 29205e5f-c5ce-433c-8d5d-38cbaed64b49
;;; url-vars.el ends here
diff --git a/lisp/url/url.el b/lisp/url/url.el
index 2529adeb96..fe584a97dd 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -1,7 +1,7 @@
;;; url.el --- Uniform Resource Locator retrieval tool
-;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Bill Perry <wmperry@gnu.org>
;; Keywords: comm, data, processes, hypermedia
@@ -326,5 +326,4 @@ no further processing). URL is either a string or a parsed URL."
(provide 'url)
-;; arch-tag: bc182f1f-d187-4f10-b961-47af2066579a
;;; url.el ends here
diff --git a/lisp/userlock.el b/lisp/userlock.el
index 84b5c47e71..1dd1422723 100644
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -157,5 +157,4 @@ to get the latest version of the file, then make the change again.")
(with-current-buffer standard-output
(help-mode))))
-;; arch-tag: a61c5b60-e1c8-44fd-894a-c617f4dfc639
;;; userlock.el ends here
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index 23b7466f8d..57af8452e0 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -1367,5 +1367,4 @@ old-style time formats for entries are supported."
(provide 'add-log)
-;; arch-tag: 81eee6fc-088f-4372-a37f-80ad9620e762
;;; add-log.el ends here
diff --git a/lisp/vc/compare-w.el b/lisp/vc/compare-w.el
index 5b680ea4f1..a31081253b 100644
--- a/lisp/vc/compare-w.el
+++ b/lisp/vc/compare-w.el
@@ -389,5 +389,4 @@ on third call it again advances points to the next difference and so on."
(provide 'compare-w)
-;; arch-tag: 4177aab1-48e6-4a98-b7a1-000ee285de46
;;; compare-w.el ends here
diff --git a/lisp/vc/cvs-status.el b/lisp/vc/cvs-status.el
index ffcb3a9d53..11190f03ef 100644
--- a/lisp/vc/cvs-status.el
+++ b/lisp/vc/cvs-status.el
@@ -535,5 +535,4 @@ Optional prefix ARG chooses between two representations."
(provide 'cvs-status)
-;; arch-tag: db8b5094-d02a-473e-a476-544e89ff5ad0
;;; cvs-status.el ends here
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index e8c79aead6..72d627475e 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -1938,5 +1938,4 @@ I.e. like `add-change-log-entry-other-window' but applied to all hunks."
;; use `combine-after-change-calls' to minimize the slowdown of font-lock.
;;
-;; arch-tag: 2571d7ff-bc28-4cf9-8585-42e21890be66
;;; diff-mode.el ends here
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index fbbdc3b7bc..ff552210fc 100644
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -1,7 +1,8 @@
;;; ediff-diff.el --- diff-related utilities
-;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-;; 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Package: ediff
diff --git a/lisp/vc/ediff-help.el b/lisp/vc/ediff-help.el
index b77f5f2aaf..a1c1ea10a7 100644
--- a/lisp/vc/ediff-help.el
+++ b/lisp/vc/ediff-help.el
@@ -318,5 +318,4 @@ the value of this variable and the variables `ediff-help-message-*' in
(provide 'ediff-help)
-;; arch-tag: 05659813-7fcf-4274-964f-d2f577431a9d
;;; ediff-help.el ends here
diff --git a/lisp/vc/ediff-hook.el b/lisp/vc/ediff-hook.el
index 83c807564f..b02fe5fbea 100644
--- a/lisp/vc/ediff-hook.el
+++ b/lisp/vc/ediff-hook.el
@@ -260,5 +260,4 @@
(provide 'ediff-hook)
-;; arch-tag: 512f8656-8a4b-4789-af5d-5c6144498df3
;;; ediff-hook.el ends here
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index 56ccc54035..7fad799bfa 100644
--- a/lisp/vc/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -1808,5 +1808,4 @@ Unless optional argument INPLACE is non-nil, return a new string."
;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
;; End:
-;; arch-tag: fa31d384-1e70-4d4b-82a7-3e96307c46f5
;;; ediff-init.el ends here
diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el
index b63bd15f4e..247d6caa62 100644
--- a/lisp/vc/ediff-merg.el
+++ b/lisp/vc/ediff-merg.el
@@ -394,5 +394,4 @@ Combining is done according to the specifications in variable
;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
;; End:
-;; arch-tag: 9b798cf9-02ba-487f-a62e-b63aa823dbfb
;;; ediff-merg.el ends here
diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el
index 58778f4ce9..b8f06f2123 100644
--- a/lisp/vc/ediff-mult.el
+++ b/lisp/vc/ediff-mult.el
@@ -2474,5 +2474,4 @@ for operation, or simply indicate which are equal files. If it is nil, then
;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
;; End:
-;; arch-tag: c8a76898-f96f-4d9c-be9d-129134017188
;;; ediff-mult.el ends here
diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
index c851439de3..be8cd37f0a 100644
--- a/lisp/vc/ediff-ptch.el
+++ b/lisp/vc/ediff-ptch.el
@@ -1,7 +1,8 @@
;;; ediff-ptch.el --- Ediff's patch support
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;; 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Package: ediff
diff --git a/lisp/vc/ediff-vers.el b/lisp/vc/ediff-vers.el
index 487c5e8078..bd225cf7c9 100644
--- a/lisp/vc/ediff-vers.el
+++ b/lisp/vc/ediff-vers.el
@@ -236,5 +236,4 @@ comparison or merge operations are being performed."
;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
;; End:
-;; arch-tag: bbb34f0c-2a90-426a-a77a-c75f479ebbbf
;;; ediff-vers.el ends here
diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el
index 1057dd4c9a..2eb335fb21 100644
--- a/lisp/vc/ediff-wind.el
+++ b/lisp/vc/ediff-wind.el
@@ -1,7 +1,8 @@
;;; ediff-wind.el --- window manipulation utilities
-;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
+;; 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Package: ediff
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index 9866f10107..497994a655 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -1562,5 +1562,4 @@ With optional NODE, goes to that node."
;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
;; End:
-;; arch-tag: 97c71396-db02-4f41-8b48-6a51c3348fcc
;;; ediff.el ends here
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index 94e70ff2b3..64cfa20609 100644
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -875,5 +875,4 @@ anyway and put back as the first line of MSG."
(provide 'log-edit)
-;; arch-tag: 8089b39c-983b-4e83-93cd-ed0a64c7fdcc
;;; log-edit.el ends here
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index fbcb88b3f7..03bd966bc7 100644
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -542,5 +542,4 @@ the changes that affected other files than the currently considered file(s)."
(provide 'log-view)
-;; arch-tag: 0d64220b-ce7e-4f62-9c2a-6b04c2f81f4f
;;; log-view.el ends here
diff --git a/lisp/vc/pcvs-defs.el b/lisp/vc/pcvs-defs.el
index db153fd29a..9e00a988c1 100644
--- a/lisp/vc/pcvs-defs.el
+++ b/lisp/vc/pcvs-defs.el
@@ -525,5 +525,4 @@ message and replace it with a message telling you to change this variable.")
;;
(provide 'pcvs-defs)
-;; arch-tag: c7c701d0-d1d4-4aa9-a302-007bb03aca5e
;;; pcvs-defs.el ends here
diff --git a/lisp/vc/pcvs-info.el b/lisp/vc/pcvs-info.el
index 0b570b1085..b3eed726a9 100644
--- a/lisp/vc/pcvs-info.el
+++ b/lisp/vc/pcvs-info.el
@@ -486,5 +486,4 @@ DIR can also be a file."
(provide 'pcvs-info)
-;; arch-tag: d85dde07-bdc2-400a-882f-92f398c7b0ba
;;; pcvs-info.el ends here
diff --git a/lisp/vc/pcvs-parse.el b/lisp/vc/pcvs-parse.el
index a27fe3e61c..65ff45a462 100644
--- a/lisp/vc/pcvs-parse.el
+++ b/lisp/vc/pcvs-parse.el
@@ -535,5 +535,4 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
(provide 'pcvs-parse)
-;; arch-tag: 35418375-1a23-40a0-957d-96b0262f91d6
;;; pcvs-parse.el ends here
diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el
index ebcd358321..9cf13a0f5c 100644
--- a/lisp/vc/pcvs-util.el
+++ b/lisp/vc/pcvs-util.el
@@ -368,5 +368,4 @@ And reset it unless READ-ONLY is non-nil."
(provide 'pcvs-util)
-;; arch-tag: 3b2588bb-2ae3-4f1f-bf5b-dea91b1f8a59
;;; pcvs-util.el ends here
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el
index fbc089afc4..c0c8010dab 100644
--- a/lisp/vc/pcvs.el
+++ b/lisp/vc/pcvs.el
@@ -2439,5 +2439,4 @@ The exact behavior is determined also by `cvs-dired-use-hook'."
(provide 'pcvs)
-;; arch-tag: 8e3a7494-0453-4389-9ab3-a557ce9fab61
;;; pcvs.el ends here
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 4b85a964fd..594796d033 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -1300,5 +1300,4 @@ If no conflict maker is found, turn off `smerge-mode'."
(provide 'smerge-mode)
-;; arch-tag: 605c8d1e-e43d-4943-a6f3-1bcc4333e690
;;; smerge-mode.el ends here
diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el
index edf632f441..8e626e8c2a 100644
--- a/lisp/vc/vc-annotate.el
+++ b/lisp/vc/vc-annotate.el
@@ -676,5 +676,4 @@ The annotations are relative to the current time, unless overridden by OFFSET."
(provide 'vc-annotate)
-;; arch-tag: c3454a89-80e5-4ffd-8993-671b59612898
;;; vc-annotate.el ends here
diff --git a/lisp/vc/vc-arch.el b/lisp/vc/vc-arch.el
index cbe3a38fcb..846f40fe4e 100644
--- a/lisp/vc/vc-arch.el
+++ b/lisp/vc/vc-arch.el
@@ -638,5 +638,4 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see
(provide 'vc-arch)
-;; arch-tag: a35c7c1c-5237-429d-88ef-3d718fd2e704
;;; vc-arch.el ends here
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index d5d3c9d488..1f368e1169 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -750,7 +750,7 @@ property containing author and date information."
(declare-function vc-annotate-convert-time "vc-annotate" (time))
(defun vc-bzr-annotate-time ()
- (when (re-search-forward "^ *[0-9.]+ +.* +|" nil t)
+ (when (re-search-forward "^ *[0-9.]+ +.+? +|" nil t)
(let ((prop (get-text-property (line-beginning-position) 'help-echo)))
(string-match "[0-9]+\\'" prop)
(let ((str (match-string-no-properties 0 prop)))
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index 3b5766bda6..1619636cbe 100644
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -1210,5 +1210,4 @@ is non-nil."
(provide 'vc-cvs)
-;; arch-tag: 60e1402a-aa53-4607-927a-cf74f144b432
;;; vc-cvs.el ends here
diff --git a/lisp/vc/vc-dav.el b/lisp/vc/vc-dav.el
index 571a2ca868..26c6bf2ce9 100644
--- a/lisp/vc/vc-dav.el
+++ b/lisp/vc/vc-dav.el
@@ -186,5 +186,4 @@ It should return a status of either 0 (no differences found), or
(provide 'vc-dav)
-;; arch-tag: 0a0fb9fe-8190-4c0a-a179-5c291d3a467e
;;; vc-dav.el ends here
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 36e6967722..84349e8624 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -1259,5 +1259,4 @@ These are the commands available for use in the file status buffer:
(provide 'vc-dir)
-;; arch-tag: 0274a2e3-e8e9-4b1a-a73c-e8b9129d5d15
;;; vc-dir.el ends here
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index cb5bd0a2c2..2760fe2dae 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -692,5 +692,4 @@ the buffer contents as a comment."
(provide 'vc-dispatcher)
-;; arch-tag: 7d08b17f-5470-4799-914b-bfb9fcf6a246
;;; vc-dispatcher.el ends here
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 6d3a699135..7e051fd8dc 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1036,5 +1036,4 @@ Returns nil if not possible."
(provide 'vc-git)
-;; arch-tag: bd10664a-0e5b-48f5-a877-6c17b135be12
;;; vc-git.el ends here
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 62deb5b050..d6c6f752e4 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -635,5 +635,4 @@ and that it passes `vc-hg-global-switches' to it before FLAGS."
(provide 'vc-hg)
-;; arch-tag: bd094dc5-715a-434f-a331-37b9fb7cd954
;;; vc-hg.el ends here
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 38bc121e70..748266efd3 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -1052,5 +1052,4 @@ current, and kill the buffer that visits the link."
(provide 'vc-hooks)
-;; arch-tag: 2e5a6fa7-1d30-48e2-8bd0-e3d335f04f32
;;; vc-hooks.el ends here
diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el
index 0bf30aca6a..0315392810 100644
--- a/lisp/vc/vc-mtn.el
+++ b/lisp/vc/vc-mtn.el
@@ -341,5 +341,4 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
(provide 'vc-mtn)
-;; arch-tag: 2b89ffbc-cbb8-405a-9080-2eafd4becb70
;;; vc-mtn.el ends here
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index ea0fed7bf0..1d88288cf5 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -1467,5 +1467,4 @@ The `:insn' key is a keyword to distinguish it as a vc-rcs.el extension."
(provide 'vc-rcs)
-;; arch-tag: 759b4916-5b0d-431d-b647-b185b8c652cf
;;; vc-rcs.el ends here
diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el
index f717ed0962..4d43d758e7 100644
--- a/lisp/vc/vc-sccs.el
+++ b/lisp/vc/vc-sccs.el
@@ -483,5 +483,4 @@ If NAME is nil or a revision number string it's just passed through."
(provide 'vc-sccs)
-;; arch-tag: d751dee3-d7b3-47e1-95e3-7ae98c052041
;;; vc-sccs.el ends here
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index 635cb14bd8..2a4a79f0ec 100644
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -744,5 +744,4 @@ information about FILENAME and return its status."
(provide 'vc-svn)
-;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d
;;; vc-svn.el ends here
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index d243cb1ce5..2f26c1eb50 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2775,5 +2775,4 @@ Invoke FUNC f ARGS on each VC-managed file f underneath it."
(provide 'vc)
-;; arch-tag: ca82c1de-3091-4e26-af92-460abc6213a6
;;; vc.el ends here
diff --git a/lisp/vcursor.el b/lisp/vcursor.el
index 98f1d612fb..a474058f70 100644
--- a/lisp/vcursor.el
+++ b/lisp/vcursor.el
@@ -1144,5 +1144,4 @@ line is treated like ordinary characters."
(provide 'vcursor)
-;; arch-tag: cdfe1cdc-2c46-4046-88e4-ed57d20f7aca
;;; vcursor.el ends here
diff --git a/lisp/view.el b/lisp/view.el
index 313d798492..77cbf129ed 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -1086,5 +1086,4 @@ If TIMES is negative, search backwards."
(provide 'view)
-;; arch-tag: 6d0ace36-1d12-4de3-8de3-1fa3231636d7
;;; view.el ends here
diff --git a/lisp/vt-control.el b/lisp/vt-control.el
index 81b734e077..7ad1f65397 100644
--- a/lisp/vt-control.el
+++ b/lisp/vt-control.el
@@ -108,5 +108,4 @@
(provide 'vt-control)
-;; arch-tag: d4fed1bf-2524-4ba1-a4fe-86bca3d928a2
;;; vt-control.el ends here
diff --git a/lisp/vt100-led.el b/lisp/vt100-led.el
index 350a8f3ab8..b76fc23979 100644
--- a/lisp/vt100-led.el
+++ b/lisp/vt100-led.el
@@ -66,5 +66,4 @@ Element 0 is not used.")
(provide 'vt100-led)
-;; arch-tag: 346e6480-5e31-4234-aafe-257cea4a36d1
;;; vt100-led.el ends here
diff --git a/lisp/wdired.el b/lisp/wdired.el
index a9189c3920..8f303194a5 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -841,5 +841,4 @@ Like original function but it skips read-only words."
;; byte-compile-dynamic: t
;; End:
-;; arch-tag: bc00902e-526f-4305-bc7f-8862a559184f
;;; wdired.el ends here
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 6a8b3b671e..c393c7e78c 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -1188,7 +1188,8 @@ See also `whitespace-newline' and `whitespace-display-mappings'."
:global t
:group 'whitespace
(let ((whitespace-style '(newline-mark newline)))
- (global-whitespace-mode global-whitespace-newline-mode)
+ (global-whitespace-mode (if global-whitespace-newline-mode
+ 1 -1))
;; sync states (running a batch job)
(setq global-whitespace-newline-mode global-whitespace-mode)))
@@ -2668,5 +2669,4 @@ It should be added buffer-locally to `write-file-functions'."
(run-hooks 'whitespace-load-hook)
-;; arch-tag: 1b1e2500-dbd4-4a26-8f7a-5a5edfd3c97e
;;; whitespace.el ends here
diff --git a/lisp/wid-browse.el b/lisp/wid-browse.el
index 569b511ed4..dd4a641b3d 100644
--- a/lisp/wid-browse.el
+++ b/lisp/wid-browse.el
@@ -279,5 +279,4 @@ With arg, turn widget mode on if and only if arg is positive."
(provide 'wid-browse)
-;; arch-tag: d5ffb18f-8984-4735-8502-edf70456db21
;;; wid-browse.el ends here
diff --git a/lisp/widget.el b/lisp/widget.el
index a05faae6b2..c74bf89a63 100644
--- a/lisp/widget.el
+++ b/lisp/widget.el
@@ -96,5 +96,4 @@ The third argument DOC is a documentation string for the widget."
(provide 'widget)
-;; arch-tag: 932c71a3-9aeb-4827-a293-8b88b26d5c58
;;; widget.el ends here
diff --git a/lisp/windmove.el b/lisp/windmove.el
index 81367ac5f0..493f2618aa 100644
--- a/lisp/windmove.el
+++ b/lisp/windmove.el
@@ -568,5 +568,4 @@ Default MODIFIER is 'shift."
(provide 'windmove)
-;; arch-tag: 56267432-bf1a-4296-a9a0-85c6bd9f2375
;;; windmove.el ends here
diff --git a/lisp/window.el b/lisp/window.el
index 03cc2732a9..c03b8a1840 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -2039,5 +2039,4 @@ Otherwise, consult the value of `truncate-partial-width-windows'
(define-key ctl-x-map "+" 'balance-windows)
(define-key ctl-x-4-map "0" 'kill-buffer-and-window)
-;; arch-tag: b508dfcc-c353-4c37-89fa-e773fe10cea9
;;; window.el ends here
diff --git a/lisp/winner.el b/lisp/winner.el
index f1fcb8ff9d..d29ad3fb04 100644
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -473,5 +473,4 @@ In other words, \"undo\" changes in window configuration."
minor-mode-map-alist))
(provide 'winner)
-;; arch-tag: 686d1c1b-010e-42ca-a192-b5685112418f
;;; winner.el ends here
diff --git a/lisp/xml.el b/lisp/xml.el
index edcc13d6b8..a33d44dc6c 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -911,5 +911,4 @@ The first line is indented with INDENT-STRING."
(provide 'xml)
-;; arch-tag: 5864b283-5a68-4b59-a20d-36a72b353b9b
;;; xml.el ends here
diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index 5a70e6a680..4269a17612 100644
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -265,5 +265,4 @@ down the SHIFT key while pressing the mouse button."
(provide 'xt-mouse)
-;; arch-tag: 84962d4e-fae9-4c13-a9d7-ef4925a4ac03
;;; xt-mouse.el ends here
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 07ed274461..a0ec95ca3a 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1661,4 +1661,3 @@
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: 0cd8ab87-d764-40d9-b86d-d00c71887a9e
diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index 0a37c1c62e..49adfe4dd4 100644
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -1,6 +1,6 @@
# Copyright (C) 1992, 1993 Lucid, Inc.
-# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+# 2009, 2010, 2011 Free Software Foundation, Inc.
#
# This file is part of the Lucid Widget Library.
#
diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index e89282853b..ba7740a452 100644
--- a/lwlib/lwlib-Xaw.c
+++ b/lwlib/lwlib-Xaw.c
@@ -835,5 +835,3 @@ xaw_creation_table [] =
{NULL, NULL}
};
-/* arch-tag: fbbd3589-ae1c-41a0-9142-f628cfee6564
- (do not change this comment) */
diff --git a/lwlib/lwlib-Xaw.h b/lwlib/lwlib-Xaw.h
index e359b95359..cf23127012 100644
--- a/lwlib/lwlib-Xaw.h
+++ b/lwlib/lwlib-Xaw.h
@@ -28,5 +28,3 @@ xaw_pop_instance (widget_instance *, Boolean);
#endif /* LWLIB_XAW_H */
-/* arch-tag: 7c0fb4de-afd9-4112-9214-24b663cc1870
- (do not change this comment) */
diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c
index 0785c586e7..c988f1dcb4 100644
--- a/lwlib/lwlib-Xlw.c
+++ b/lwlib/lwlib-Xlw.c
@@ -274,5 +274,3 @@ xlw_destroy_instance (widget_instance *instance)
XtDestroyWidget (instance->widget);
}
-/* arch-tag: 541e3912-477d-406e-9bf2-dbf2b7ff8c3b
- (do not change this comment) */
diff --git a/lwlib/lwlib-Xlw.h b/lwlib/lwlib-Xlw.h
index cb2125ee17..3b2c301c3d 100644
--- a/lwlib/lwlib-Xlw.h
+++ b/lwlib/lwlib-Xlw.h
@@ -28,5 +28,3 @@ xlw_popup_menu (Widget widget, XEvent * event);
#endif /* LWLIB_XLW_H */
-/* arch-tag: e5b1511d-8992-4dad-b947-a2440d8f10a2
- (do not change this comment) */
diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index fc55cac894..60f282e69f 100644
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -1958,5 +1958,3 @@ xm_manage_resizing (Widget w, Boolean flag)
XtVaSetValues (w, XtNallowShellResize, flag, NULL);
}
-/* arch-tag: 73976f64-73b2-4600-aa13-d9ede20ee965
- (do not change this comment) */
diff --git a/lwlib/lwlib-Xm.h b/lwlib/lwlib-Xm.h
index a68fd4ee45..70f8728f76 100644
--- a/lwlib/lwlib-Xm.h
+++ b/lwlib/lwlib-Xm.h
@@ -59,5 +59,3 @@ xm_manage_resizing (Widget w, Boolean flag);
#endif /* LWLIB_XM_H */
-/* arch-tag: 61561304-c146-437b-8ed3-dc33818703c6
- (do not change this comment) */
diff --git a/lwlib/lwlib-int.h b/lwlib/lwlib-int.h
index 5282bc0f84..b8e1316e7a 100644
--- a/lwlib/lwlib-int.h
+++ b/lwlib/lwlib-int.h
@@ -80,5 +80,3 @@ widget_instance * lw_get_widget_instance (Widget);
#endif /* LWLIB_INTERNAL_H */
-/* arch-tag: ae02f67d-ef25-421c-b956-b01a4b0aac76
- (do not change this comment) */
diff --git a/lwlib/lwlib-utils.c b/lwlib/lwlib-utils.c
index 997dc5766e..0a5c553c95 100644
--- a/lwlib/lwlib-utils.c
+++ b/lwlib/lwlib-utils.c
@@ -175,5 +175,3 @@ XtSafelyDestroyWidget (Widget widget)
#endif
}
-/* arch-tag: f21f0a1f-2a4e-44e1-8715-7f234fe2d159
- (do not change this comment) */
diff --git a/lwlib/lwlib-utils.h b/lwlib/lwlib-utils.h
index d4dbda8467..b988374288 100644
--- a/lwlib/lwlib-utils.h
+++ b/lwlib/lwlib-utils.h
@@ -19,5 +19,3 @@ void XtSafelyDestroyWidget (Widget);
#endif /* _LWLIB_UTILS_H_ */
-/* arch-tag: 705efd86-9319-4447-80f6-16aa5b349809
- (do not change this comment) */
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index ccdadcf67b..16e70ac470 100644
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -1422,5 +1422,3 @@ lw_separator_p (const char *label, enum menu_separator *type, int motif_p)
return separator_p;
}
-/* arch-tag: 3d730f36-a441-4a71-9971-48ef3b5a4d9f
- (do not change this comment) */
diff --git a/lwlib/lwlib.h b/lwlib/lwlib.h
index f2c0691386..1dea8c37f5 100644
--- a/lwlib/lwlib.h
+++ b/lwlib/lwlib.h
@@ -191,5 +191,3 @@ int lw_separator_p (const char *label, enum menu_separator *type,
#endif /* LWLIB_H */
-/* arch-tag: 44d818d5-7eb2-4d87-acd7-b992bb0d5d20
- (do not change this comment) */
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index b6c8c1d90a..c7b0556cca 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -2691,5 +2691,3 @@ pop_up_menu (XlwMenuWidget mw, XButtonPressedEvent *event)
handle_motion_event (mw, (XMotionEvent*)event);
}
-/* arch-tag: 657f43dd-dfd0-4cc9-910c-52935f01176e
- (do not change this comment) */
diff --git a/lwlib/xlwmenu.h b/lwlib/xlwmenu.h
index 3279d10f76..e2b3cb9535 100644
--- a/lwlib/xlwmenu.h
+++ b/lwlib/xlwmenu.h
@@ -86,5 +86,3 @@ extern void xlwmenu_redisplay (Widget);
#endif /* _XlwMenu_h */
-/* arch-tag: 0c019735-d61b-4080-be85-4fdd6e50ae07
- (do not change this comment) */
diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h
index 2ecffc9cef..c44a93d0a5 100644
--- a/lwlib/xlwmenuP.h
+++ b/lwlib/xlwmenuP.h
@@ -142,5 +142,3 @@ extern XlwMenuClassRec xlwMenuClassRec;
#endif /* _XlwMenuP_h */
-/* arch-tag: 18d7fc41-ffa0-47a3-a49f-3469900c7a25
- (do not change this comment) */
diff --git a/msdos/is_exec.c b/msdos/is_exec.c
index 493db79790..16b01c59a0 100644
--- a/msdos/is_exec.c
+++ b/msdos/is_exec.c
@@ -236,5 +236,3 @@ _is_executable(const char *filename, int fhandle, const char *extension)
return 0;
}
-/* arch-tag: b0965811-8c3e-4bc4-8d81-4447a3594785
- (do not change this comment) */
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index f778303eb2..fc1be32c2b 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -2,8 +2,8 @@
# Configuration script for src/Makefile under DJGPP v2.x
# ----------------------------------------------------------------------
#
-# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
@@ -178,4 +178,3 @@ s/echo.*buildobj.lst/dj&/
/^ *THEFILE=/s|$|\; cd ../src|
/^ echo.* buildobj.h/s|echo |djecho |
-# arch-tag: c7e3aacb-4162-460e-99f9-4252bca68d2c
diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp
index aa755ee784..06b95f7fd8 100644
--- a/msdos/sed1x.inp
+++ b/msdos/sed1x.inp
@@ -3,7 +3,7 @@
# ----------------------------------------------------------------------
#
# Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
@@ -31,4 +31,3 @@ s/DOC/DOC-X/g
/^WINDOW_SUPPORT *=/s!= *!= $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT)!
/^temacs *:/s!OLDXMENU!LIBXMENU!
-# arch-tag: 3e8a78f2-3dec-44f3-81f6-3785a562da19
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index 42f144d08b..34cf278a15 100644
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -91,4 +91,3 @@ s/^#undef POINTER_TYPE *$/#define POINTER_TYPE void/
/^#undef BSTRING/s|#undef|# undef|
/^#undef .*$/s|^.*$|/* & */|
-# arch-tag: 2acb5571-ff53-4822-9175-95b864b59f7c
diff --git a/msdos/sed2x.inp b/msdos/sed2x.inp
index e37c8d568b..220a84d84e 100644
--- a/msdos/sed2x.inp
+++ b/msdos/sed2x.inp
@@ -2,8 +2,8 @@
# Extra configuration script for src/config.h for DesqView/X
# ----------------------------------------------------------------------
#
-# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+# 2009, 2010, 2011 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
@@ -24,4 +24,3 @@
/^#undef HAVE_XSETWMPROTOCOLS *$/s/undef/define/
/^#undef HAVE_SELECT *$/s/undef/define/
-# arch-tag: 4a41c3ea-eb6c-4e17-8432-307516498e5a
diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp
index 911166da47..5e64f0709c 100644
--- a/msdos/sed3v2.inp
+++ b/msdos/sed3v2.inp
@@ -52,4 +52,3 @@ s!^ \./! !
s/movemail[^ ]* *//
}
-# arch-tag: 16f3be18-a45b-496c-b19c-e43840359de8
diff --git a/msdos/sed4.inp b/msdos/sed4.inp
index fdd3ef0b86..8dc758915c 100644
--- a/msdos/sed4.inp
+++ b/msdos/sed4.inp
@@ -21,4 +21,3 @@
/^#define *PATH_DOC/s/".*"/rootrelativepath ("etc")/
/^#define *PATH_INFO/s/".*"/rootrelativepath ("info")/
-# arch-tag: c84fa640-e434-4408-9e89-16d9e4ebe74e
diff --git a/msdos/sed5x.inp b/msdos/sed5x.inp
index ffc0d06198..3442041d61 100644
--- a/msdos/sed5x.inp
+++ b/msdos/sed5x.inp
@@ -2,8 +2,8 @@
# Configuration script for oldxmenu/makefile for DesqView/X
# ----------------------------------------------------------------------
#
-# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+# 2009, 2010, 2011 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
@@ -24,4 +24,3 @@
/^CFLAGS *=/s/@[^@\n]*@/-O2 -g/
s/|| true//
-# arch-tag: 612a79be-2a02-4cb0-8dec-779aac0a2f4f
diff --git a/msdos/sed6.inp b/msdos/sed6.inp
index d3e644e975..44efff0f1d 100644
--- a/msdos/sed6.inp
+++ b/msdos/sed6.inp
@@ -45,4 +45,3 @@ export texinputdir := $(srcdir)";"$(TEXINPUTS)
/^mkinfodir *=/s| @.*$|@command.com /c if not exist ..\\..\\info\\emacs mkdir ..\\..\\info|
-# arch-tag: defe1001-f35a-47f7-9635-3f5d33ee5e97
diff --git a/msdos/sedalloc.inp b/msdos/sedalloc.inp
index 63d2f98457..003862c615 100644
--- a/msdos/sedalloc.inp
+++ b/msdos/sedalloc.inp
@@ -22,4 +22,3 @@
#define SYSTEM_MALLOC 1
/^#define REL_ALLOC *1 *$/s|^.*$|/* #undef REL_ALLOC */|
-# arch-tag: 20b3ad5d-fcd7-4751-aa34-e94e770ded87
diff --git a/msdos/sedleim.inp b/msdos/sedleim.inp
index 4d81b504ce..9b925a5b9c 100644
--- a/msdos/sedleim.inp
+++ b/msdos/sedleim.inp
@@ -60,4 +60,3 @@ install: all\
s|\(rm -f Makefile\)|\1 stamp-subdir|
}
-# arch-tag: 33c5eed1-78bc-4a6e-9d11-cbc7c541b763
diff --git a/msdos/sedlisp.inp b/msdos/sedlisp.inp
index 9d5afc76ee..68b1712442 100644
--- a/msdos/sedlisp.inp
+++ b/msdos/sedlisp.inp
@@ -25,4 +25,3 @@ export FNCASE=y
/^top_srcdir *=/s|@top_srcdir@|./..|
/^abs_top_builddir *=/s|@abs_top_builddir@|$(CURDIR)/..|
-# arch-tag: da7a3cff-4839-4ad7-bbe3-e2b61c84c38e
diff --git a/msdos/sigaction.c b/msdos/sigaction.c
index 6a24c9929e..44f7954fa2 100644
--- a/msdos/sigaction.c
+++ b/msdos/sigaction.c
@@ -55,5 +55,3 @@ sigaction(int _sig, const struct sigaction *_act, struct sigaction *_oact)
-/* arch-tag: 39526405-3d3a-44fe-af28-82a515e0c8e8
- (do not change this comment) */
diff --git a/nextstep/Cocoa/Emacs.base/Contents/Resources/Credits.html b/nextstep/Cocoa/Emacs.base/Contents/Resources/Credits.html
index c053cfadc3..9a9e2f3c69 100644
--- a/nextstep/Cocoa/Emacs.base/Contents/Resources/Credits.html
+++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/Credits.html
@@ -1,4 +1 @@
<font face="lucida grande" size="-1"><a href="http://www.gnu.org/software/emacs">http://www.gnu.org/software/emacs</a></font>
-
-<!-- arch-tag: cc455793-f594-45c6-822c-f4a7bb362c15
- (do not change this comment) -->
diff --git a/nt/.gitignore b/nt/.gitignore
index bdeeae1e89..4e2fa24e12 100644
--- a/nt/.gitignore
+++ b/nt/.gitignore
@@ -3,5 +3,3 @@ stamp_BLD
oo/
oo-spd/
-
-# arch-tag: a25a0376-d3d9-4b3e-a52a-7c3eac9fdba3
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 2fee776a26..ac7001cf1c 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1938,4 +1938,3 @@
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: b3d2c29c-04a0-45d0-b52d-57354711c414
diff --git a/nt/README b/nt/README
index ef84912bf8..a7921e93b5 100644
--- a/nt/README
+++ b/nt/README
@@ -1,7 +1,7 @@
Emacs for Windows NT/2000 and Windows 95/98/ME
- 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.
See the end of the file for license conditions.
This directory contains support for compiling and running GNU Emacs on
diff --git a/nt/README.W32 b/nt/README.W32
index e9e9d00aea..669dde98c0 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -1,5 +1,5 @@
-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.
See the end of the file for license conditions.
Emacs for Windows
diff --git a/nt/addpm.c b/nt/addpm.c
index 8a5e1a435c..b447222b94 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -371,5 +371,3 @@ main (int argc, char *argv[])
return 0;
}
-/* arch-tag: f923609d-b781-4ef4-abce-ca0da29cbbf0
- (do not change this comment) */
diff --git a/nt/addsection.c b/nt/addsection.c
index df9d320bbf..994842b3e5 100644
--- a/nt/addsection.c
+++ b/nt/addsection.c
@@ -542,5 +542,3 @@ main (int argc, char **argv)
/* eof */
-/* arch-tag: 17e2b0aa-8c17-4bd1-b24b-1cda689245fa
- (do not change this comment) */
diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index a73368b6a2..064ee8f72e 100644
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -718,5 +718,3 @@ main (int argc, char ** argv)
return 0;
}
-/* arch-tag: 88678d93-07ac-4e2f-ad63-d4a740ca69ac
- (do not change this comment) */
diff --git a/nt/config.nt b/nt/config.nt
index 8a20337293..eb64a037a2 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -422,5 +422,3 @@ void w32_abort (void) NO_RETURN;
/* Make a leaner executable. */
#define WIN32_LEAN_AND_MEAN 1
-/* arch-tag: df720992-aa5a-499a-882d-958dc5eeb5e9
- (do not change this comment) */
diff --git a/nt/configure.bat b/nt/configure.bat
index 9dc0e6da5b..9bdae8e02c 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -802,6 +802,3 @@ set HAVE_TIFF=
set HAVE_XPM=
set dbginfo=
-goto skipArchTag
- arch-tag: 300d20a4-1675-4e75-b615-7ce1a8c5376c
-:skipArchTag
diff --git a/nt/ddeclient.c b/nt/ddeclient.c
index abde2aa86a..b7b1ba0b30 100644
--- a/nt/ddeclient.c
+++ b/nt/ddeclient.c
@@ -72,5 +72,3 @@ main (int argc, char *argv[])
return (0);
}
-/* arch-tag: 360d7a99-2cae-447e-8d06-41ca41987e30
- (do not change this comment) */
diff --git a/nt/envadd.bat b/nt/envadd.bat
index 3bfad8eb23..0b40434a8c 100644
--- a/nt/envadd.bat
+++ b/nt/envadd.bat
@@ -42,6 +42,3 @@ shift
rem Now, run the command line
%1 %2 %3 %4 %5 %6 %7 %8 %9
-goto skipArchTag
- arch-tag: 148c5181-dbce-43ae-bba6-1cc6e2a9ea75
-:skipArchTag
diff --git a/nt/ftime-nostartup.bat b/nt/ftime-nostartup.bat
index 40f0a37628..f9e93b7f96 100755
--- a/nt/ftime-nostartup.bat
+++ b/nt/ftime-nostartup.bat
@@ -22,6 +22,3 @@ if errorlevel 1 goto done
plist ..\src\obj\i386\pemacs > %1
:done
-goto skipArchTag
- arch-tag: 927c5199-a8a3-4cf0-ab56-62b66fc6520d
-:skipArchTag
diff --git a/nt/ftime.bat b/nt/ftime.bat
index beb87af459..b7cdf968c1 100644
--- a/nt/ftime.bat
+++ b/nt/ftime.bat
@@ -22,6 +22,3 @@ if errorlevel 1 goto done
plist ..\src\obj\i386\pemacs > %1
:done
-goto skipArchTag
- arch-tag: d1c629de-9172-4d72-ab68-9d45ab9903cc
-:skipArchTag
diff --git a/nt/gmake.defs b/nt/gmake.defs
index 6c9d62223c..9cad0a2a16 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -303,4 +303,3 @@ export XMFLAGS
$(BLD)/%.o: %.c
$(CC) $(CFLAGS) $(CC_OUT)$@ $<
-# arch-tag: 35eb9662-8534-4bcf-b891-0730a09d657f
diff --git a/nt/inc/arpa/inet.h b/nt/inc/arpa/inet.h
index 9074508a1d..075752a721 100644
--- a/nt/inc/arpa/inet.h
+++ b/nt/inc/arpa/inet.h
@@ -1,4 +1,2 @@
/* null version of <arpa/inet.h> - <sys/socket.h> has everything */
-/* arch-tag: 13c7a7f7-40d0-49e8-bdfb-6dcf2f3a7340
- (do not change this comment) */
diff --git a/nt/inc/netdb.h b/nt/inc/netdb.h
index bdb1ce546c..ffe4f02311 100644
--- a/nt/inc/netdb.h
+++ b/nt/inc/netdb.h
@@ -1,4 +1,2 @@
/* null version of <netdb.h> - <sys/socket.h> has everything */
-/* arch-tag: 237ba543-97e2-4bd5-9c9c-32271d955eb1
- (do not change this comment) */
diff --git a/nt/inc/netinet/in.h b/nt/inc/netinet/in.h
index 2e4f1e1a7e..798da461aa 100644
--- a/nt/inc/netinet/in.h
+++ b/nt/inc/netinet/in.h
@@ -1,4 +1,2 @@
/* null version of <netinet/in.h> - <sys/socket.h> has everything */
-/* arch-tag: 49ff589e-100e-4f8f-8b2a-1c3b542590df
- (do not change this comment) */
diff --git a/nt/inc/pwd.h b/nt/inc/pwd.h
index d8a4ffc2e2..b39309d08f 100644
--- a/nt/inc/pwd.h
+++ b/nt/inc/pwd.h
@@ -24,5 +24,3 @@ struct passwd * getpwuid (unsigned);
#endif /* _PWD_H_ */
-/* arch-tag: 68308424-cb2b-49ed-bb52-b347fee416bf
- (do not change this comment) */
diff --git a/nt/inc/sys/dir.h b/nt/inc/sys/dir.h
index e317d008d2..dc075cd758 100644
--- a/nt/inc/sys/dir.h
+++ b/nt/inc/sys/dir.h
@@ -4,5 +4,3 @@
#include "..\..\..\src\ndir.h"
-/* arch-tag: 090c9091-3b16-429b-9c40-8aecce1162be
- (do not change this comment) */
diff --git a/nt/inc/sys/file.h b/nt/inc/sys/file.h
index 4460da0927..504dce56d8 100644
--- a/nt/inc/sys/file.h
+++ b/nt/inc/sys/file.h
@@ -10,5 +10,3 @@
#define D_OK 8
#endif
-/* arch-tag: 7df3e73e-56bc-4ad9-b699-33149ea47959
- (do not change this comment) */
diff --git a/nt/inc/sys/ioctl.h b/nt/inc/sys/ioctl.h
index b3c6b3b107..060def367f 100644
--- a/nt/inc/sys/ioctl.h
+++ b/nt/inc/sys/ioctl.h
@@ -4,5 +4,3 @@
* compiler will pick this up empty header instead.
*/
-/* arch-tag: c6e9015a-930a-4ad3-b368-ac32f84475d7
- (do not change this comment) */
diff --git a/nt/inc/sys/param.h b/nt/inc/sys/param.h
index 971d4b1075..27f64038c1 100644
--- a/nt/inc/sys/param.h
+++ b/nt/inc/sys/param.h
@@ -9,5 +9,3 @@
#endif /* _PARAM_H_ */
-/* arch-tag: b1d90296-ec38-4839-83bd-0ddfd2528435
- (do not change this comment) */
diff --git a/nt/inc/sys/time.h b/nt/inc/sys/time.h
index a3808f4c5c..c90d1fd62f 100644
--- a/nt/inc/sys/time.h
+++ b/nt/inc/sys/time.h
@@ -22,5 +22,3 @@ void gettimeofday (struct timeval *, struct timezone *);
/* end of sys/time.h */
-/* arch-tag: bc525883-0c81-4bea-b83d-3325461f38b5
- (do not change this comment) */
diff --git a/nt/inc/unistd.h b/nt/inc/unistd.h
index 9bf9cb7597..7e77f95da4 100644
--- a/nt/inc/unistd.h
+++ b/nt/inc/unistd.h
@@ -1,4 +1,2 @@
/* Fake unistd.h: config.h already provides most of the relevant things. */
-/* arch-tag: 68600bcd-3097-4501-a559-551db3cdb9fd
- (do not change this comment) */
diff --git a/nt/multi-install-info.bat b/nt/multi-install-info.bat
index 9473f06804..81e8c5657b 100644
--- a/nt/multi-install-info.bat
+++ b/nt/multi-install-info.bat
@@ -39,6 +39,3 @@ if .%1% == . goto EndLoop
goto Loop
:EndLoop
-goto skipArchTag
- arch-tag: 4f590862-8ead-497a-a71c-fb4b0e5d50db
-:skipArchTag
diff --git a/nt/nmake.defs b/nt/nmake.defs
index a771f1df5d..4e23aab2c7 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -246,4 +246,3 @@ EXTRA_LINK = -profile
$(CC) $(CFLAGS) -Fo$(BLD)\ $<
!ENDIF
-# arch-tag: fefa49b0-c23c-46c7-9094-cab2a405058e
diff --git a/nt/paths.h b/nt/paths.h
index 8766eadb5f..3934a8efbd 100644
--- a/nt/paths.h
+++ b/nt/paths.h
@@ -56,5 +56,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* #define PATH_INFO "/usr/local/info" */
#define PATH_INFO "C:/emacs/info"
-/* arch-tag: f6d46f3c-e1e9-436b-8629-edcaf6597973
- (do not change this comment) */
diff --git a/nt/preprep.c b/nt/preprep.c
index 285ff69b6d..8c791d3463 100644
--- a/nt/preprep.c
+++ b/nt/preprep.c
@@ -828,5 +828,3 @@ main (int argc, char **argv)
/* eof */
-/* arch-tag: 144ca747-168e-43a0-9736-3f4c0ba1657f
- (do not change this comment) */
diff --git a/nt/runemacs.c b/nt/runemacs.c
index dc8503b7a3..eda063c39c 100644
--- a/nt/runemacs.c
+++ b/nt/runemacs.c
@@ -202,5 +202,3 @@ set_user_model_id (void)
}
}
-/* arch-tag: 7e02df73-4df7-4aa0-baea-99c6d047a384
- (do not change this comment) */
diff --git a/nt/zipdist.bat b/nt/zipdist.bat
index af90f6173b..458883b2ca 100644
--- a/nt/zipdist.bat
+++ b/nt/zipdist.bat
@@ -1,6 +1,6 @@
@echo off
-rem Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-rem Free Software Foundation, Inc.
+rem Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+rem 2010, 2011 Free Software Foundation, Inc.
rem Author: Christoph Scholtes cschol2112 at gmail.com
diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index 118024170e..d523492bfc 100644
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -608,5 +608,3 @@ XMenuActivate(
}
-/* arch-tag: 6b90b578-ecea-4328-b460-a0c96963f872
- (do not change this comment) */
diff --git a/oldXMenu/AddPane.c b/oldXMenu/AddPane.c
index 6312aa2c70..67900a6bc7 100644
--- a/oldXMenu/AddPane.c
+++ b/oldXMenu/AddPane.c
@@ -102,5 +102,3 @@ XMenuAddPane(Display *display, register XMenu *menu, register char *label, int a
return((menu->p_count - 1));
}
-/* arch-tag: 62a26021-f29d-48ba-96ef-3b6c4ebd6547
- (do not change this comment) */
diff --git a/oldXMenu/AddSel.c b/oldXMenu/AddSel.c
index d2f2156b07..9183aba7e8 100644
--- a/oldXMenu/AddSel.c
+++ b/oldXMenu/AddSel.c
@@ -104,5 +104,3 @@ XMenuAddSelection(Display *display, register XMenu *menu, register int p_num, ch
return((pane->s_count - 1));
}
-/* arch-tag: 0161f024-c739-440d-9498-050280c6c355
- (do not change this comment) */
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index c3065524b5..b94ecb7c4f 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -591,4 +591,3 @@
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: 8b17c869-6677-40ce-be86-e62cf34061cf
diff --git a/oldXMenu/ChgPane.c b/oldXMenu/ChgPane.c
index 9217c84864..38b6382016 100644
--- a/oldXMenu/ChgPane.c
+++ b/oldXMenu/ChgPane.c
@@ -66,5 +66,3 @@ XMenuChangePane(register XMenu *menu, register int p_num, char *label)
return(p_num);
}
-/* arch-tag: e267e9de-a3f0-4a0d-8c45-413afa176fd8
- (do not change this comment) */
diff --git a/oldXMenu/ChgSel.c b/oldXMenu/ChgSel.c
index b23bb6fd34..dcefb6c3a5 100644
--- a/oldXMenu/ChgSel.c
+++ b/oldXMenu/ChgSel.c
@@ -88,5 +88,3 @@ XMenuChangeSelection(Display *display, register XMenu *menu, register int p_num,
return(s_num);
}
-/* arch-tag: 229732a6-46bf-4a3a-ad90-3d8ed65c0841
- (do not change this comment) */
diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c
index fc979ad948..b5f814a6ec 100644
--- a/oldXMenu/Create.c
+++ b/oldXMenu/Create.c
@@ -754,5 +754,3 @@ XMenuCreate(Display *display, Window parent, register char *def_env)
return(menu);
}
-/* arch-tag: 6945b7d2-3b13-40b9-8b6e-56b1b20f3463
- (do not change this comment) */
diff --git a/oldXMenu/DelPane.c b/oldXMenu/DelPane.c
index baa1b8def4..10234e0290 100644
--- a/oldXMenu/DelPane.c
+++ b/oldXMenu/DelPane.c
@@ -87,5 +87,3 @@ XMenuDeletePane(register Display *display, register XMenu *menu, register int p_
return(p_num);
}
-/* arch-tag: 32a5bfd4-4bac-4090-bb53-844110f4908e
- (do not change this comment) */
diff --git a/oldXMenu/DelSel.c b/oldXMenu/DelSel.c
index 9b0e3d7cd3..ca2ea28c4b 100644
--- a/oldXMenu/DelSel.c
+++ b/oldXMenu/DelSel.c
@@ -71,5 +71,3 @@ XMenuDeleteSelection(register Display *display, register XMenu *menu, register i
return(s_num);
}
-/* arch-tag: 24ca2bc7-8a37-471a-8095-e6363fc1ed10
- (do not change this comment) */
diff --git a/oldXMenu/Destroy.c b/oldXMenu/Destroy.c
index 906d92fb8c..6a379609ad 100644
--- a/oldXMenu/Destroy.c
+++ b/oldXMenu/Destroy.c
@@ -115,5 +115,3 @@ XMenuDestroy(Display *display, register XMenu *menu)
free(menu);
}
-/* arch-tag: 44c9589f-5893-46fc-bc23-1b03a7f9c015
- (do not change this comment) */
diff --git a/oldXMenu/Error.c b/oldXMenu/Error.c
index 6454974fd5..99f5eb6500 100644
--- a/oldXMenu/Error.c
+++ b/oldXMenu/Error.c
@@ -28,5 +28,3 @@ XMenuError(void)
return(message);
}
-/* arch-tag: 5fff4a23-40ca-40d0-8887-c50fc73dea9d
- (do not change this comment) */
diff --git a/oldXMenu/EvHand.c b/oldXMenu/EvHand.c
index fa99b8363a..5ee6877374 100644
--- a/oldXMenu/EvHand.c
+++ b/oldXMenu/EvHand.c
@@ -23,5 +23,3 @@ XMenuEventHandler(int (*handler) (XEvent*))
_XMEventHandler = handler;
}
-/* arch-tag: 8d614c8c-94d9-43c8-8e32-c438a3c8a8a3
- (do not change this comment) */
diff --git a/oldXMenu/FindPane.c b/oldXMenu/FindPane.c
index 0d0f818801..022e761903 100644
--- a/oldXMenu/FindPane.c
+++ b/oldXMenu/FindPane.c
@@ -61,5 +61,3 @@ XMenuFindPane(register XMenu *menu, register char *label)
return (XM_FAILURE);
}
-/* arch-tag: b6c94285-0d1d-4569-a071-b34b63c67a54
- (do not change this comment) */
diff --git a/oldXMenu/FindSel.c b/oldXMenu/FindSel.c
index 4d143b5f3b..e85368a607 100644
--- a/oldXMenu/FindSel.c
+++ b/oldXMenu/FindSel.c
@@ -85,5 +85,3 @@ XMenuFindSelection(register XMenu *menu, int p_num, register char *label)
return (XM_FAILURE);
}
-/* arch-tag: 564a4a95-9ab0-4580-b05f-6970c4b25dd4
- (do not change this comment) */
diff --git a/oldXMenu/InsPane.c b/oldXMenu/InsPane.c
index 19ee33cb42..c1993f5bfd 100644
--- a/oldXMenu/InsPane.c
+++ b/oldXMenu/InsPane.c
@@ -111,5 +111,3 @@ XMenuInsertPane(register XMenu *menu, register int p_num, char *label, int activ
return(p_num);
}
-/* arch-tag: ab94d53d-f05b-4273-82d3-f1b01eb9dc9e
- (do not change this comment) */
diff --git a/oldXMenu/InsSel.c b/oldXMenu/InsSel.c
index 0f28cdbef0..be0e43e0cb 100644
--- a/oldXMenu/InsSel.c
+++ b/oldXMenu/InsSel.c
@@ -115,5 +115,3 @@ XMenuInsertSelection(register XMenu *menu, register int p_num, register int s_nu
return(s_num);
}
-/* arch-tag: 8398626f-81cb-4e13-8ebc-aac1b9237663
- (do not change this comment) */
diff --git a/oldXMenu/Internal.c b/oldXMenu/Internal.c
index 34615e8ed1..7f66033b95 100644
--- a/oldXMenu/Internal.c
+++ b/oldXMenu/Internal.c
@@ -1015,5 +1015,3 @@ _XMRefreshSelection(register Display *display, register XMenu *menu, register XM
}
}
-/* arch-tag: 3ac61957-0852-4e72-8b88-7dfab1a5dee9
- (do not change this comment) */
diff --git a/oldXMenu/Locate.c b/oldXMenu/Locate.c
index c79f70bd83..1605b4bbb2 100644
--- a/oldXMenu/Locate.c
+++ b/oldXMenu/Locate.c
@@ -77,5 +77,3 @@ XMenuLocate(register Display *display, register XMenu *menu, int p_num, int s_nu
return(XM_SUCCESS);
}
-/* arch-tag: 1ff94bab-cf67-4c92-bff4-dc0130153173
- (do not change this comment) */
diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in
index cf97f740af..3caa393510 100644
--- a/oldXMenu/Makefile.in
+++ b/oldXMenu/Makefile.in
@@ -15,8 +15,8 @@
## without express or implied warranty.
-## 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.
## 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
diff --git a/oldXMenu/Post.c b/oldXMenu/Post.c
index 07e24a2627..e78fedcf77 100644
--- a/oldXMenu/Post.c
+++ b/oldXMenu/Post.c
@@ -84,5 +84,3 @@ XMenuPost(register Display *display, register XMenu *menu, register int *p_num,
}
}
-/* arch-tag: 7b6104e5-fa32-4342-aa17-05296a30dd70
- (do not change this comment) */
diff --git a/oldXMenu/Recomp.c b/oldXMenu/Recomp.c
index 038ac3b0b6..2aec87a51d 100644
--- a/oldXMenu/Recomp.c
+++ b/oldXMenu/Recomp.c
@@ -103,5 +103,3 @@ XMenuRecompute(Display *display, register XMenu *menu)
return(XM_SUCCESS);
}
-/* arch-tag: 1fe99b82-3873-4aab-b2b3-f277c93e00d9
- (do not change this comment) */
diff --git a/oldXMenu/SetAEQ.c b/oldXMenu/SetAEQ.c
index 7cdb867ff0..f4d51d24be 100644
--- a/oldXMenu/SetAEQ.c
+++ b/oldXMenu/SetAEQ.c
@@ -28,5 +28,3 @@ XMenuSetAEQ(register XMenu *menu, register int aeq)
menu->aeq = aeq;
}
-/* arch-tag: 48fc22b4-0722-4852-a044-788444e4a9dc
- (do not change this comment) */
diff --git a/oldXMenu/SetFrz.c b/oldXMenu/SetFrz.c
index 43684db901..b16c659ed5 100644
--- a/oldXMenu/SetFrz.c
+++ b/oldXMenu/SetFrz.c
@@ -27,5 +27,3 @@ XMenuSetFreeze(register XMenu *menu, register int freeze)
menu->freeze = freeze;
}
-/* arch-tag: 69c5670b-3a46-4c78-8fdb-305936d79772
- (do not change this comment) */
diff --git a/oldXMenu/SetPane.c b/oldXMenu/SetPane.c
index 9f5a99a564..f29a81c5ca 100644
--- a/oldXMenu/SetPane.c
+++ b/oldXMenu/SetPane.c
@@ -42,5 +42,3 @@ XMenuSetPane(register XMenu *menu, register int p_num, register int active)
return(p_num);
}
-/* arch-tag: 90bc8d90-031d-41a2-a2c6-04bf94efbc90
- (do not change this comment) */
diff --git a/oldXMenu/SetSel.c b/oldXMenu/SetSel.c
index 162d3434ba..2f950d49fd 100644
--- a/oldXMenu/SetSel.c
+++ b/oldXMenu/SetSel.c
@@ -49,5 +49,3 @@ XMenuSetSelection(register XMenu *menu, register int p_num, register int s_num,
return(s_num);
}
-/* arch-tag: 79198ae0-c5a4-4d31-adb0-5747f833f56a
- (do not change this comment) */
diff --git a/oldXMenu/X10.h b/oldXMenu/X10.h
index 9a7766bc09..6b0626f212 100644
--- a/oldXMenu/X10.h
+++ b/oldXMenu/X10.h
@@ -76,5 +76,3 @@ char *XLookUpAssoc(Display *dpy, XAssocTable *table, XID x_id);
#endif /* _X10_H_ */
-/* arch-tag: b0b749fb-757b-470b-b405-af7d033a5aad
- (do not change this comment) */
diff --git a/oldXMenu/XCrAssoc.c b/oldXMenu/XCrAssoc.c
index aa98c27ff4..9443481406 100644
--- a/oldXMenu/XCrAssoc.c
+++ b/oldXMenu/XCrAssoc.c
@@ -54,5 +54,3 @@ XAssocTable *XCreateAssocTable(register int size)
return(table);
}
-/* arch-tag: 5df3237d-ada0-4345-a3ab-282cafb397aa
- (do not change this comment) */
diff --git a/oldXMenu/XDelAssoc.c b/oldXMenu/XDelAssoc.c
index 43446ae8a2..018c71c3a3 100644
--- a/oldXMenu/XDelAssoc.c
+++ b/oldXMenu/XDelAssoc.c
@@ -57,5 +57,3 @@ XDeleteAssoc(register Display *dpy, register XAssocTable *table, register XID x_
return;
}
-/* arch-tag: 90981a7e-601c-487a-b364-cdf55d6c475b
- (do not change this comment) */
diff --git a/oldXMenu/XDestAssoc.c b/oldXMenu/XDestAssoc.c
index c2dd8d4d89..135b0c2cda 100644
--- a/oldXMenu/XDestAssoc.c
+++ b/oldXMenu/XDestAssoc.c
@@ -36,5 +36,3 @@ XDestroyAssocTable(register XAssocTable *table)
free((char *)table);
}
-/* arch-tag: a536bf02-8d63-45f2-8c1a-c7f9fd4da2cf
- (do not change this comment) */
diff --git a/oldXMenu/XLookAssoc.c b/oldXMenu/XLookAssoc.c
index a1a06e900c..e287ebbaa7 100644
--- a/oldXMenu/XLookAssoc.c
+++ b/oldXMenu/XLookAssoc.c
@@ -56,5 +56,3 @@ caddr_t XLookUpAssoc(register Display *dpy, register XAssocTable *table, registe
return(NULL);
}
-/* arch-tag: d5075d0c-4b71-467d-b33c-3f5c4c4afcf2
- (do not change this comment) */
diff --git a/oldXMenu/XMakeAssoc.c b/oldXMenu/XMakeAssoc.c
index 3c79d17dc6..3626eb01f5 100644
--- a/oldXMenu/XMakeAssoc.c
+++ b/oldXMenu/XMakeAssoc.c
@@ -86,5 +86,3 @@ XMakeAssoc(register Display *dpy, register XAssocTable *table, register XID x_id
emacs_insque((struct qelem *)new_entry, (struct qelem *)Entry->prev);
}
-/* arch-tag: d7e3fb8a-f3b3-4c5d-a307-75ca67ec1b49
- (do not change this comment) */
diff --git a/oldXMenu/XMenu.h b/oldXMenu/XMenu.h
index 88ebf5b3ac..b94c6c3ced 100644
--- a/oldXMenu/XMenu.h
+++ b/oldXMenu/XMenu.h
@@ -266,5 +266,3 @@ char *XMenuError(void);
#endif
/* Don't add after this point. */
-/* arch-tag: 7e57b5ac-9355-4057-9385-afbe6912d60f
- (do not change this comment) */
diff --git a/oldXMenu/XMenuInt.h b/oldXMenu/XMenuInt.h
index dc6a0e5192..c937346021 100644
--- a/oldXMenu/XMenuInt.h
+++ b/oldXMenu/XMenuInt.h
@@ -61,5 +61,3 @@ int _XMRefreshPane(register Display *display, register XMenu *menu, register XMP
#endif
/* Don't add stuff after this #endif */
-/* arch-tag: 00640af1-9386-48b5-a4be-35620b8cd3aa
- (do not change this comment) */
diff --git a/oldXMenu/copyright.h b/oldXMenu/copyright.h
index c5a4316043..629bc1f547 100644
--- a/oldXMenu/copyright.h
+++ b/oldXMenu/copyright.h
@@ -16,5 +16,3 @@ without express or implied warranty.
*/
-/* arch-tag: c689b1bc-a3ba-41a1-baa0-a3622b5445b2
- (do not change this comment) */
diff --git a/oldXMenu/insque.c b/oldXMenu/insque.c
index f5c30f28ff..47ea19a8d8 100644
--- a/oldXMenu/insque.c
+++ b/oldXMenu/insque.c
@@ -52,5 +52,3 @@ emacs_remque (struct qelem *elem)
prev->q_forw = next;
}
-/* arch-tag: a8719d1a-5c3f-4bce-b36b-173106d36165
- (do not change this comment) */
diff --git a/src/.gitignore b/src/.gitignore
index c0a9b2cf13..070a38fea5 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -5,5 +5,3 @@ stamp_BLD
oo/
oo-spd/
-
-# arch-tag: 0648c91e-6070-4cc5-a029-cade1f8b6098
diff --git a/src/ChangeLog b/src/ChangeLog
index 2265f12138..8f3c405649 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-01-11 Paul Eggert <eggert@cs.ucla.edu>
+2011-01-17 Paul Eggert <eggert@cs.ucla.edu>
Give a name FLOAT_TO_STRING_BUFSIZE to the constant 350.
* lisp.h (FLOAT_TO_STRING_BUFSIZE): New macro.
@@ -33,6 +33,14 @@
($(lib)/libgnu.a): New rule.
(temacs$(EXEEXT)): Also link $(lib)/libgnu.a.
+2011-01-15 Martin Rudalics <rudalics@gmx.at>
+
+ * window.c (inhibit_point_swap): New variable.
+ (Fselect_window): If inhibit_point_swap is nonzero, avoid swapping
+ point this time.
+ (Fset_window_configuration): Set inhibit_point_swap to 1 instead
+ of setting selected_window to nil (Bug#7728).
+
2011-01-11 Tassilo Horn <tassilo@member.fsf.org>
* image.c (imagemagick_load_image, Finit_image_library): Free
@@ -29539,7 +29547,8 @@ See ChangeLog.10 for earlier changes.
;; coding: utf-8
;; End:
- Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2008, 2009, 2010, 2011
+ Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/ChangeLog.1 b/src/ChangeLog.1
index b1dca3c0ca..9cb3e5ec18 100644
--- a/src/ChangeLog.1
+++ b/src/ChangeLog.1
@@ -3539,4 +3539,3 @@
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: 2d2c1086-b0a5-437c-bc58-fb38ce2e0f9b
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 28409d9be6..133f5e6029 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -27930,4 +27930,3 @@ See ChangeLog.9 for earlier changes.
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: 5dcc435f-4038-4141-b3bf-5be51cd76bd4
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2
index ace0a064a8..94d166f0c5 100644
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -4789,4 +4789,3 @@ See ChangeLog.1 for earlier changes.
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: 3334fc8a-ec24-4601-99fc-4c8adc2b31bb
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index cf336ca3ea..f44c214f56 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -16525,4 +16525,3 @@ See ChangeLog.2 for earlier changes.
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: 136a8e5c-4f83-403b-9132-874f1c47f8a9
diff --git a/src/ChangeLog.4 b/src/ChangeLog.4
index a50f6c3842..925c65a7ca 100644
--- a/src/ChangeLog.4
+++ b/src/ChangeLog.4
@@ -6924,4 +6924,3 @@ See ChangeLog.3 for earlier changes.
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: 2e44924a-e45a-4129-ad93-1f7bb410b609
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5
index 4ac6e22505..a1d241b8f8 100644
--- a/src/ChangeLog.5
+++ b/src/ChangeLog.5
@@ -7166,4 +7166,3 @@ See ChangeLog.4 for earlier changes.
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: aea244d6-d513-4b51-8dba-5ecdf1aa5875
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6
index 5b37df5209..44452aa622 100644
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -5372,4 +5372,3 @@ See ChangeLog.5 for earlier changes.
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: 66a98e1c-2268-45e8-8a57-286b9c85a4e9
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index 9f2ce1f90f..540eaa0cc7 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -11110,4 +11110,3 @@ See ChangeLog.6 for earlier changes.
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: 3b03e091-1123-4031-b67d-41683932cc48
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index 719c77f44a..8bdc4d492b 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -13997,4 +13997,3 @@ See ChangeLog.7 for earlier changes.
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: 4d73444a-8f6e-4255-92a6-d3abc438b8d3
diff --git a/src/README b/src/README
index 354f1bf07a..238e69308f 100644
--- a/src/README
+++ b/src/README
@@ -1,5 +1,5 @@
-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.
See the end of the file for license conditions.
diff --git a/src/alloc.c b/src/alloc.c
index 9a249e679b..59d8f887c0 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6315,5 +6315,3 @@ The time is in seconds as a floating point value. */);
#endif
}
-/* arch-tag: 6695ca10-e3c5-4c2c-8bc3-ed26a7dda857
- (do not change this comment) */
diff --git a/src/atimer.c b/src/atimer.c
index 5ecf45d0bf..aff506a9f7 100644
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -444,5 +444,3 @@ init_atimer (void)
signal (SIGALRM, alarm_signal_handler);
}
-/* arch-tag: e6308261-eec6-404b-89fb-6e5909518d70
- (do not change this comment) */
diff --git a/src/atimer.h b/src/atimer.h
index ca19c76718..eeba657703 100644
--- a/src/atimer.h
+++ b/src/atimer.h
@@ -82,5 +82,3 @@ Lisp_Object unwind_stop_other_atimers (Lisp_Object);
#endif /* EMACS_ATIMER_H */
-/* arch-tag: 02c7c1c8-45bd-4222-b874-4ca44662f60b
- (do not change this comment) */
diff --git a/src/bidi.c b/src/bidi.c
index 1f14f6ab84..39142e0f4d 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -1,5 +1,5 @@
/* Low-level bidirectional buffer-scanning functions for GNU Emacs.
- Copyright (C) 2000, 2001, 2004, 2005, 2009, 2010
+ Copyright (C) 2000, 2001, 2004, 2005, 2009, 2010, 2011
Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/blockinput.h b/src/blockinput.h
index 75f8c9cbc8..daa8e47221 100644
--- a/src/blockinput.h
+++ b/src/blockinput.h
@@ -126,5 +126,3 @@ extern void reinvoke_input_signal (void);
#endif /* EMACS_BLOCKINPUT_H */
-/* arch-tag: 51a9ec86-945a-4966-8f04-2d1341250e03
- (do not change this comment) */
diff --git a/src/buffer.c b/src/buffer.c
index 58e2702ec7..24f653b761 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1,8 +1,8 @@
/* Buffer manipulation primitives for GNU Emacs.
- Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994,
- 1995, 1997, 1998, 1999, 2000, 2001, 2002,
- 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
- Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, 1997,
+ 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+ 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/buffer.h b/src/buffer.h
index cdc5fba58a..570d7f1a64 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -1,6 +1,7 @@
/* Header file for the buffer manipulation primitives.
- Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+
+Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000,
+ 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/bytecode.c b/src/bytecode.c
index b04d71a20d..cd6f4a9314 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -1713,5 +1713,3 @@ integer, it is incremented each time that symbol's function is called. */);
#endif
}
-/* arch-tag: b9803b6f-1ed6-4190-8adf-33fd3a9d10e9
- (do not change this comment) */
diff --git a/src/callint.c b/src/callint.c
index f22a7f6531..338e8665e7 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -981,5 +981,3 @@ a way to turn themselves off when a mouse command switches windows. */);
defsubr (&Sprefix_numeric_value);
}
-/* arch-tag: a3a7cad7-bcac-42ce-916e-1bd2546ebf37
- (do not change this comment) */
diff --git a/src/casefiddle.c b/src/casefiddle.c
index 907eaf58dd..8dc985512d 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -443,5 +443,3 @@ keys_of_casefiddle (void)
initial_define_key (meta_map, 'c', "capitalize-word");
}
-/* arch-tag: 60a73c66-5489-47e7-a81f-cead4057c526
- (do not change this comment) */
diff --git a/src/casetab.c b/src/casetab.c
index ae2775930c..87928bd98c 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -304,5 +304,3 @@ syms_of_casetab (void)
defsubr (&Sset_standard_case_table);
}
-/* arch-tag: e06388ad-99fe-40ec-ba67-9d010fcc4916
- (do not change this comment) */
diff --git a/src/category.c b/src/category.c
index dcbe2cf358..b8de8eb216 100644
--- a/src/category.c
+++ b/src/category.c
@@ -542,5 +542,3 @@ See the documentation of the variable `word-combining-categories'. */);
category_table_version = 0;
}
-/* arch-tag: 74ebf524-121b-4d9c-bd68-07f8d708b211
- (do not change this comment) */
diff --git a/src/category.h b/src/category.h
index 8968840fd6..561b06b6f6 100644
--- a/src/category.h
+++ b/src/category.h
@@ -116,5 +116,3 @@ extern Lisp_Object _temp_category_set;
extern int word_boundary_p (int, int);
extern void set_category_set (Lisp_Object, Lisp_Object, Lisp_Object);
-/* arch-tag: 309dfe83-c3e2-4d22-8e81-faae5aece0ff
- (do not change this comment) */
diff --git a/src/ccl.c b/src/ccl.c
index 98ff4667af..cb097f6ee9 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -2352,5 +2352,3 @@ used by CCL. */);
defsubr (&Sregister_code_conversion_map);
}
-/* arch-tag: bb9a37be-68ce-4576-8d3d-15d750e4a860
- (do not change this comment) */
diff --git a/src/ccl.h b/src/ccl.h
index 79b3eadb99..8f2608fd5a 100644
--- a/src/ccl.h
+++ b/src/ccl.h
@@ -124,5 +124,3 @@ EXFUN (Fccl_program_p, 1);
#endif /* EMACS_CCL_H */
-/* arch-tag: 14681df7-876d-43de-bc71-6b78e23a4e3c
- (do not change this comment) */
diff --git a/src/character.c b/src/character.c
index e62e283db2..c9088a3a25 100644
--- a/src/character.c
+++ b/src/character.c
@@ -1141,5 +1141,3 @@ See The Unicode Standard for the meaning of those values. */);
#endif /* emacs */
-/* arch-tag: b6665960-3c3d-4184-85cd-af4318197999
- (do not change this comment) */
diff --git a/src/character.h b/src/character.h
index c8bcb9f487..4edeb7471f 100644
--- a/src/character.h
+++ b/src/character.h
@@ -644,5 +644,3 @@ extern Lisp_Object Vscript_representative_chars;
#endif /* EMACS_CHARACTER_H */
-/* arch-tag: 4ef86004-2eff-4073-8cea-cfcbcf7188ac
- (do not change this comment) */
diff --git a/src/charset.c b/src/charset.c
index 7ab9197bec..ede6bebe9d 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -2443,5 +2443,3 @@ the value may be a list of mnemonics. */);
#endif /* emacs */
-/* arch-tag: 66a89b8d-4c28-47d3-9ca1-56f78440d69f
- (do not change this comment) */
diff --git a/src/charset.h b/src/charset.h
index 1dbeab0fcb..f35945aab0 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -546,5 +546,3 @@ extern void map_charset_chars (void (*) (Lisp_Object, Lisp_Object),
#endif /* EMACS_CHARSET_H */
-/* arch-tag: 3b96db55-4961-481d-ac3e-219f46a2b3aa
- (do not change this comment) */
diff --git a/src/chartab.c b/src/chartab.c
index 84b06e1a6f..cd8aa784eb 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -1013,5 +1013,3 @@ syms_of_chartab (void)
defsubr (&Smap_char_table);
}
-/* arch-tag: 18b5b560-7ab5-4108-b09e-d5dd65dc6fda
- (do not change this comment) */
diff --git a/src/cm.c b/src/cm.c
index 0eb34ab386..5ef4e50458 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -462,5 +462,3 @@ Wcm_init (struct tty_display_info *tty)
return 0;
}
-/* arch-tag: bcf64c02-00f6-44ef-94b6-c56eab5b3dc4
- (do not change this comment) */
diff --git a/src/cm.h b/src/cm.h
index d34f432b68..71aafe6918 100644
--- a/src/cm.h
+++ b/src/cm.h
@@ -170,5 +170,3 @@ extern void cmgoto (struct tty_display_info *, int, int);
extern void Wcm_clear (struct tty_display_info *);
extern int Wcm_init (struct tty_display_info *);
-/* arch-tag: acc1535a-7136-49d6-b22d-9bc85702251b
- (do not change this comment) */
diff --git a/src/cmds.c b/src/cmds.c
index 21175e51cd..3782e39323 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -561,5 +561,3 @@ keys_of_cmds (void)
initial_define_key (global_map, Ctl ('F'), "forward-char");
}
-/* arch-tag: 022ba3cd-67f9-4978-9c5d-7d2b18d8644e
- (do not change this comment) */
diff --git a/src/coding.c b/src/coding.c
index 38fb55366d..5f9b207c6b 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -10902,5 +10902,3 @@ emacs_strerror (int error_number)
#endif /* emacs */
-/* arch-tag: 3a3a2b01-5ff6-4071-9afe-f5b808d9229d
- (do not change this comment) */
diff --git a/src/coding.h b/src/coding.h
index 0ddc08d139..e424ab72fa 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -830,5 +830,3 @@ extern int emacs_mule_string_char (unsigned char *);
#endif /* EMACS_CODING_H */
-/* arch-tag: 2bc3b4fa-6870-4f64-8135-b962b2d290e4
- (do not change this comment) */
diff --git a/src/commands.h b/src/commands.h
index c2150508f4..154e5cb497 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -100,5 +100,3 @@ extern int update_mode_lines;
extern int cursor_in_echo_area;
-/* arch-tag: 4f7ca0b7-6a56-4b20-8bf5-b67a99921d1d
- (do not change this comment) */
diff --git a/src/composite.c b/src/composite.c
index ab1c11a0f7..92bedcc5f2 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -2041,5 +2041,3 @@ See also the documentation of `auto-composition-mode'. */);
defsubr (&Scomposition_get_gstring);
}
-/* arch-tag: 79cefaf8-ca48-4eed-97e5-d5afb290d272
- (do not change this comment) */
diff --git a/src/composite.h b/src/composite.h
index 9559700d38..f36b55214c 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -326,5 +326,3 @@ EXFUN (Fcomposition_get_gstring, 4);
#endif /* not EMACS_COMPOSITE_H */
-/* arch-tag: 59524d89-c645-47bd-b5e6-65e861690118
- (do not change this comment) */
diff --git a/src/data.c b/src/data.c
index 603801b173..0a2d4b855d 100644
--- a/src/data.c
+++ b/src/data.c
@@ -3338,5 +3338,3 @@ init_data (void)
#endif /* uts */
}
-/* arch-tag: 25879798-b84d-479a-9c89-7d148e2109f7
- (do not change this comment) */
diff --git a/src/dbusbind.c b/src/dbusbind.c
index 0c59c08f5b..ba82ee3ec6 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -2360,5 +2360,3 @@ be called when the D-Bus reply message arrives. */);
#endif /* HAVE_DBUS */
-/* arch-tag: 0e828477-b571-4fe4-b559-5c9211bc14b8
- (do not change this comment) */
diff --git a/src/deps.mk b/src/deps.mk
index eb7dfedd3b..d05e1b4a90 100644
--- a/src/deps.mk
+++ b/src/deps.mk
@@ -1,7 +1,7 @@
### deps.mk --- src/Makefile fragment for GNU Emacs
## Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002,
-## 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+## 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
## Free Software Foundation, Inc.
## This file is part of GNU Emacs.
diff --git a/src/dired.c b/src/dired.c
index 0f91ccbfbf..7fe2cbf301 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -1104,5 +1104,3 @@ ends in a slash. */);
Vcompletion_ignored_extensions = Qnil;
}
-/* arch-tag: 1ac8deca-4d8f-4d41-ade9-089154d98c03
- (do not change this comment) */
diff --git a/src/dispextern.h b/src/dispextern.h
index 6ab5ebcda3..f4f1164b69 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3401,5 +3401,3 @@ extern Lisp_Object x_default_parameter (struct frame *, Lisp_Object,
#endif /* not DISPEXTERN_H_INCLUDED */
-/* arch-tag: c65c475f-1c1e-4534-8795-990b8509fd65
- (do not change this comment) */
diff --git a/src/dispnew.c b/src/dispnew.c
index eb632aeb26..83ffd6a577 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6646,5 +6646,3 @@ If nil, never pre-empt redisplay. */);
}
}
-/* arch-tag: 8d812b1f-04a2-4195-a9c4-381f8457a413
- (do not change this comment) */
diff --git a/src/disptab.h b/src/disptab.h
index 0445a8f867..14e406a742 100644
--- a/src/disptab.h
+++ b/src/disptab.h
@@ -104,5 +104,3 @@ extern Lisp_Object Vglyph_table;
#define SET_GLYPH_FROM_CHAR(glyph, c) \
SET_GLYPH (glyph, c, DEFAULT_FACE_ID)
-/* arch-tag: d7f792d2-f59c-4904-a91e-91522e3ab349
- (do not change this comment) */
diff --git a/src/doc.c b/src/doc.c
index d5f8099603..38deed1bbf 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -944,5 +944,3 @@ syms_of_doc (void)
defsubr (&Ssubstitute_command_keys);
}
-/* arch-tag: 56281d4d-6949-43e2-be2e-f6517de744ba
- (do not change this comment) */
diff --git a/src/doprnt.c b/src/doprnt.c
index 6b07a68c0b..16565ff703 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -279,5 +279,3 @@ doprnt (char *buffer, register int bufsize, const char *format,
return bufptr - buffer;
}
-/* arch-tag: aa0ab528-7c5f-4c73-894c-aa2526a1efb3
- (do not change this comment) */
diff --git a/src/dosfns.c b/src/dosfns.c
index eb3983a51b..1724e7d1de 100644
--- a/src/dosfns.c
+++ b/src/dosfns.c
@@ -781,5 +781,3 @@ If zero, the decimal point key returns the country code specific value. */);
}
#endif /* MSDOS */
-/* arch-tag: f5ea8847-a014-42c9-83f5-7738ad640b17
- (do not change this comment) */
diff --git a/src/dosfns.h b/src/dosfns.h
index e5f179302b..839b67184e 100644
--- a/src/dosfns.h
+++ b/src/dosfns.h
@@ -43,5 +43,3 @@ extern Lisp_Object msdos_stdcolor_name (int);
extern void x_set_title (struct frame *, Lisp_Object);
#endif
-/* arch-tag: a83b8c4c-63c8-451e-9e94-bc72e3e2f8bc
- (do not change this comment) */
diff --git a/src/editfns.c b/src/editfns.c
index 73abf77911..e7da96265b 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -4693,5 +4693,3 @@ functions if all the text being accessed has this property. */);
defsubr (&Stranspose_regions);
}
-/* arch-tag: fc3827d8-6f60-4067-b11e-c3218031b018
- (do not change this comment) */
diff --git a/src/emacs-icon.h b/src/emacs-icon.h
index c11c26ee55..59840105f5 100644
--- a/src/emacs-icon.h
+++ b/src/emacs-icon.h
@@ -351,5 +351,3 @@ static unsigned char gnu_xbm_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00};
-/* arch-tag: b57020c7-c937-4d77-8ca6-3875178d9828
- (do not change this comment) */
diff --git a/src/epaths.in b/src/epaths.in
index 67b6c23bbd..b6c9b4cd49 100644
--- a/src/epaths.in
+++ b/src/epaths.in
@@ -59,5 +59,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Where Emacs should look for the application default file. */
#define PATH_X_DEFAULTS "/usr/lib/X11/%L/%T/%N%C%S:/usr/lib/X11/%l/%T/%N%C%S:/usr/lib/X11/%T/%N%C%S:/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S"
-/* arch-tag: d30686c4-629c-4666-9499-beaa69f1641e
- (do not change this comment) */
diff --git a/src/eval.c b/src/eval.c
index cd06b147c2..709a54fc2e 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1,7 +1,7 @@
/* Evaluator for GNU Emacs Lisp interpreter.
Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
- Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+ 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -3699,5 +3699,3 @@ The value the function returns is not used. */);
defsubr (&Sbacktrace_frame);
}
-/* arch-tag: 014a07aa-33ab-4a8f-a3d2-ee8a4a9ff7fb
- (do not change this comment) */
diff --git a/src/fileio.c b/src/fileio.c
index f4f90658d3..2a415d2d69 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1,7 +1,8 @@
/* File IO for GNU Emacs.
- Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996,
- 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997,
+ 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+ 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/filelock.c b/src/filelock.c
index 02c5eb05ac..6ef3a4973d 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -743,5 +743,3 @@ syms_of_filelock (void)
#endif
}
-/* arch-tag: e062676d-50b2-4be0-ab96-197c81b181a1
- (do not change this comment) */
diff --git a/src/filemode.c b/src/filemode.c
index 5e175eaf43..a1fc388638 100644
--- a/src/filemode.c
+++ b/src/filemode.c
@@ -244,5 +244,3 @@ setst (short unsigned int bits, char *chars)
#endif
}
-/* arch-tag: 4340830c-15a5-47d2-b45f-1d43c45a91bb
- (do not change this comment) */
diff --git a/src/firstfile.c b/src/firstfile.c
index f6885e38a4..7fb19c4d5b 100644
--- a/src/firstfile.c
+++ b/src/firstfile.c
@@ -32,5 +32,3 @@ extern int initialized;
static int * dummy = &initialized;
#endif
-/* arch-tag: a6c0d2dd-00c3-4ba5-95a5-9c8ab82f39b2
- (do not change this comment) */
diff --git a/src/floatfns.c b/src/floatfns.c
index 126f117186..2b26347cc1 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -1074,5 +1074,3 @@ syms_of_floatfns (void)
defsubr (&Struncate);
}
-/* arch-tag: be05bf9d-049e-4e31-91b9-e6153d483ae7
- (do not change this comment) */
diff --git a/src/fns.c b/src/fns.c
index cd95f6c27f..17c65d7f05 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -4945,5 +4945,3 @@ init_fns (void)
{
}
-/* arch-tag: 787f8219-5b74-46bd-8469-7e1cc475fa31
- (do not change this comment) */
diff --git a/src/font.c b/src/font.c
index 667a23e4b5..6ab349e763 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1,5 +1,7 @@
/* font.c -- "Font" primitives.
- Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+
+Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
+ Free Software Foundation, Inc.
Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H13PRO009
diff --git a/src/font.h b/src/font.h
index ea0913f493..55435f9489 100644
--- a/src/font.h
+++ b/src/font.h
@@ -873,5 +873,3 @@ extern void font_deferred_log (const char *, Lisp_Object, Lisp_Object);
#endif /* not EMACS_FONT_H */
-/* arch-tag: 3b7260c3-5bec-4d6b-a0db-95c1b431b1a2
- (do not change this comment) */
diff --git a/src/fontset.c b/src/fontset.c
index fbfd89f619..c38b01d472 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -2264,5 +2264,3 @@ at the vertical center of lines. */);
#endif
}
-/* arch-tag: ea861585-2f5f-4e5b-9849-d04a9c3a3537
- (do not change this comment) */
diff --git a/src/fontset.h b/src/fontset.h
index 3ad4fc4ed0..15c81aa185 100644
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -60,5 +60,3 @@ extern int face_for_font (struct frame *, Lisp_Object, struct face *);
#endif /* EMACS_FONTSET_H */
-/* arch-tag: c27cef7b-3cab-488a-8398-7a4daa96bb77
- (do not change this comment) */
diff --git a/src/frame.c b/src/frame.c
index d1c5065ee8..ac15dedf71 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1,6 +1,8 @@
/* Generic frame functions.
+
Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+ Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/frame.h b/src/frame.h
index 36b19c4d29..dfd30ab814 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -1163,5 +1163,3 @@ extern void set_frame_menubar (FRAME_PTR, int, int);
#endif /* not EMACS_FRAME_H */
-/* arch-tag: 0df048ee-e6bf-4f48-bd56-e3cd055dd8c4
- (do not change this comment) */
diff --git a/src/fringe.c b/src/fringe.c
index 45d6ecfa4b..2b5148e367 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1847,5 +1847,3 @@ w32_reset_fringes (void)
#endif /* HAVE_WINDOW_SYSTEM */
-/* arch-tag: 04596920-43eb-473d-b319-82712338162d
- (do not change this comment) */
diff --git a/src/ftfont.c b/src/ftfont.c
index ffa90ef8ee..372160dc0f 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -2676,5 +2676,3 @@ syms_of_ftfont (void)
register_font_driver (&ftfont_driver, NULL);
}
-/* arch-tag: 7cfa432c-33a6-4988-83d2-a82ed8604aca
- (do not change this comment) */
diff --git a/src/ftfont.h b/src/ftfont.h
index 38538decf0..8c8674f344 100644
--- a/src/ftfont.h
+++ b/src/ftfont.h
@@ -41,5 +41,3 @@ extern FcCharSet *ftfont_get_fc_charset (Lisp_Object);
#endif /* EMACS_FTFONT_H */
-/* arch-tag: cec13d1c-7156-4997-9ebd-e989040c3d78
- (do not change this comment) */
diff --git a/src/ftxfont.c b/src/ftxfont.c
index 6821a4b61c..58850bf416 100644
--- a/src/ftxfont.c
+++ b/src/ftxfont.c
@@ -385,5 +385,3 @@ syms_of_ftxfont (void)
register_font_driver (&ftxfont_driver, NULL);
}
-/* arch-tag: 59bd3469-5330-413f-b29d-1aa36492abe8
- (do not change this comment) */
diff --git a/src/getloadavg.c b/src/getloadavg.c
index 3b25e69116..d9c24717b7 100644
--- a/src/getloadavg.c
+++ b/src/getloadavg.c
@@ -1035,5 +1035,3 @@ main (argc, argv)
}
#endif /* TEST */
-/* arch-tag: 2b37a242-6289-41f4-8cd5-0e73fd615db1
- (do not change this comment) */
diff --git a/src/getpagesize.h b/src/getpagesize.h
index 174e5c4667..2c134dfa02 100644
--- a/src/getpagesize.h
+++ b/src/getpagesize.h
@@ -47,5 +47,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif /* no HAVE_GETPAGESIZE */
-/* arch-tag: ff6206e3-97e2-4763-923a-e84bf28eabbc
- (do not change this comment) */
diff --git a/src/gmalloc.c b/src/gmalloc.c
index 7a5e95c743..5237432872 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -2171,5 +2171,3 @@ mprobe (__ptr_t ptr)
#endif /* GC_MCHECK */
-/* arch-tag: 93dce5c0-f49a-41b5-86b1-f91c4169c02e
- (do not change this comment) */
diff --git a/src/gnutls.c b/src/gnutls.c
index 1cc258a509..1872d6cc34 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -1,5 +1,5 @@
/* GnuTLS glue for GNU Emacs.
- 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/src/gnutls.h b/src/gnutls.h
index 2669317e97..d22dee9072 100644
--- a/src/gnutls.h
+++ b/src/gnutls.h
@@ -1,5 +1,5 @@
/* GnuTLS glue for GNU Emacs.
- 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/src/gtkutil.c b/src/gtkutil.c
index e6141de1d2..52512687a0 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -4573,5 +4573,3 @@ xg_initialize (void)
#endif /* USE_GTK */
-/* arch-tag: fe7104da-bc1e-4aba-9bd1-f349c528f7e3
- (do not change this comment) */
diff --git a/src/gtkutil.h b/src/gtkutil.h
index 0585322608..78df4fe786 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -185,5 +185,3 @@ extern int xg_ignore_gtk_scrollbar;
#endif /* USE_GTK */
#endif /* GTKUTIL_H */
-/* arch-tag: 0757f3dc-00c7-4cee-9e4c-282cf1d34c72
- (do not change this comment) */
diff --git a/src/image.c b/src/image.c
index 023c9763ab..b5b1843ed9 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8905,5 +8905,3 @@ init_image (void)
{
}
-/* arch-tag: 123c2a5e-14a8-4c53-ab95-af47d7db49b9
- (do not change this comment) */
diff --git a/src/indent.c b/src/indent.c
index 28c52f652c..93c2b5237d 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2171,5 +2171,3 @@ syms_of_indent (void)
defsubr (&Scompute_motion);
}
-/* arch-tag: 9adfea44-71f7-4988-8ee3-96da15c502cc
- (do not change this comment) */
diff --git a/src/indent.h b/src/indent.h
index e1e9a1c96e..9f5a9f56f1 100644
--- a/src/indent.h
+++ b/src/indent.h
@@ -76,5 +76,3 @@ void recompute_width_table (struct buffer *buf,
struct Lisp_Char_Table *disptab);
-/* arch-tag: f9feb373-5bff-4f4f-9198-94805d00cfd7
- (do not change this comment) */
diff --git a/src/intervals.c b/src/intervals.c
index 5be579467c..f3b946ef41 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -2565,5 +2565,3 @@ set_intervals_multibyte (int multi_flag)
BEG, BEG_BYTE, Z, Z_BYTE);
}
-/* arch-tag: 3d402b60-083c-4271-b4a3-ebd9a74bfe27
- (do not change this comment) */
diff --git a/src/intervals.h b/src/intervals.h
index 1ef80be9c8..14efe74f42 100644
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -346,5 +346,3 @@ extern void syms_of_textprop (void);
#include "composite.h"
-/* arch-tag: f0bc16c0-b084-498d-9de4-21cc8f077795
- (do not change this comment) */
diff --git a/src/keymap.c b/src/keymap.c
index 4c7af8a203..e37b0f18e6 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -4013,5 +4013,3 @@ keys_of_keymap (void)
initial_define_key (global_map, Ctl ('X'), "Control-X-prefix");
}
-/* arch-tag: 6dd15c26-7cf1-41c4-b904-f42f7ddda463
- (do not change this comment) */
diff --git a/src/keymap.h b/src/keymap.h
index 2765799f16..931da76e55 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -58,5 +58,3 @@ extern void map_keymap_canonical (Lisp_Object map,
#endif
-/* arch-tag: 7400d5a1-ef0b-43d0-b366-f4d678bf3ba2
- (do not change this comment) */
diff --git a/src/lastfile.c b/src/lastfile.c
index 4e6517e85e..867ed5a2f7 100644
--- a/src/lastfile.c
+++ b/src/lastfile.c
@@ -49,5 +49,3 @@ char my_endbss[1];
static char _my_endbss[1];
char * my_endbss_static = _my_endbss;
-/* arch-tag: 67e81ab4-e14f-44b2-8875-c0c12252223e
- (do not change this comment) */
diff --git a/src/m/alpha.h b/src/m/alpha.h
index d6d4202cb3..c4981a8976 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -59,5 +59,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
this avoids the assembler bug. */
#define DBL_MIN_REPLACEMENT 2.2250738585072019e-308
-/* arch-tag: 978cb578-1e25-4a60-819b-adae0972aa78
- (do not change this comment) */
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 0441d4e22d..ff3d6171db 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -1,6 +1,7 @@
/* machine description file for AMD x86-64.
- Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
- Free Software Foundation, Inc.
+
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+ 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -39,5 +40,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
#undef DATA_SEG_BITS
-/* arch-tag: 8a5e001d-e12e-4692-a3a6-0b15ba271c6e
- (do not change this comment) */
diff --git a/src/m/ia64.h b/src/m/ia64.h
index 4a0d242b44..7aed9fa36d 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -1,6 +1,8 @@
/* machine description file for the IA-64 architecture.
- Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+ 2009, 2010, 2011 Free Software Foundation, Inc.
+
Contributed by David Mosberger <davidm@hpl.hp.com>
This file is part of GNU Emacs.
@@ -45,5 +47,3 @@ extern void r_alloc_free ();
#endif /* not _MALLOC_INTERNAL */
#endif /* REL_ALLOC */
-/* arch-tag: 9b8e9fb2-2e49-4c22-b68f-11a488e77c66
- (do not change this comment) */
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 12030d5dff..13eea3d44f 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -1,6 +1,7 @@
/* R2 AIX machine/system dependent defines
- Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+
+Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+ 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -44,5 +45,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define BROKEN_SIGPTY
#define BROKEN_SIGPOLL
-/* arch-tag: 028318ee-a7ae-4a08-804d-cc1e6588d003
- (do not change this comment) */
diff --git a/src/m/ibms390.h b/src/m/ibms390.h
index eef6c75b15..fdcc002507 100644
--- a/src/m/ibms390.h
+++ b/src/m/ibms390.h
@@ -33,5 +33,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
numerically. */
#define VIRT_ADDR_VARIES
-/* arch-tag: d8a0ffa4-a8f0-4736-90d3-7fd7b21b8314
- (do not change this comment) */
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h
index 467526fe0c..854bcdaed0 100644
--- a/src/m/ibms390x.h
+++ b/src/m/ibms390x.h
@@ -1,7 +1,7 @@
/* Machine description file for IBM S390 in 64-bit mode
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
- Free Software Foundation, Inc.
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+ 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -33,5 +33,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
#define XPNTR(a) XUINT (a)
-/* arch-tag: 4b87653c-6add-4663-8691-7d9dc17b5519
- (do not change this comment) */
diff --git a/src/m/intel386.h b/src/m/intel386.h
index a05c38c05d..732e89328f 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -1,6 +1,7 @@
/* Machine description file for intel 386.
- Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+
+Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+ 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -29,5 +30,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define ULIMIT_BREAK_VALUE (32*1024*1024)
#endif
-/* arch-tag: 746338f0-cb7b-4f49-a98c-cb50817cf2ec
- (do not change this comment) */
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index e598e6fbcb..0b1c2f360b 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -1,6 +1,7 @@
/* machine description file for Iris-4D machines. Use with s/irix*.h.
- Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+
+Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+ 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -24,5 +25,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define DATA_START 0x10000000
#define DATA_SEG_BITS 0x10000000
-/* arch-tag: fff5e139-9ae0-465d-afec-837c41ea0aa6
- (do not change this comment) */
diff --git a/src/m/m68k.h b/src/m/m68k.h
index 6a516ca3a5..cebc2e8773 100644
--- a/src/m/m68k.h
+++ b/src/m/m68k.h
@@ -31,5 +31,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif
-/* arch-tag: 4eadd161-b4e8-4b82-82a1-e4ce7f42969d
- (do not change this comment) */
diff --git a/src/m/macppc.h b/src/m/macppc.h
index ce708bb079..895a698197 100644
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -1,6 +1,7 @@
/* machine description file For the powerpc Macintosh.
- Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+
+Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+ 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -29,5 +30,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif
#endif
-/* arch-tag: 41913e4e-e7d1-4023-aadb-210cc31712ed
- (do not change this comment) */
diff --git a/src/m/sparc.h b/src/m/sparc.h
index c3f3ba528e..e1eb9eedb2 100644
--- a/src/m/sparc.h
+++ b/src/m/sparc.h
@@ -1,6 +1,7 @@
/* machine description file for Sun 4 SPARC.
- Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+
+Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+ 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -35,5 +36,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif /* __arch64__ */
-/* arch-tag: 0a6f7882-33fd-4811-9832-7466c51e50f7
- (do not change this comment) */
diff --git a/src/m/template.h b/src/m/template.h
index cae95a802b..a8e9e148b5 100644
--- a/src/m/template.h
+++ b/src/m/template.h
@@ -48,5 +48,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
you should also check `etc/MACHINES' to make sure its descriptions
of known problems in that configuration should be updated. */
-/* arch-tag: d7dae0a9-4f99-4939-bef9-5738e1f33955
- (do not change this comment) */
diff --git a/src/m/vax.h b/src/m/vax.h
index 39550a42fe..8720873236 100644
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -32,5 +32,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define HAVE_FTIME
-/* arch-tag: 508bdf7a-01a0-4ce0-8eba-0704d0df55a0
- (do not change this comment) */
diff --git a/src/macros.c b/src/macros.c
index 835fdaec81..c8e4a6bb42 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -395,5 +395,3 @@ This is nil when not executing a keyboard macro. */);
doc: /* Last kbd macro defined, as a string or vector; nil if none defined. */);
}
-/* arch-tag: d293fcc9-2266-4163-9198-7fa0de12ec9e
- (do not change this comment) */
diff --git a/src/macros.h b/src/macros.h
index 6f5fa21c04..aa8c137507 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -52,5 +52,3 @@ extern void finalize_kbd_macro_chars (void);
extern void store_kbd_macro_char (Lisp_Object);
-/* arch-tag: 8edb7088-682f-4d1f-a4d9-0fbb7284234e
- (do not change this comment) */
diff --git a/src/marker.c b/src/marker.c
index 9c56e439c3..f22b874fc8 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -902,5 +902,3 @@ syms_of_marker (void)
byte_debug_flag = 0;
}
-/* arch-tag: 50aa418f-cdd0-4838-b64b-94aa4b2a3b74
- (do not change this comment) */
diff --git a/src/md5.c b/src/md5.c
index 6e7f651189..9d9d7d8f14 100644
--- a/src/md5.c
+++ b/src/md5.c
@@ -428,5 +428,3 @@ md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx)
ctx->D = D;
}
-/* arch-tag: 60084f04-b434-42cb-9d2b-e91df01f4325
- (do not change this comment) */
diff --git a/src/md5.h b/src/md5.h
index cf9566b864..8ab7305037 100644
--- a/src/md5.h
+++ b/src/md5.h
@@ -146,5 +146,3 @@ extern void *md5_buffer (const char *buffer, size_t len,
#endif /* md5.h */
-/* arch-tag: 7cd389f3-6c40-4950-999d-0b2ebd1d20d7
- (do not change this comment) */
diff --git a/src/mem-limits.h b/src/mem-limits.h
index a5a0952998..aff82565c3 100644
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -46,5 +46,3 @@ extern char *start_of_data (void);
#define EXCEEDS_LISP_PTR(ptr) ((EMACS_UINT) (ptr) >> VALBITS)
#endif
-/* arch-tag: fe39244e-e54f-4208-b7aa-02556f7841c5
- (do not change this comment) */
diff --git a/src/menu.c b/src/menu.c
index 186bd474ec..24df935eef 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1354,5 +1354,3 @@ syms_of_menu (void)
defsubr (&Sx_popup_menu);
}
-/* arch-tag: 78bbc7cf-8025-4156-aa8a-6c7fd99bf51d
- (do not change this comment) */
diff --git a/src/menu.h b/src/menu.h
index dae9c92ac5..866214e735 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -53,5 +53,3 @@ extern Lisp_Object xmenu_show (FRAME_PTR, int, int, int, int,
Lisp_Object, const char **, EMACS_UINT);
#endif /* MENU_H */
-/* arch-tag: c32b2778-724d-4e85-81d7-45f98530a988
- (do not change this comment) */
diff --git a/src/msdos.c b/src/msdos.c
index ea828d9391..4bd933527b 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -4242,5 +4242,3 @@ This variable is used only by MS-DOS terminals. */);
#endif /* MSDOS */
-/* arch-tag: db404e92-52a5-475f-9eb2-1cb78dd05f30
- (do not change this comment) */
diff --git a/src/msdos.h b/src/msdos.h
index 9d4de5ad3f..2b75e81327 100644
--- a/src/msdos.h
+++ b/src/msdos.h
@@ -113,5 +113,3 @@ void XMenuDestroy (Display *, XMenu *);
#endif /* not EMACS_MSDOS_H */
-/* arch-tag: ad21eeed-8fdb-4357-8007-36368a6bdbf3
- (do not change this comment) */
diff --git a/src/ndir.h b/src/ndir.h
index 92d198334b..cd7cdbe55f 100644
--- a/src/ndir.h
+++ b/src/ndir.h
@@ -39,5 +39,3 @@ extern void closedir (DIR *);
#define rewinddir( dirp ) seekdir( dirp, 0L )
-/* arch-tag: aea50570-ffb7-43fd-b423-7743b10fbe6e
- (do not change this comment) */
diff --git a/src/ns.mk b/src/ns.mk
index d674466a40..02b7b69733 100644
--- a/src/ns.mk
+++ b/src/ns.mk
@@ -1,6 +1,6 @@
### autodeps.mk --- src/Makefile fragment for GNU Emacs
-## Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+## Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
## This file is part of GNU Emacs.
diff --git a/src/nsfns.m b/src/nsfns.m
index 6b8276e1b8..b98f8bc815 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1,6 +1,7 @@
/* Functions for the NeXT/Open/GNUstep and MacOSX window system.
- Copyright (C) 1989, 1992, 1993, 1994, 2005, 2006, 2008, 2009, 2010, 2011
- Free Software Foundation, Inc.
+
+Copyright (C) 1989, 1992, 1993, 1994, 2005, 2006, 2008, 2009, 2010,
+ 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/nsfont.m b/src/nsfont.m
index 546c47d27a..9dc0fb5160 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -1521,4 +1521,3 @@ syms_of_nsfont (void)
doc: /* Internal use: maps font registry to unicode script. */);
}
-// arch-tag: d6c3c6f0-62de-4978-8b1e-b7966fe02cae
diff --git a/src/nsgui.h b/src/nsgui.h
index f161ba490e..3ad9b2ce23 100644
--- a/src/nsgui.h
+++ b/src/nsgui.h
@@ -198,5 +198,3 @@ typedef struct _NSRect { NSPoint origin; NSSize size; } NSRect;
#endif /* __NSGUI_H__ */
-/* arch-tag: b2af3275-62c3-45b4-9335-4c9635c67e55
- (do not change this comment) */
diff --git a/src/nsimage.m b/src/nsimage.m
index a5bea91e63..d194a3eee0 100644
--- a/src/nsimage.m
+++ b/src/nsimage.m
@@ -499,4 +499,3 @@ static EmacsImage *ImageList = nil;
@end
-// arch-tag: 6b310280-6892-4e5e-8f34-41c4d384874f
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 8017715b25..330a17ab6f 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1797,4 +1797,3 @@ syms_of_nsmenu (void)
staticpro (&Qdebug_on_next_call);
}
-// arch-tag: 75773656-52e5-4c44-a398-47bd87b32619
diff --git a/src/nsselect.m b/src/nsselect.m
index 0c941712fd..7920918eb6 100644
--- a/src/nsselect.m
+++ b/src/nsselect.m
@@ -609,4 +609,3 @@ The functions are called with one argument, the selection type\n\
staticpro (&Qforeign_selection);
}
-// arch-tag: 39d1dde7-06a6-49ff-95a7-0e7af12d2218
diff --git a/src/nsterm.h b/src/nsterm.h
index 82ee03a944..baf567f88d 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -812,5 +812,3 @@ extern char gnustep_base_version[]; /* version tracking */
#endif /* HAVE_NS */
-/* arch-tag: 0a28b142-4ac1-4a81-a243-abcd82d9c4e5
- (do not change this comment) */
diff --git a/src/nsterm.m b/src/nsterm.m
index 821279dfda..714b8a03d6 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6429,4 +6429,3 @@ baseline level. The default value is nil. */);
}
-// arch-tag: 6eaa8f7d-a69b-4e1c-b43d-ab31defbe0d2
diff --git a/src/pre-crt0.c b/src/pre-crt0.c
index 8abc954541..ea5736eba2 100644
--- a/src/pre-crt0.c
+++ b/src/pre-crt0.c
@@ -8,5 +8,3 @@
int data_start = 0;
-/* arch-tag: 2e260272-0790-495f-9362-55abd56b5c5a
- (do not change this comment) */
diff --git a/src/print.c b/src/print.c
index 8de27fe811..bb9dd7102a 100644
--- a/src/print.c
+++ b/src/print.c
@@ -2358,5 +2358,3 @@ priorities. */);
defsubr (&Swith_output_to_temp_buffer);
}
-/* arch-tag: bc797170-94ae-41de-86e3-75e20f8f7a39
- (do not change this comment) */
diff --git a/src/process.h b/src/process.h
index 396319d441..00531d2664 100644
--- a/src/process.h
+++ b/src/process.h
@@ -200,5 +200,3 @@ extern void delete_read_fd (int fd);
extern void add_write_fd (int fd, fd_callback func, void *data);
extern void delete_write_fd (int fd);
-/* arch-tag: dffedfc4-d7bc-4b58-a26f-c16155449c72
- (do not change this comment) */
diff --git a/src/puresize.h b/src/puresize.h
index 13e5b0f0ff..593eb3d717 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -96,5 +96,3 @@ extern char my_edata[];
#endif /* VIRT_ADDRESS_VARIES */
-/* arch-tag: fd9b0a91-a70e-4729-a75a-6bb4ca1ce14f
- (do not change this comment) */
diff --git a/src/ralloc.c b/src/ralloc.c
index d574893ca2..62a65c2462 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -1261,5 +1261,3 @@ r_alloc_init (void)
use_relocatable_buffers = 1;
}
-/* arch-tag: 6a524a15-faff-44c8-95d4-a5da6f55110f
- (do not change this comment) */
diff --git a/src/regex.h b/src/regex.h
index f19123deab..4785f06e4f 100644
--- a/src/regex.h
+++ b/src/regex.h
@@ -626,5 +626,3 @@ extern void re_set_whitespace_regexp (const char *regexp);
#endif /* regex.h */
-/* arch-tag: bda6e3ec-3c02-4237-a55a-01ad2e120083
- (do not change this comment) */
diff --git a/src/region-cache.c b/src/region-cache.c
index 14fe119da0..956460a19c 100644
--- a/src/region-cache.c
+++ b/src/region-cache.c
@@ -808,5 +808,3 @@ pp_cache (struct region_cache *c)
}
}
-/* arch-tag: 98c29f3f-2ca2-4e3a-92f0-f2249200a17d
- (do not change this comment) */
diff --git a/src/region-cache.h b/src/region-cache.h
index 0a63c62df6..c963e897ea 100644
--- a/src/region-cache.h
+++ b/src/region-cache.h
@@ -110,5 +110,3 @@ extern int region_cache_backward (struct buffer *BUF,
EMACS_INT POS,
EMACS_INT *NEXT);
-/* arch-tag: 70f79125-ef22-4f58-9aec-a48ca2791435
- (do not change this comment) */
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index 7ddf219931..2c2a4be2d5 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -1,6 +1,6 @@
/*
-Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
- Free Software Foundation, Inc.
+Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+ 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -88,5 +88,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
to avoid a crash just use the Emacs implementation for that function. */
#define BROKEN_GET_CURRENT_DIR_NAME 1
-/* arch-tag: 38fe75ea-6aef-42bd-8449-bc34d921a562
- (do not change this comment) */
diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h
index 247e1f573d..d0bdb566dd 100644
--- a/src/s/bsd-common.h
+++ b/src/s/bsd-common.h
@@ -1,6 +1,7 @@
/* Definitions file for GNU Emacs running on bsd 4.3
- Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+ 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -81,5 +82,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Send signals to subprocesses by "typing" special chars at them. */
#define SIGNALS_VIA_CHARACTERS
-/* arch-tag: 0c367245-bde3-492e-9029-3ff6898beb95
- (do not change this comment) */
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 774ef3a9ab..1a224f1d72 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -104,5 +104,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Send signals to subprocesses by "typing" special chars at them. */
#define SIGNALS_VIA_CHARACTERS
-/* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b
- (do not change this comment) */
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 089d569460..74ac808acd 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -1,6 +1,7 @@
/* System description header file for Darwin (Mac OS X).
- 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.
This file is part of GNU Emacs.
@@ -149,5 +150,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack. */
#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-/* arch-tag: 481d443d-4f89-43ea-b5fb-49706d95fa41
- (do not change this comment) */
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index 99dc050bfa..d7cc308f7b 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -66,5 +66,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack. */
#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-/* arch-tag: 426529ca-b7c4-448f-b10a-d4dcdc9c78eb
- (do not change this comment) */
diff --git a/src/s/gnu-kfreebsd.h b/src/s/gnu-kfreebsd.h
index a1e8c02474..a85571915d 100644
--- a/src/s/gnu-kfreebsd.h
+++ b/src/s/gnu-kfreebsd.h
@@ -7,5 +7,3 @@
#define NO_TERMIO /* use only <termios.h> */
-/* arch-tag: 8d098200-2586-469e-99ab-6d092c035e03
- (do not change this comment) */
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 9c37b8eec0..a102f602bd 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -1,7 +1,8 @@
/* This file is the configuration file for Linux-based GNU systems
Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ 2005, 2006, 2007, 2008, 2009, 2010, 2011
+ Free Software Foundation, Inc.
This file was put together by Michael K. Johnson and Rik Faith.
@@ -160,5 +161,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif
#endif
-/* arch-tag: 6244ea2a-abd0-44ec-abec-ff3dcc9afea9
- (do not change this comment) */
diff --git a/src/s/gnu.h b/src/s/gnu.h
index df35adc870..9e46d100d4 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -1,6 +1,7 @@
/* Definitions file for GNU Emacs running on the GNU Hurd.
- Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+
+Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+ 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -44,5 +45,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif /* !_IO_STDIO_H */
#endif /* emacs */
-/* arch-tag: 577983d9-87a6-4922-b8f8-ff2b563714a4
- (do not change this comment) */
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index 3e88b57bc9..f6eb2ddfd1 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -1,6 +1,7 @@
/* System description file for hpux version 10.20.
- Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+
+Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+ 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -134,5 +135,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* No underscore please. */
#define LDAV_SYMBOL "avenrun"
-/* arch-tag: 8d8dcbf1-ca9b-48a1-94be-b750de18a5c6
- (do not change this comment) */
diff --git a/src/s/hpux11.h b/src/s/hpux11.h
index 48f6084104..40bcc98797 100644
--- a/src/s/hpux11.h
+++ b/src/s/hpux11.h
@@ -7,5 +7,3 @@
then close and reopen it in the child. */
#define USG_SUBTTY_WORKS
-/* arch-tag: f5a3d780-82cd-4a9a-832e-a4031aab788b
- (do not change this comment) */
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index 6ddae984a6..f755e119bc 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -97,8 +97,4 @@ char *_getpty();
#define GC_SETJMP_WORKS 1
#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-/* arch-tag: ad0660e0-acf8-46ae-b866-4f3df5b1101b
- (do not change this comment) */
-/* arch-tag: d7ad9ec2-54ad-4b2f-adf2-0070c5c63e83
- (do not change this comment) */
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 6900cbcc45..18e3fd2982 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -389,5 +389,3 @@ extern void _DebPrint (const char *fmt, ...);
/* ============================================================ */
-/* arch-tag: 5d4a3a1c-40dc-4dea-9c7c-38fed9ae0eae
- (do not change this comment) */
diff --git a/src/s/msdos.h b/src/s/msdos.h
index 3bb1dfe03e..b48177da05 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -125,5 +125,3 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
#define GC_SETJMP_WORKS 1
#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-/* arch-tag: d184f860-815d-4ff4-8187-d05c0f3c37d0
- (do not change this comment) */
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 115779a7cb..a469cc228f 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -1,7 +1,7 @@
/* s/ file for netbsd system.
- 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.
This file is part of GNU Emacs.
@@ -45,5 +45,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method. */
#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-/* arch-tag: e80f364a-04e9-4faf-93cb-f36a0fe95c81
- (do not change this comment) */
diff --git a/src/s/openbsd.h b/src/s/openbsd.h
index d9d60e3b86..175d61dc9c 100644
--- a/src/s/openbsd.h
+++ b/src/s/openbsd.h
@@ -3,5 +3,3 @@
/* The same as NetBSD. Note there are differences in configure. */
#include "netbsd.h"
-/* arch-tag: 7e3f65ca-3f48-4237-933f-2b208b21e8e2
- (do not change this comment) */
diff --git a/src/s/sol2-10.h b/src/s/sol2-10.h
index fd7f30021e..b20476e7fb 100644
--- a/src/s/sol2-10.h
+++ b/src/s/sol2-10.h
@@ -8,5 +8,3 @@
/* This is needed for the system_process_attributes implementation. */
#define _STRUCTURED_PROC 1
-/* arch-tag: 7c51a134-5469-4d16-aa00-d69224640eeb
- (do not change this comment) */
diff --git a/src/s/sol2-6.h b/src/s/sol2-6.h
index 3b707aa5c3..dd1c41a1af 100644
--- a/src/s/sol2-6.h
+++ b/src/s/sol2-6.h
@@ -1,7 +1,7 @@
/* Definitions file for GNU Emacs running on Solaris 2.6.
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008, 2009, 2010 Free Software Foundation, Inc.
+ 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -62,5 +62,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define GC_SETJMP_WORKS 1
#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-/* arch-tag: 71ea3857-89dc-4395-9623-77964e6ed3ca
- (do not change this comment) */
diff --git a/src/s/template.h b/src/s/template.h
index d6aad17d39..f08da48dfc 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -121,5 +121,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
you should also check `etc/MACHINES' to make sure its descriptions
of known problems in that configuration should be updated. */
-/* arch-tag: 4b426b11-cb2e-4c0e-a488-e663f76a0515
- (do not change this comment) */
diff --git a/src/s/unixware.h b/src/s/unixware.h
index 81b1b3d97f..150cef604b 100644
--- a/src/s/unixware.h
+++ b/src/s/unixware.h
@@ -1,7 +1,7 @@
/* s/ file for Unixware.
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008, 2009, 2010 Free Software Foundation, Inc.
+ 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -61,5 +61,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base)
-/* arch-tag: d82e92e7-9443-4a60-a581-7f293cbae8a3
- (do not change this comment) */
diff --git a/src/s/usg5-4-common.h b/src/s/usg5-4-common.h
index 366d92b95a..a9164d12bb 100644
--- a/src/s/usg5-4-common.h
+++ b/src/s/usg5-4-common.h
@@ -107,5 +107,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* This definition was suggested for next release. So give it a try. */
#define HAVE_SOCKETS
-/* arch-tag: 1a0ed909-5faa-434b-b7c3-9d86c63d53a6
- (do not change this comment) */
diff --git a/src/scroll.c b/src/scroll.c
index b91c7de034..296e5784d0 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1035,5 +1035,3 @@ do_line_insertion_deletion_costs (FRAME_PTR frame,
coefficient);
}
-/* arch-tag: cdb7149c-48e7-4793-a948-2786c8e45485
- (do not change this comment) */
diff --git a/src/search.c b/src/search.c
index c3584030db..ff2b116d7f 100644
--- a/src/search.c
+++ b/src/search.c
@@ -3262,5 +3262,3 @@ is to bind it with `let' around a small expression. */);
defsubr (&Sregexp_quote);
}
-/* arch-tag: a6059d79-0552-4f14-a2cb-d379a4e3c78f
- (do not change this comment) */
diff --git a/src/sheap.c b/src/sheap.c
index 816c1080e9..249fcc6b7b 100644
--- a/src/sheap.c
+++ b/src/sheap.c
@@ -94,5 +94,3 @@ report_sheap_usage (int die_if_pure_storage_exceeded)
message ("%s", buf);
}
-/* arch-tag: 1bc386e8-71c2-4da4-b8b5-c1674a9cf926
- (do not change this comment) */
diff --git a/src/sound.c b/src/sound.c
index ddd8ddbec2..6ea1cb3bbd 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -1500,5 +1500,3 @@ init_sound (void)
#endif /* HAVE_SOUND */
-/* arch-tag: dd850ad8-0433-4e2c-9cba-b7aeeccc0dbd
- (do not change this comment) */
diff --git a/src/syntax.c b/src/syntax.c
index 1c619044ff..d8749a18ee 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -3548,5 +3548,3 @@ In both cases, LIMIT bounds the search. */);
defsubr (&Sparse_partial_sexp);
}
-/* arch-tag: 3e297b9f-088e-4b64-8f4c-fb0b3443e412
- (do not change this comment) */
diff --git a/src/syntax.h b/src/syntax.h
index 77902a0414..87a3340283 100644
--- a/src/syntax.h
+++ b/src/syntax.h
@@ -302,5 +302,3 @@ extern int parse_sexp_lookup_properties;
extern EMACS_INT scan_words (EMACS_INT, EMACS_INT);
-/* arch-tag: 28833cca-cd73-4741-8c85-a3111166a0e0
- (do not change this comment) */
diff --git a/src/sysselect.h b/src/sysselect.h
index cb7e0957a3..0edd9a4f32 100644
--- a/src/sysselect.h
+++ b/src/sysselect.h
@@ -54,5 +54,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define select sys_select
#endif
-/* arch-tag: 36d05500-8cf6-4847-8e78-6721f18c06ef
- (do not change this comment) */
diff --git a/src/syssignal.h b/src/syssignal.h
index 83743dd8cc..34bae9bab3 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -159,5 +159,3 @@ extern pthread_t main_thread;
#else /* not FORWARD_SIGNAL_TO_MAIN_THREAD */
#define SIGNAL_THREAD_CHECK(signo)
#endif /* not FORWARD_SIGNAL_TO_MAIN_THREAD */
-/* arch-tag: 4580e86a-340d-4574-9e11-a742b6e1a152
- (do not change this comment) */
diff --git a/src/systime.h b/src/systime.h
index c35fae19c4..96daac1949 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -174,5 +174,3 @@ extern int lisp_time_argument (Lisp_Object, time_t *, int *);
#endif /* EMACS_SYSTIME_H */
-/* arch-tag: dcb79915-cf99-4bce-9778-aade71d07651
- (do not change this comment) */
diff --git a/src/syswait.h b/src/syswait.h
index 3c51a3dab8..73fb4a5de5 100644
--- a/src/syswait.h
+++ b/src/syswait.h
@@ -58,5 +58,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif /* EMACS_SYSWAIT_H */
-/* arch-tag: 7e5d9719-ec66-4b6f-89bb-563eea16a899
- (do not change this comment) */
diff --git a/src/termcap.c b/src/termcap.c
index 39ad08a66d..9e64d02764 100644
--- a/src/termcap.c
+++ b/src/termcap.c
@@ -713,5 +713,3 @@ tprint (cap)
#endif /* TEST */
-/* arch-tag: c2e8d427-2271-4fac-95fe-411857238b80
- (do not change this comment) */
diff --git a/src/termchar.h b/src/termchar.h
index e0eccaa5bd..befbb8b9f8 100644
--- a/src/termchar.h
+++ b/src/termchar.h
@@ -212,5 +212,3 @@ extern struct tty_display_info *tty_list;
#define CURTTY() FRAME_TTY (SELECTED_FRAME())
-/* arch-tag: bf9f0d49-842b-42fb-9348-ec8759b27193
- (do not change this comment) */
diff --git a/src/termhooks.h b/src/termhooks.h
index 7f86f04c0a..246e0a13a1 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -658,5 +658,3 @@ extern struct terminal *initial_terminal;
extern void close_gpm (int gpm_fd);
#endif
-/* arch-tag: 33a00ecc-52b5-4186-a410-8801ac9f087d
- (do not change this comment) */
diff --git a/src/terminal.c b/src/terminal.c
index ab6f9fd645..f6390f3fa5 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -558,5 +558,3 @@ or some time later. */);
Fprovide (intern_c_string ("multi-tty"), Qnil);
}
-/* arch-tag: e9af6f27-b483-47dc-bb1a-730c1c5cab03
- (do not change this comment) */
diff --git a/src/terminfo.c b/src/terminfo.c
index 4b80308d23..e42c52be88 100644
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -49,5 +49,3 @@ tparam (char *string, char *outstring,
return outstring;
}
-/* arch-tag: a6f96a69-e68f-4e9d-a223-f0b0da26ead5
- (do not change this comment) */
diff --git a/src/termopts.h b/src/termopts.h
index 8f61380429..eecd948141 100644
--- a/src/termopts.h
+++ b/src/termopts.h
@@ -44,5 +44,3 @@ extern Lisp_Object Vtruncate_partial_width_windows;
used for Emacs and another for all else. */
extern int no_redraw_on_reenter;
-/* arch-tag: 35d4d284-dc1a-4fff-97fa-0154a21aebdb
- (do not change this comment) */
diff --git a/src/textprop.c b/src/textprop.c
index a73c31255f..a2794264d9 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -2338,5 +2338,3 @@ inherits it if NONSTICKINESS is nil. The `front-sticky' and
/* defsubr (&Scopy_text_properties); */
}
-/* arch-tag: 454cdde8-5f86-4faa-a078-101e3625d479
- (do not change this comment) */
diff --git a/src/tparam.c b/src/tparam.c
index d8a8f0260f..fcbb63881e 100644
--- a/src/tparam.c
+++ b/src/tparam.c
@@ -278,5 +278,3 @@ main (argc, argv)
#endif /* DEBUG */
-/* arch-tag: 83f7b5ac-a808-4f75-b87a-123de009b402
- (do not change this comment) */
diff --git a/src/undo.c b/src/undo.c
index 8d5c5797c0..c6d2747f27 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -728,5 +728,3 @@ so it must make sure not to do a lot of consing. */);
undo_inhibit_record_point = 0;
}
-/* arch-tag: d546ee01-4aed-4ffb-bb8b-eefaae50d38a
- (do not change this comment) */
diff --git a/src/unexaix.c b/src/unexaix.c
index 273762d67b..edffaa098d 100644
--- a/src/unexaix.c
+++ b/src/unexaix.c
@@ -639,5 +639,3 @@ start_of_text (void)
return ((char *) 0x10000000);
}
-/* arch-tag: 0783857a-7c2d-456f-a426-58b722d69fd0
- (do not change this comment) */
diff --git a/src/unexcoff.c b/src/unexcoff.c
index b7b1801879..d098d862f1 100644
--- a/src/unexcoff.c
+++ b/src/unexcoff.c
@@ -556,5 +556,3 @@ unexec (const char *new_name, const char *a_name)
#endif /* not CANNOT_DUMP */
-/* arch-tag: 62409b69-e27a-4a7c-9413-0210d6b54e7f
- (do not change this comment) */
diff --git a/src/unexcw.c b/src/unexcw.c
index af85fd14ea..54ffcf216e 100644
--- a/src/unexcw.c
+++ b/src/unexcw.c
@@ -300,5 +300,3 @@ unexec (const char *outfile, const char *infile)
return (0);
}
-/* arch-tag: fc44f6c3-ca0a-45e0-a5a2-58b6101b1e65
- (do not change this comment) */
diff --git a/src/unexelf.c b/src/unexelf.c
index 0732e20271..0aac216b1c 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -1309,5 +1309,3 @@ temacs:
fatal ("Can't chmod (%s): errno %d\n", new_name, errno);
}
-/* arch-tag: e02e1512-95e2-4ef0-bba7-b6bce658f1e3
- (do not change this comment) */
diff --git a/src/unexhp9k800.c b/src/unexhp9k800.c
index b9edd4f3a8..c0471992a7 100644
--- a/src/unexhp9k800.c
+++ b/src/unexhp9k800.c
@@ -320,5 +320,3 @@ display_header (hdr, auxhdr)
}
#endif /* DEBUG */
-/* arch-tag: d55a09ac-9427-4ec4-8496-cb9d7710774f
- (do not change this comment) */
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index 12b8bef6a6..75d6677f53 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -1376,5 +1376,3 @@ unexec_free (void *ptr)
malloc_zone_free (emacs_zone, (unexec_malloc_header_t *) ptr - 1);
}
-/* arch-tag: 1a784f7b-a184-4c4f-9544-da8619593d72
- (do not change this comment) */
diff --git a/src/unexsol.c b/src/unexsol.c
index 1d58ed46d4..e1a10f7d21 100644
--- a/src/unexsol.c
+++ b/src/unexsol.c
@@ -27,5 +27,3 @@ unexec (const char *new_name, const char *old_name)
Fcons (build_string ("Cannot unexec"), Fcons (errstring, data)));
}
-/* arch-tag: d8ff72b3-8198-4011-8ef5-011b12027f59
- (do not change this comment) */
diff --git a/src/unexw32.c b/src/unexw32.c
index 7d2e639d7d..54352147c9 100644
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -826,5 +826,3 @@ unexec (const char *new_name, const char *old_name)
/* eof */
-/* arch-tag: fe1d3d1c-ef88-4917-ab22-f12ab16b3254
- (do not change this comment) */
diff --git a/src/vm-limit.c b/src/vm-limit.c
index bae247ec57..4b16f0ee90 100644
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -299,5 +299,3 @@ memory_warnings (POINTER start, void (*warnfun) (const char *))
lim_data = 0;
}
-/* arch-tag: eab04eda-1f69-447a-8d9f-95f0a3983ca5
- (do not change this comment) */
diff --git a/src/w16select.c b/src/w16select.c
index 6882a8b7ed..0b39af0157 100644
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -1,6 +1,7 @@
/* 16-bit Windows Selection processing for emacs on MS-Windows
- Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+
+Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+ 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/w32.h b/src/w32.h
index f770027475..42cc542c54 100644
--- a/src/w32.h
+++ b/src/w32.h
@@ -146,5 +146,3 @@ extern int _sys_wait_accept (int fd);
#endif /* EMACS_W32_H */
-/* arch-tag: 02c36b00-312b-4c4d-a1d9-f905c5e968f0
- (do not change this comment) */
diff --git a/src/w32console.c b/src/w32console.c
index c324a299ab..3e8ced6289 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -760,5 +760,3 @@ scroll-back buffer. */);
defsubr (&Sset_message_beep);
}
-/* arch-tag: a390a07f-f661-42bc-aeb4-e6d8bf860337
- (do not change this comment) */
diff --git a/src/w32font.c b/src/w32font.c
index 891f7ac8c7..46add9094f 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -2584,5 +2584,3 @@ versions of Windows) characters. */);
register_font_driver (&w32font_driver, NULL);
}
-/* arch-tag: 65b8a3cd-46aa-4c0d-a1f3-99e75b9c07ee
- (do not change this comment) */
diff --git a/src/w32font.h b/src/w32font.h
index 7957223788..ab81849375 100644
--- a/src/w32font.h
+++ b/src/w32font.h
@@ -85,5 +85,3 @@ Lisp_Object intern_font_name (char *);
#endif
-/* arch-tag: ef9d9675-a2a5-4d01-9526-815e9a3da7cb
- (do not change this comment) */
diff --git a/src/w32gui.h b/src/w32gui.h
index 4a6903debf..c43f812a29 100644
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -149,5 +149,3 @@ typedef struct {
#endif /* EMACS_W32GUI_H */
-/* arch-tag: 9172e5fb-45a5-4684-afd9-ca0e81324604
- (do not change this comment) */
diff --git a/src/w32heap.h b/src/w32heap.h
index 4f22e17687..a439b4747c 100644
--- a/src/w32heap.h
+++ b/src/w32heap.h
@@ -94,5 +94,3 @@ IMAGE_SECTION_HEADER * rva_to_section (DWORD rva, IMAGE_NT_HEADERS * nt_header);
#endif /* NTHEAP_H_ */
-/* arch-tag: 3ba4cbe1-8a09-4a41-8f37-fd31f7426b3c
- (do not change this comment) */
diff --git a/src/w32inevt.h b/src/w32inevt.h
index 160de502e7..c18d722e4b 100644
--- a/src/w32inevt.h
+++ b/src/w32inevt.h
@@ -30,5 +30,3 @@ extern void w32_console_mouse_position (FRAME_PTR *f, int insist,
#endif /* EMACS_W32INEVT_H */
-/* arch-tag: 7641bd54-199f-4552-8e8a-6a2f5340ef13
- (do not change this comment) */
diff --git a/src/w32menu.c b/src/w32menu.c
index fa047aee5c..26938ff065 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -1734,5 +1734,3 @@ globals_of_w32menu (void)
unicode_message_box = (MessageBoxW_Proc) GetProcAddress (user32, "MessageBoxW");
}
-/* arch-tag: 0eaed431-bb4e-4aac-a527-95a1b4f1fed0
- (do not change this comment) */
diff --git a/src/w32reg.c b/src/w32reg.c
index 5c7e9cca0f..99fca62fbd 100644
--- a/src/w32reg.c
+++ b/src/w32reg.c
@@ -161,5 +161,3 @@ x_get_string_resource (XrmDatabase rdb, char *name, char *class)
return (w32_get_string_resource (name, class, REG_SZ));
}
-/* arch-tag: 755fce25-42d7-4acb-874f-2fb42336823d
- (do not change this comment) */
diff --git a/src/w32select.c b/src/w32select.c
index 88996e1292..369f49ebbe 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -1,6 +1,7 @@
/* Selection processing for Emacs on the Microsoft W32 API.
- Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+
+Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+ 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/w32term.c b/src/w32term.c
index f411a78b2d..3cf4a0e965 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1,7 +1,8 @@
/* Implementation of GUI terminal on the Microsoft W32 API.
- Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998,
- 1999, 2000, 2001, 2002, 2003, 2004, 2005,
- 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+
+Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+ 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+ Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/w32term.h b/src/w32term.h
index 1c4169194f..e6b29b4103 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -707,5 +707,3 @@ typedef BOOL (WINAPI * AppendMenuW_Proc) (
IN UINT_PTR,
IN LPCWSTR);
-/* arch-tag: f201d05a-1240-4fc5-8ea4-ca24d4ee5671
- (do not change this comment) */
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index dc146789fa..59e4b69b8b 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -965,5 +965,3 @@ syms_of_w32uniscribe (void)
register_font_driver (&uniscribe_font_driver, NULL);
}
-/* arch-tag: 9530f0e1-7471-47dd-a780-94330af87ea0
- (do not change this comment) */
diff --git a/src/w32xfns.c b/src/w32xfns.c
index 7f330b9b00..75780d14c7 100644
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -443,5 +443,3 @@ x_sync (void *f)
{
}
-/* arch-tag: 4fab3695-4ad3-4cc6-a2b1-fd2c67dc46be
- (do not change this comment) */
diff --git a/src/widget.c b/src/widget.c
index d4fb341531..72ee0e3ab9 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -842,5 +842,3 @@ widget_store_internal_border (Widget widget)
ew->emacs_frame.internal_border_width = f->internal_border_width;
}
-/* arch-tag: 931d28e5-0d59-405a-8325-7d475d0a13d9
- (do not change this comment) */
diff --git a/src/widget.h b/src/widget.h
index f1df67ac36..3f40490913 100644
--- a/src/widget.h
+++ b/src/widget.h
@@ -99,5 +99,3 @@ void widget_store_internal_border (Widget widget);
#endif /* _EmacsFrame_h */
-/* arch-tag: 98be17cc-8878-4701-abfa-66f1c04e9cb7
- (do not change this comment) */
diff --git a/src/widgetprv.h b/src/widgetprv.h
index 34ec3bfbfe..f721ecdae1 100644
--- a/src/widgetprv.h
+++ b/src/widgetprv.h
@@ -77,5 +77,3 @@ extern EmacsFrameClassRec emacsFrameClassRec; /* class pointer */
#endif /* _EmacsFrameP_h */
-/* arch-tag: 2b579b4c-f697-4f86-b27a-35b7cb1a4a1c
- (do not change this comment) */
diff --git a/src/window.c b/src/window.c
index 1487f3033f..69dc8c7c68 100644
--- a/src/window.c
+++ b/src/window.c
@@ -158,6 +158,11 @@ static int sequence_number;
static int window_initialized;
+/* Set in `set-window-configuration' to prevent "swapping out point"
+ in the old selected window. */
+
+static int inhibit_point_swap;
+
/* Hook to run when window config changes. */
static Lisp_Object Qwindow_configuration_change_hook;
@@ -191,6 +196,10 @@ static int window_scroll_preserve_vpos;
static int inhibit_frame_unsplittable;
#endif /* 0 */
+extern EMACS_INT scroll_margin;
+
+extern Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;
+
/* If non-nil, then the `recenter' command with a nil argument
the entire frame to be redrawn; the special value `tty' causes the
frame to be redrawn only if it is a tty frame. */
@@ -3594,7 +3603,9 @@ selected window before each command. */)
/* Store the current buffer's actual point into the
old selected window. It belongs to that window,
and when the window is not selected, must be in the window. */
- if (!NILP (selected_window))
+ if (inhibit_point_swap)
+ inhibit_point_swap = 0;
+ else
{
ow = XWINDOW (selected_window);
if (! NILP (ow->buffer))
@@ -5767,7 +5778,7 @@ zero means top of window, negative means relative to bottom of window. */)
/* This test is needed to make sure PT/PT_BYTE make sense in w->buffer
when passed below to set_marker_both. */
error ("move-to-window-line called from unrelated buffer");
-
+
window = selected_window;
start = marker_position (w->start);
if (start < BEGV || start > ZV)
@@ -6144,10 +6155,6 @@ the return value is nil. Otherwise the value is t. */)
}
FRAME_ROOT_WINDOW (f) = data->root_window;
- /* Prevent "swapping out point" in the old selected window
- using the buffer that has been restored into it.
- We already swapped out point that from that window's old buffer. */
- selected_window = Qnil;
/* Arrange *not* to restore point in the buffer that was
current when the window configuration was saved. */
@@ -6156,6 +6163,11 @@ the return value is nil. Otherwise the value is t. */)
make_number (old_point),
XWINDOW (data->current_window)->buffer);
+ /* In the following call to `select-window, prevent "swapping
+ out point" in the old selected window using the buffer that
+ has been restored into it. We already swapped out that point
+ from that window's old buffer. */
+ inhibit_point_swap = 1;
Fselect_window (data->current_window, Qnil);
XBUFFER (XWINDOW (selected_window)->buffer)->last_selected_window
= selected_window;
@@ -6165,13 +6177,6 @@ the return value is nil. Otherwise the value is t. */)
&& FRAME_LIVE_P (XFRAME (data->focus_frame))))
Fredirect_frame_focus (frame, data->focus_frame);
-#if 0 /* I don't understand why this is needed, and it causes problems
- when the frame's old selected window has been deleted. */
- if (f != selected_frame && FRAME_WINDOW_P (f))
- do_switch_frame (WINDOW_FRAME (XWINDOW (data->root_window)),
- 0, 0, Qnil);
-#endif
-
/* Set the screen height to the value it had before this function. */
if (previous_frame_lines != FRAME_LINES (f)
|| previous_frame_cols != FRAME_COLS (f))
@@ -7094,6 +7099,8 @@ syms_of_window (void)
window_scroll_preserve_hpos = -1;
window_scroll_preserve_vpos = -1;
+ inhibit_point_swap = 0;
+
DEFVAR_LISP ("temp-buffer-show-function", &Vtemp_buffer_show_function,
doc: /* Non-nil means call as function to display a help buffer.
The function is called with one argument, the buffer to be displayed.
@@ -7272,5 +7279,3 @@ keys_of_window (void)
initial_define_key (meta_map, 'v', "scroll-down-command");
}
-/* arch-tag: 90a9c576-0590-48f1-a5f1-6c96a0452d9f
- (do not change this comment) */
diff --git a/src/window.h b/src/window.h
index 1143b6f094..620c1b3392 100644
--- a/src/window.h
+++ b/src/window.h
@@ -894,5 +894,3 @@ extern int window_box_text_cols (struct window *w);
#endif /* not WINDOW_H_INCLUDED */
-/* arch-tag: d4a6942f-e433-4ffe-ac10-2c3574f28577
- (do not change this comment) */
diff --git a/src/xfaces.c b/src/xfaces.c
index 58027799c2..9d3c5927d6 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1,6 +1,8 @@
/* xfaces.c -- "Face" primitives.
+
Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ 2005, 2006, 2007, 2008, 2009, 2010, 2011
+ Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/xfns.c b/src/xfns.c
index bbec8759cd..7fcb4c637a 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1,7 +1,8 @@
/* Functions for the X window system.
- Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
- Free Software Foundation, Inc.
+
+Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+ 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/xfont.c b/src/xfont.c
index c167a0ddc9..a3de598809 100644
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -1114,5 +1114,3 @@ syms_of_xfont (void)
register_font_driver (&xfont_driver, NULL);
}
-/* arch-tag: 23c5f366-a5ee-44b7-a3b7-90d6da7fd749
- (do not change this comment) */
diff --git a/src/xftfont.c b/src/xftfont.c
index 79dc6c5715..722eb09e9d 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -778,5 +778,3 @@ syms_of_xftfont (void)
register_font_driver (&xftfont_driver, NULL);
}
-/* arch-tag: 64ec61bf-7c8e-4fe6-b953-c6a85d5e1605
- (do not change this comment) */
diff --git a/src/xgselect.c b/src/xgselect.c
index 971b204ca4..4091f501c4 100644
--- a/src/xgselect.c
+++ b/src/xgselect.c
@@ -157,5 +157,3 @@ xgselect_initialize (void)
#endif /* defined (USE_GTK) || defined (HAVE_GCONF) */
}
-/* arch-tag: c5873ee3-d1f6-44f9-9f3b-b14f70fd0e6a
- (do not change this comment) */
diff --git a/src/xgselect.h b/src/xgselect.h
index dc26ccee34..14faf06813 100644
--- a/src/xgselect.h
+++ b/src/xgselect.h
@@ -34,5 +34,3 @@ extern void xgselect_initialize (void);
#endif /* XGSELECT_H */
-/* arch-tag: 0c5392a8-3a41-41eb-839c-58e6595926f0
- (do not change this comment) */
diff --git a/src/xml.c b/src/xml.c
index fde9d4d382..1e260bdeb9 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -1,5 +1,5 @@
/* Interface to libxml2.
- 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/src/xrdb.c b/src/xrdb.c
index 3d3aeb4ab5..64879fbc4d 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -764,5 +764,3 @@ main (argc, argv)
}
#endif /* TESTRM */
-/* arch-tag: 37e6fbab-ed05-4363-9e76-6c4109ed511f
- (do not change this comment) */
diff --git a/src/xselect.c b/src/xselect.c
index cca4117cb3..da562609b9 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -2714,5 +2714,3 @@ A value of 0 means wait as long as necessary. This is initialized from the
staticpro (&Qforeign_selection);
}
-/* arch-tag: 7c293b0f-9918-4f69-8ac7-03e142307236
- (do not change this comment) */
diff --git a/src/xsettings.c b/src/xsettings.c
index 16c4603f59..dbb3a8701e 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -1,6 +1,6 @@
-/* Functions for handle font and other changes dynamically.
- Copyright (C) 2009, 2010, 2011
- Free Software Foundation, Inc.
+/* Functions for handling font and other changes dynamically.
+
+Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -777,5 +777,3 @@ If this variable is nil, Emacs ignores system font changes. */);
Fprovide (intern_c_string ("dynamic-setting"), Qnil);
}
-/* arch-tag: 541716ed-2e6b-42e1-8212-3197e01ea61d
- (do not change this comment) */
diff --git a/src/xsettings.h b/src/xsettings.h
index 858c358b1b..66005cf99b 100644
--- a/src/xsettings.h
+++ b/src/xsettings.h
@@ -31,5 +31,3 @@ extern const char *xsettings_get_system_normal_font (void);
#endif /* XSETTINGS_H */
-/* arch-tag: 2c0f5c49-e925-4452-b778-4c082da6dd72
- (do not change this comment) */
diff --git a/src/xsmfns.c b/src/xsmfns.c
index d67166e48f..515d0e28a8 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -594,5 +594,3 @@ See also `emacs-save-session-functions', `emacs-session-save' and
#endif /* HAVE_X_SM */
-/* arch-tag: 56a2c58c-adfa-430a-b772-130abd29fd2e
- (do not change this comment) */
diff --git a/src/xterm.c b/src/xterm.c
index c15539182f..2c04e9fa84 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1,6 +1,7 @@
/* X Communication module for terminals which understand the X protocol.
- Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+
+Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+ 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/src/xterm.h b/src/xterm.h
index 9a1222be9c..4f075be7fc 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -1113,5 +1113,3 @@ extern Lisp_Object Qx_gtk_map_stock;
(nr).width = (rwidth), \
(nr).height = (rheight))
-/* arch-tag: 78a7972a-b18f-4694-861a-0780c4b3090e
- (do not change this comment) */
diff --git a/test/ChangeLog b/test/ChangeLog
index 3908a73413..6c8f47186e 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -250,4 +250,3 @@
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: 6f0d1c86-c141-46da-b387-cf17e38c7bf7
diff --git a/test/bytecomp-testsuite.el b/test/bytecomp-testsuite.el
index 00b7f2a3dd..73bafca805 100644
--- a/test/bytecomp-testsuite.el
+++ b/test/bytecomp-testsuite.el
@@ -280,4 +280,3 @@ Subtests signal errors if something goes wrong."
(provide 'byte-opt-testsuite)
-;; arch-tag: 01cb2664-5e7f-4213-ace0-91447d70b7dc
diff --git a/test/cedet/cedet-utests.el b/test/cedet/cedet-utests.el
index 288ef6a132..df8c522984 100644
--- a/test/cedet/cedet-utests.el
+++ b/test/cedet/cedet-utests.el
@@ -512,5 +512,4 @@ When optional NO-ERROR don't throw an error if we can't run tests."
(provide 'cedet-utests)
-;; arch-tag: ace16290-4119-4df0-b33c-8c6b809f420d
;;; cedet-utests.el ends here
diff --git a/test/cedet/ede-tests.el b/test/cedet/ede-tests.el
index 7735b54bc6..05b2466508 100644
--- a/test/cedet/ede-tests.el
+++ b/test/cedet/ede-tests.el
@@ -84,5 +84,4 @@ The search is done with the current EDE root."
(data-debug-insert-object-slots loc "]"))
)
-;; arch-tag: 79fae12e-652f-4544-a20e-b24d87b4917d
;;; ede-test.el ends here
diff --git a/test/cedet/semantic-ia-utest.el b/test/cedet/semantic-ia-utest.el
index 59590cb69f..a32daf4cea 100644
--- a/test/cedet/semantic-ia-utest.el
+++ b/test/cedet/semantic-ia-utest.el
@@ -525,5 +525,4 @@ Pass ARGS to format to create the log message."
(provide 'semantic-ia-utest)
-;; arch-tag: 03ede3fb-7ef0-4500-a7c2-bbf647957310
;;; semantic-ia-utest.el ends here
diff --git a/test/cedet/semantic-tests.el b/test/cedet/semantic-tests.el
index fb35c4b292..a789b91cfc 100644
--- a/test/cedet/semantic-tests.el
+++ b/test/cedet/semantic-tests.el
@@ -388,4 +388,3 @@ gcc version 2.95.2 19991024 (release)"
(semantic-gcc-test-output-parser))
)
-;; arch-tag: 91686489-4ab3-4392-8277-b3831269ddbb
diff --git a/test/cedet/semantic-utest-c.el b/test/cedet/semantic-utest-c.el
index a1bca1e3be..a88e825827 100644
--- a/test/cedet/semantic-utest-c.el
+++ b/test/cedet/semantic-utest-c.el
@@ -69,5 +69,4 @@
(provide 'semantic-utest-c)
-;; arch-tag: a90183e0-36ba-486e-9adb-8d37c929e6ba
;;; semantic-utest-c.el ends here
diff --git a/test/cedet/semantic-utest.el b/test/cedet/semantic-utest.el
index a535d1f97d..dccb9a658b 100644
--- a/test/cedet/semantic-utest.el
+++ b/test/cedet/semantic-utest.el
@@ -864,5 +864,4 @@ SKIPNAMES is a list of names to remove from NAME-CONTENTS"
-;; arch-tag: 082cbe6f-2290-476e-9760-a19a6bdd16b8
;;; semantic-utest.el ends here
diff --git a/test/cedet/srecode-tests.el b/test/cedet/srecode-tests.el
index b6e2275779..16dfa8d0d4 100644
--- a/test/cedet/srecode-tests.el
+++ b/test/cedet/srecode-tests.el
@@ -293,5 +293,4 @@ Dump out the extracted dictionary."
(princ "\n--------------------------------------------\n")
(srecode-dump extract))))))
-;; arch-tag: 7a467849-b415-4bdc-ba2a-284ace156a65
;;; srecode-tests.el ends here
diff --git a/test/cedet/tests/test.c b/test/cedet/tests/test.c
index 4e6e8bbdaf..f33e970e6f 100644
--- a/test/cedet/tests/test.c
+++ b/test/cedet/tests/test.c
@@ -241,5 +241,3 @@ int funk4_fixme(arg_61, arg_62)
/* End of C tests */
-/* arch-tag: ac9c7740-05ad-4821-a0b4-5db4357750ae
- (do not change this comment) */
diff --git a/test/cedet/tests/test.el b/test/cedet/tests/test.el
index 2adf5fff55..7deede92df 100644
--- a/test/cedet/tests/test.el
+++ b/test/cedet/tests/test.el
@@ -158,4 +158,3 @@
;;
(provide 'test)
-;; arch-tag: ecda6dd6-db71-4b28-aa47-6adc585dce06
diff --git a/test/cedet/tests/testdoublens.cpp b/test/cedet/tests/testdoublens.cpp
index 2d0183b1b4..4d4588328e 100644
--- a/test/cedet/tests/testdoublens.cpp
+++ b/test/cedet/tests/testdoublens.cpp
@@ -164,4 +164,3 @@ namespace d {
} // namespace f
} // namespace d
-// arch-tag: a185c9f1-7519-48de-8eba-9d9b4140624b
diff --git a/test/cedet/tests/testdoublens.hpp b/test/cedet/tests/testdoublens.hpp
index 711478c34c..b2dbcd8ac7 100644
--- a/test/cedet/tests/testdoublens.hpp
+++ b/test/cedet/tests/testdoublens.hpp
@@ -68,4 +68,3 @@ namespace a {
} // namespace b
} // namespace a
-// arch-tag: 22e0ca95-6a61-4627-8816-68c67a896a8d
diff --git a/test/cedet/tests/testfriends.cpp b/test/cedet/tests/testfriends.cpp
index ef024f43f0..20425f93af 100644
--- a/test/cedet/tests/testfriends.cpp
+++ b/test/cedet/tests/testfriends.cpp
@@ -36,4 +36,3 @@ int B::testB() {
int B::testAB() { // %1% ( ( "testfriends.cpp" ) ( "B" "B::testAB" ) )
}
-// arch-tag: 31ea93db-59f8-4301-8e32-06536358618e
diff --git a/test/cedet/tests/testnsp.cpp b/test/cedet/tests/testnsp.cpp
index fba9bdfb17..012dc66060 100644
--- a/test/cedet/tests/testnsp.cpp
+++ b/test/cedet/tests/testnsp.cpp
@@ -27,4 +27,3 @@ void myfcn_not_in_ns (void) {
; // #1# ( "fromchild" "fromroot" )
}
-// arch-tag: 2e9c6bf7-1574-440f-ba66-5c8fe034cdec
diff --git a/test/cedet/tests/testpolymorph.cpp b/test/cedet/tests/testpolymorph.cpp
index 37dec88961..c0ca0f0185 100644
--- a/test/cedet/tests/testpolymorph.cpp
+++ b/test/cedet/tests/testpolymorph.cpp
@@ -129,4 +129,3 @@ namespace template_multiple_spec {
// End of polymorphism test file.
-// arch-tag: e2c04959-9b3b-4b4f-b9c2-445bf4848aa4
diff --git a/test/cedet/tests/testspp.c b/test/cedet/tests/testspp.c
index bf725cf0ef..0abe66a6b5 100644
--- a/test/cedet/tests/testspp.c
+++ b/test/cedet/tests/testspp.c
@@ -100,5 +100,3 @@ int no_show_moose_elif_2() {}
int show_moose_elif_else() {}
#endif
-/* arch-tag: 5ea50b2a-1e12-439e-ade4-e68267f49674
- (do not change this comment) */
diff --git a/test/cedet/tests/testsppcomplete.c b/test/cedet/tests/testsppcomplete.c
index 772be33300..d789994228 100644
--- a/test/cedet/tests/testsppcomplete.c
+++ b/test/cedet/tests/testsppcomplete.c
@@ -28,5 +28,3 @@ int main(int argc, char *argv[]) {
; // #3# ( "test" )
}
-/* arch-tag: f4a9fe26-9035-4378-b951-9f06d6554599
- (do not change this comment) */
diff --git a/test/cedet/tests/testsppreplace.c b/test/cedet/tests/testsppreplace.c
index e6a46b620f..49c8bcff1f 100644
--- a/test/cedet/tests/testsppreplace.c
+++ b/test/cedet/tests/testsppreplace.c
@@ -152,5 +152,3 @@ int STARTMACRO () {
/* END */
-/* arch-tag: ee9bd650-35f4-468f-82d7-a5f3606c0132
- (do not change this comment) */
diff --git a/test/cedet/tests/testsppreplaced.c b/test/cedet/tests/testsppreplaced.c
index be9741c0a4..11c335daf5 100644
--- a/test/cedet/tests/testsppreplaced.c
+++ b/test/cedet/tests/testsppreplaced.c
@@ -116,5 +116,3 @@ int MACROA () {
/* End */
-/* arch-tag: fbc5621d-769c-45d0-b924-6c56743189e5
- (do not change this comment) */
diff --git a/test/cedet/tests/testsubclass.cpp b/test/cedet/tests/testsubclass.cpp
index 5ee35fed77..1668509245 100644
--- a/test/cedet/tests/testsubclass.cpp
+++ b/test/cedet/tests/testsubclass.cpp
@@ -247,4 +247,3 @@ bool sneaky::bugalope::testAccess() //^9^
;
}
-// arch-tag: 20a08c42-9ba6-4c8d-966a-893b37c841ef
diff --git a/test/cedet/tests/testsubclass.hh b/test/cedet/tests/testsubclass.hh
index e9a1958ea0..25f497c83c 100644
--- a/test/cedet/tests/testsubclass.hh
+++ b/test/cedet/tests/testsubclass.hh
@@ -189,4 +189,3 @@ namespace sneaky {
#endif
-// arch-tag: e292a1d5-5434-4b4d-8e0e-808101ad84b6
diff --git a/test/cedet/tests/testtypedefs.cpp b/test/cedet/tests/testtypedefs.cpp
index 325052159b..af4eee85c2 100644
--- a/test/cedet/tests/testtypedefs.cpp
+++ b/test/cedet/tests/testtypedefs.cpp
@@ -79,4 +79,3 @@ int main()
return 0;
}
-// arch-tag: 5a841384-8685-4344-bf45-15d3db19a87b
diff --git a/test/cedet/tests/testvarnames.c b/test/cedet/tests/testvarnames.c
index 894f0dd2b8..791e0e8d32 100644
--- a/test/cedet/tests/testvarnames.c
+++ b/test/cedet/tests/testvarnames.c
@@ -89,5 +89,3 @@ int test_1(int var_arg1) {
; // #11# ( "named_3" "named_4")
}
-/* arch-tag: ca9f23e9-0c66-4a5e-b233-3fdc841d3a63
- (do not change this comment) */
diff --git a/test/comint-testsuite.el b/test/comint-testsuite.el
index 9a4e7eae3b..571d497a7c 100644
--- a/test/comint-testsuite.el
+++ b/test/comint-testsuite.el
@@ -1,6 +1,6 @@
;;; bytecomp-testsuite.el
-;; 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/test/icalendar-testsuite.el b/test/icalendar-testsuite.el
index ad6bd7157c..915c02a5d9 100644
--- a/test/icalendar-testsuite.el
+++ b/test/icalendar-testsuite.el
@@ -1855,5 +1855,4 @@ SUMMARY:and diary-anniversary
(provide 'icalendar-testsuite)
-;; arch-tag: 33a98396-90e9-49c8-b0e9-b606386d6e8c
;;; icalendar-testsuite.el ends here
diff --git a/test/newsticker-testsuite.el b/test/newsticker-testsuite.el
index 0e1c056be5..a00c365d79 100644
--- a/test/newsticker-testsuite.el
+++ b/test/newsticker-testsuite.el
@@ -177,5 +177,4 @@ Signals an error if something goes wrong."
(provide 'newsticker-testsuite)
-;; arch-tag: e6c09af2-cc7a-4373-8f5f-9c36699ec34c
;;; newsticker-testsuite.el ends here
diff --git a/test/occur-testsuite.el b/test/occur-testsuite.el
index a4756c49e2..3859232ea3 100644
--- a/test/occur-testsuite.el
+++ b/test/occur-testsuite.el
@@ -1,6 +1,6 @@
;;; occur-testsuite.el --- Test suite for occur.
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;; Author: Juri Linkov <juri@jurta.org>
;; Keywords: matching, internal
diff --git a/test/redisplay-testsuite.el b/test/redisplay-testsuite.el
index e2f983b722..9b4c754cdc 100644
--- a/test/redisplay-testsuite.el
+++ b/test/redisplay-testsuite.el
@@ -178,4 +178,3 @@ static unsigned char x_bits[] = {0xff, 0x81, 0xbd, 0xa5, 0xa5, 0xbd, 0x81, 0xff
(test-redisplay-3)
(goto-char (point-min))))
-;; arch-tag: fcee53c8-024f-403d-9154-61ae3ce0bfb8
diff --git a/update-subdirs b/update-subdirs
index f4b9c92192..248416a263 100755
--- a/update-subdirs
+++ b/update-subdirs
@@ -55,5 +55,3 @@ else
mv subdirs.el~ subdirs.el
fi
fi
-
-# arch-tag: 56ebcf1b-5c30-4934-b0b4-72d374064704
diff --git a/vpath.sed b/vpath.sed
index 0eb98cc829..a792eb0e91 100644
--- a/vpath.sed
+++ b/vpath.sed
@@ -6,4 +6,3 @@ vpath %.c $(srcdir)\
vpath %.h $(srcdir)\
\
-# arch-tag: 56a64b50-e4e8-443a-960f-f13af0f1a545