- Update editors/emacs-devel to 23.0.50.20080101 snapshot.

PR:		ports/119290
Submitted by:	keramida(maintainer)

12 files changed, 554 insertions, 217 deletions

diff --git a/Mk/bsd.emacs.mk b/Mk/bsd.emacs.mk
index 47d974375066..233fb6dd4b58 100644
--- a/Mk/bsd.emacs.mk
+++ b/Mk/bsd.emacs.mk
@@ -1,5 +1,5 @@
 #
-#	$FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.70 2007-12-13 19:25:09 anray Exp $
+#	$FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.71 2008-01-27 14:26:42 anray Exp $
 #
 #	bsd.emacs.mk - 19990829 Shigeyuki Fukushima.
 #
@@ -100,8 +100,8 @@ PLIST?=			${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 # Emacs-22.x (development version)
 .elif (${EMACS_PORT_NAME} == "emacs-devel")
 EMACS_NAME=		emacs
-EMACS_VER=		22.0.99
-EMACS_MAJOR_VER=	22
+EMACS_VER=		23.0.50
+EMACS_MAJOR_VER=	23
 EMACS_LIBDIR?=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
 EMACS_PORTSDIR=		${PORTSDIR}/editors/emacs-devel
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index bb970bfe7687..98ad0fa9272b 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	emacs
-PORTVERSION=	${EMACS_VER}
-PORTREVISION=	1
+PORTVERSION=	${EMACS_VER}.${SNAPSHOT}
 CATEGORIES=	editors ipv6
-MASTER_SITES=	${MASTER_SITE_GNU_ALPHA}
-MASTER_SITE_SUBDIR=	emacs/pretest
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	keramida
+DISTNAME=	${PORTNAME}-cvs-snapshot-2008.01.01.21.19.17
 
 MAINTAINER=	keramida@ceid.upatras.gr
 COMMENT=	GNU editing macros
@@ -25,11 +25,12 @@ LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 .endif
 
-CONFLICTS=	emacs-19.* emacs-21.* \
+CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* \
 		xemacs-[0-9]* xemacs-devel-[0-9]* \
 		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
 
-EMACS_VER=	22.0.99
+EMACS_VER=	23.0.50
+SNAPSHOT=	20080101
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	bootfast
@@ -42,6 +43,8 @@ USE_XLIB=	yes
 USE_XPM=	yes
 .endif
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 CONFIGURE_TARGET=	${MACHINE_ARCH}-freebsd
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS=		--with-x=no
@@ -60,18 +63,18 @@ PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET}
 
 MAKE_ENV=	LC_ALL=C
 
-INFO=		ada-mode autotype calc ccmode cl dired-x ebrowse ediff \
+INFO=		ada-mode autotype calc ccmode cl dbus dired-x ebrowse ediff \
 		efaq eintr elisp emacs-mime emacs erc eshell eudc \
 		flymake forms gnus idlwave info message mh-e newsticker \
-		org pcl-cvs pgg rcirc reftex sc ses sieve smtpmail speedbar \
+		nxml-mode org pcl-cvs pgg rcirc reftex remember sc ses sieve smtpmail speedbar \
 		tramp url vip viper widget woman
 
-LATEST_LINK=	emacs22
+LATEST_LINK=	emacs23
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "ia64"
-BROKEN= Emacs 22.X does not currently build on ia64
+BROKEN=	Emacs 22.X and later does not currently build on ia64
 .endif
 
 pre-everything::
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index 4120d402e209..09332f131233 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,3 +1,3 @@
-SHA256 (emacs-22.0.99.tar.gz) = 03711c96b0be87944bab3a40478e68970066f85303970d1d0d0d1438609f1b15
-MD5 (emacs-22.0.99.tar.gz) = f0f6c5e4163113f5e292e7b03b078aa9
-SIZE (emacs-22.0.99.tar.gz) = 38105148
+SHA256 (emacs-cvs-snapshot-2008.01.01.21.19.17.tar.gz) = d9c3bbe40c5becb5109b44fe4cba0f923b7510841686a07f89b4178a90fa1e71
+MD5 (emacs-cvs-snapshot-2008.01.01.21.19.17.tar.gz) = 6dbefac5a8e9f57b2d242f5239db9529
+SIZE (emacs-cvs-snapshot-2008.01.01.21.19.17.tar.gz) = 26813634
diff --git a/editors/emacs-devel/files/patch-Makefile.in b/editors/emacs-devel/files/patch-Makefile.in
index 29774c94a862..f8ea44be0190 100644
--- a/editors/emacs-devel/files/patch-Makefile.in
+++ b/editors/emacs-devel/files/patch-Makefile.in
@@ -1,7 +1,7 @@
---- ./Makefile.in.orig	Sun Aug 27 04:16:25 2006
-+++ ./Makefile.in	Fri Sep  1 21:10:08 2006
-@@ -409,14 +409,6 @@
- ## That flag is also used in leim/Makefile.in
+--- Makefile.in.orig	2008-01-02 14:45:46.000000000 +0200
++++ Makefile.in	2008-01-02 14:41:21.000000000 +0200
+@@ -431,14 +431,6 @@
+ ## commands to set make variables.
  install-arch-indep: mkdir info
  	-set ${COPYDESTS} ; \
 -	unset CDPATH; \
@@ -15,7 +15,7 @@
  	mkdir ${COPYDESTS} ; \
  	chmod ugo+rx ${COPYDESTS} ; \
  	unset CDPATH; \
-@@ -503,9 +495,9 @@
+@@ -547,9 +539,9 @@
  	   fi; \
  	   cd ${srcdir}/info ; \
  	   for elt in $(INFO_FILES); do \
@@ -28,7 +28,7 @@
  	      done; \
  	   done); \
  	else true; fi
-@@ -515,7 +507,7 @@
+@@ -559,7 +551,7 @@
  	then \
  	  for elt in $(INFO_FILES); do \
  	    (cd $${thisdir}; \
@@ -36,4 +36,4 @@
 +	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt.info); \
  	  done; \
  	else true; fi
- 	-chmod -R a+r $(DESTDIR)${datadir}/emacs ${COPYDESTS} $(DESTDIR)${infodir}
+ 	-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir}
diff --git a/editors/emacs-devel/files/patch-doc-emacs-Makefile.in b/editors/emacs-devel/files/patch-doc-emacs-Makefile.in
new file mode 100644
index 000000000000..fdc3143e2946
--- /dev/null
+++ b/editors/emacs-devel/files/patch-doc-emacs-Makefile.in
@@ -0,0 +1,20 @@
+--- doc/emacs/Makefile.in.orig	2008-01-02 14:45:46.000000000 +0200
++++ doc/emacs/Makefile.in	2008-01-02 14:41:21.000000000 +0200
+@@ -35,7 +35,7 @@
+ 
+ # The makeinfo program is part of the Texinfo distribution.
+ # Use --force so that it generates output even if there are errors.
+-MAKEINFO = makeinfo --force
++MAKEINFO = makeinfo --force --no-split
+ 
+ INFO_TARGETS = $(infodir)/emacs
+ DVI_TARGETS  = emacs.dvi
+@@ -146,7 +146,7 @@
+ #	rm -f Makefile
+ 
+ maintainer-clean: distclean
+-	for file in $(INFO_TARGETS); do rm -f $${file}*; done
++	for file in $(INFO_TARGETS); do rm -f $${file}; done
+ 
+ 
+ # Formerly this directory had texindex.c and getopt.c in it
diff --git a/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in b/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in
new file mode 100644
index 000000000000..5967ba7b1cf8
--- /dev/null
+++ b/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in
@@ -0,0 +1,19 @@
+--- doc/lispintro/Makefile.in.orig	2008-01-02 14:45:47.000000000 +0200
++++ doc/lispintro/Makefile.in	2008-01-02 14:41:21.000000000 +0200
+@@ -34,7 +34,7 @@
+ INFO_TARGETS = ${infodir}/eintr
+ DVI_TARGETS = emacs-lisp-intro.dvi
+ 
+-MAKEINFO = makeinfo
++MAKEINFO = makeinfo --no-split
+ TEXI2DVI = texi2dvi
+ DVIPS = dvips
+ 
+@@ -66,7 +66,6 @@
+ 
+ maintainer-clean: distclean
+ 	rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
+-	cd $(infodir); rm -f eintr eintr-[1-9]
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/editors/emacs-devel/files/patch-lispref-Makefile.in b/editors/emacs-devel/files/patch-doc-lispref-Makefile.in
index cfd8699c6512..8e2727408c7d 100644
--- a/editors/emacs-devel/files/patch-lispref-Makefile.in
+++ b/editors/emacs-devel/files/patch-doc-lispref-Makefile.in
@@ -1,6 +1,6 @@
---- ./lispref/Makefile.in.orig	Mon Aug 21 08:22:22 2006
-+++ ./lispref/Makefile.in	Fri Sep  1 21:10:08 2006
-@@ -32,7 +32,7 @@
+--- doc/lispref/Makefile.in.orig	2008-01-02 14:45:47.000000000 +0200
++++ doc/lispref/Makefile.in	2008-01-02 14:41:21.000000000 +0200
+@@ -33,7 +33,7 @@
  TEXI2DVI = texi2dvi
  SHELL = /bin/sh
  INSTALL_INFO = install-info
@@ -9,7 +9,7 @@
  
  # The name of the manual:
  VERSION=2.9
-@@ -109,7 +109,7 @@
+@@ -110,7 +110,7 @@
  # This is for use in a separate distro of the Emacs Lisp manual.
  install: elisp
  	$(srcdir)/mkinstalldirs $(infodir)
@@ -18,7 +18,7 @@
  	${INSTALL_INFO} --info-dir=${infodir} ${infodir}/elisp
  
  # This is for use in a separate distro of the Emacs Lisp manual.
-@@ -125,7 +125,7 @@
+@@ -126,7 +126,7 @@
  
  maintainer-clean: clean
  	rm -f elisp.dvi elisp.oaux
@@ -27,9 +27,9 @@
  
  dist: $(infodir)/elisp elisp.dvi
  	-rm -rf temp
-@@ -135,7 +135,7 @@
+@@ -136,7 +136,7 @@
   $(srcdir)/Makefile.in $(srcs) \
-  $(srcdir)/../man/texinfo.tex \
+  $(miscmanualdir)/texinfo.tex \
   elisp.dvi elisp.aux elisp.??s \
 - $(infodir)/elisp $(infodir)/elisp-[1-9] $(infodir)/elisp-[1-9][0-9] \
 + $(infodir)/elisp \
diff --git a/editors/emacs-devel/files/patch-doc-misc-Makefile.in b/editors/emacs-devel/files/patch-doc-misc-Makefile.in
new file mode 100644
index 000000000000..b03a8a0feb65
--- /dev/null
+++ b/editors/emacs-devel/files/patch-doc-misc-Makefile.in
@@ -0,0 +1,11 @@
+--- doc/misc/Makefile.in.orig	2008-01-02 14:45:47.000000000 +0200
++++ doc/misc/Makefile.in	2008-01-02 14:41:21.000000000 +0200
+@@ -36,7 +36,7 @@
+ 
+ # The makeinfo program is part of the Texinfo distribution.
+ # Use --force so that it generates output even if there are errors.
+-MAKEINFO = makeinfo --force
++MAKEINFO = makeinfo --force --no-split
+ 
+ INFO_TARGETS = \
+ 	$(infodir)/ada-mode \
diff --git a/editors/emacs-devel/files/patch-lispintro-Makefile.in b/editors/emacs-devel/files/patch-lispintro-Makefile.in
deleted file mode 100644
index eac664f21cda..000000000000
--- a/editors/emacs-devel/files/patch-lispintro-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lispintro/Makefile.in.orig	Mon Feb  6 01:05:17 2006
-+++ ./lispintro/Makefile.in	Fri Sep  1 21:10:08 2006
-@@ -33,7 +33,7 @@
- INFO_TARGETS = ${infodir}/eintr
- DVI_TARGETS = emacs-lisp-intro.dvi
- 
--MAKEINFO = makeinfo
-+MAKEINFO = makeinfo --no-split
- TEXI2DVI = texi2dvi
- DVIPS = dvips
- ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
diff --git a/editors/emacs-devel/files/patch-man-Makefile.in b/editors/emacs-devel/files/patch-man-Makefile.in
deleted file mode 100644
index 3c3ab4cb91ef..000000000000
--- a/editors/emacs-devel/files/patch-man-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./man/Makefile.in.orig	Sat May  6 18:54:21 2006
-+++ ./man/Makefile.in	Fri Sep  1 21:10:08 2006
-@@ -32,7 +32,7 @@
- 
- # The makeinfo program is part of the Texinfo distribution.
- # Use --force so that it generates output even if there are errors.
--MAKEINFO = makeinfo --force
-+MAKEINFO = makeinfo --force --no-split
- INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
- 	        ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
- 		../info/message ../info/sieve ../info/pgg ../info/emacs-mime \
diff --git a/editors/emacs-devel/files/patch-src__alloc.c b/editors/emacs-devel/files/patch-src__alloc.c
deleted file mode 100644
index b295275127d5..000000000000
--- a/editors/emacs-devel/files/patch-src__alloc.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./src/alloc.c.orig	Thu Aug 31 20:50:29 2006
-+++ ./src/alloc.c	Fri Sep  1 21:10:08 2006
-@@ -4560,7 +4560,11 @@
-      needed on ia64 too.  See mach_dep.c, where it also says inline
-      assembler doesn't work with relevant proprietary compilers.  */
- #ifdef sparc
-+#ifdef __sparc64__
-+  asm ("flushw");
-+#else
-   asm ("ta 3");
-+#endif
- #endif
- 
-   /* Save registers that we need to see on the stack.  We need to see
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index 50af4dc7dd6a..45b886c1e66b 100644
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@@ -17,8 +17,10 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/rcs2log
 libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/sorted-doc
 libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/update-game-score
 libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
+%%DATADIR%%/%%EMACS_VER%%/etc/AUTHORS
 %%DATADIR%%/%%EMACS_VER%%/etc/BABYL
 %%DATADIR%%/%%EMACS_VER%%/etc/CENSORSHIP
+%%DATADIR%%/%%EMACS_VER%%/etc/CONTRIBUTE
 %%DATADIR%%/%%EMACS_VER%%/etc/COOKIES
 %%DATADIR%%/%%EMACS_VER%%/etc/COPYING
 %%DATADIR%%/%%EMACS_VER%%/etc/DEBUG
@@ -46,6 +48,8 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.19
 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.20
 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.21
+%%DATADIR%%/%%EMACS_VER%%/etc/NEWS.22
+%%DATADIR%%/%%EMACS_VER%%/etc/NXML-NEWS
 %%DATADIR%%/%%EMACS_VER%%/etc/ORDERS
 %%DATADIR%%/%%EMACS_VER%%/etc/PROBLEMS
 %%DATADIR%%/%%EMACS_VER%%/etc/README
@@ -53,70 +57,29 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/etc/TERMS
 %%DATADIR%%/%%EMACS_VER%%/etc/THE-GNU-PROJECT
 %%DATADIR%%/%%EMACS_VER%%/etc/TODO
-%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL
-%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.bg
-%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.cn
-%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.cs
-%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.de
-%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.eo
-%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.es
-%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.fr
-%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.it
-%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.ja
-%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.ko
-%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.nl
-%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.pl
-%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.pt_BR
-%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.ro
-%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.ru
-%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.sk
-%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.sl
-%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.sv
-%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.th
-%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.translators
-%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.zh
 %%DATADIR%%/%%EMACS_VER%%/etc/WHY-FREE
-%%DATADIR%%/%%EMACS_VER%%/etc/calccard.ps
-%%DATADIR%%/%%EMACS_VER%%/etc/calccard.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/celibacy.1
 %%DATADIR%%/%%EMACS_VER%%/etc/compilation.txt
 %%DATADIR%%/%%EMACS_VER%%/etc/condom.1
 %%DATADIR%%/%%EMACS_VER%%/etc/copying.paper
-%%DATADIR%%/%%EMACS_VER%%/etc/cs-dired-ref.ps
-%%DATADIR%%/%%EMACS_VER%%/etc/cs-dired-ref.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/cs-refcard.ps
-%%DATADIR%%/%%EMACS_VER%%/etc/cs-refcard.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/cs-survival.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/ctags.1
-%%DATADIR%%/%%EMACS_VER%%/etc/de-refcard.ps
-%%DATADIR%%/%%EMACS_VER%%/etc/de-refcard.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/dired-ref.ps
-%%DATADIR%%/%%EMACS_VER%%/etc/dired-ref.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/e/README
 %%DATADIR%%/%%EMACS_VER%%/etc/e/eterm-color
 %%DATADIR%%/%%EMACS_VER%%/etc/e/eterm-color.ti
 %%DATADIR%%/%%EMACS_VER%%/etc/echo.msg
 %%DATADIR%%/%%EMACS_VER%%/etc/edt-user.doc
 %%DATADIR%%/%%EMACS_VER%%/etc/emacs-buffer.gdb
-%%DATADIR%%/%%EMACS_VER%%/etc/emacs.1
 %%DATADIR%%/%%EMACS_VER%%/etc/emacs.bash
 %%DATADIR%%/%%EMACS_VER%%/etc/emacs.csh
+%%DATADIR%%/%%EMACS_VER%%/etc/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/emacs.icon
-%%DATADIR%%/%%EMACS_VER%%/etc/emacsclient.1
-%%DATADIR%%/%%EMACS_VER%%/etc/emacstool.1
+%%DATADIR%%/%%EMACS_VER%%/etc/emacs.py
+%%DATADIR%%/%%EMACS_VER%%/etc/emacs2.py
+%%DATADIR%%/%%EMACS_VER%%/etc/emacs3.py
 %%DATADIR%%/%%EMACS_VER%%/etc/enriched.doc
-%%DATADIR%%/%%EMACS_VER%%/etc/etags.1
-%%DATADIR%%/%%EMACS_VER%%/etc/fr-drdref.ps
-%%DATADIR%%/%%EMACS_VER%%/etc/fr-drdref.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/fr-refcard.ps
-%%DATADIR%%/%%EMACS_VER%%/etc/fr-refcard.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/fr-survival.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/future-bug
-%%DATADIR%%/%%EMACS_VER%%/etc/gnus-booklet.ps
-%%DATADIR%%/%%EMACS_VER%%/etc/gnus-logo.eps
-%%DATADIR%%/%%EMACS_VER%%/etc/gnus-refcard.ps
-%%DATADIR%%/%%EMACS_VER%%/etc/gnus-refcard.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/gnus-tut.txt
-%%DATADIR%%/%%EMACS_VER%%/etc/gnus.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/gnus/gnus-setup.ast
+%%DATADIR%%/%%EMACS_VER%%/etc/gnus/news-server.ast
 %%DATADIR%%/%%EMACS_VER%%/etc/grep.txt
 %%DATADIR%%/%%EMACS_VER%%/etc/images/README
 %%DATADIR%%/%%EMACS_VER%%/etc/images/attach.pbm
@@ -174,6 +137,7 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/unlock.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/fwd-arrow.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/fwd-arrow.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/README
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/catchup.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/catchup.xpm
@@ -202,6 +166,7 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/kill-group.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/mail-reply.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/mail-reply.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/mail-send.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/next-ur.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/next-ur.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/post.pbm
@@ -273,6 +238,12 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/etc/images/home.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/home.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/README
+%%DATADIR%%/%%EMACS_VER%%/etc/images/icons/emacs16_mac.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/icons/emacs24_mac.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/icons/emacs256_mac.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/icons/emacs32_mac.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/icons/emacs48_mac.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/icons/emacs512_mac.png
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/emacs_16.png
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/emacs_24.png
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/emacs_32.png
@@ -285,6 +256,8 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/etc/images/jump-to.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/left-arrow.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/left-arrow.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/letter.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/letter.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/lock-broken.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/lock-ok.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/lock.xpm
@@ -385,8 +358,36 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/forced.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/frown.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/frown.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grayscale/README
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grayscale/blink.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grayscale/braindamaged.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grayscale/cry.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grayscale/dead.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grayscale/evil.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grayscale/forced.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grayscale/frown.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grayscale/grin.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grayscale/indifferent.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grayscale/reverse-smile.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grayscale/sad.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grayscale/smile.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grayscale/wry.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grin.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/indifferent.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/medium/README
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/medium/blink.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/medium/braindamaged.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/medium/cry.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/medium/dead.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/medium/evil.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/medium/forced.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/medium/frown.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/medium/grin.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/medium/indifferent.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/medium/reverse-smile.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/medium/sad.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/medium/smile.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/medium/wry.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/sad.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/sad.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/smile.pbm
@@ -400,6 +401,47 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/etc/images/sort-row-ascending.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/spell.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/spell.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/splash.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/splash.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/splash8.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default/README
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default/close.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default/close.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default/empty.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default/empty.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default/end-guide.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default/end-guide.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default/guide.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default/guide.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default/handle.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default/handle.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default/leaf.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default/leaf.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default/no-guide.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default/no-guide.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default/no-handle.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default/no-handle.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default/open.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default/open.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/README
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/close.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/close.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/empty.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/empty.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/end-guide.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/end-guide.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/guide.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/guide.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/handle.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/handle.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/leaf.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/leaf.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/no-guide.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/no-guide.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/no-handle.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/no-handle.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/open.png
+%%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/open.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/undo.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/undo.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/up-arrow.pbm
@@ -409,75 +451,228 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/etc/images/zoom-in.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/zoom-out.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/zoom-out.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/letter.pbm
-%%DATADIR%%/%%EMACS_VER%%/etc/letter.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/ms-kermit
-%%DATADIR%%/%%EMACS_VER%%/etc/orgcard.ps
-%%DATADIR%%/%%EMACS_VER%%/etc/orgcard.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/pl-refcard.ps
-%%DATADIR%%/%%EMACS_VER%%/etc/pl-refcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00000-0007F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00080-000FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00100-0017F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00180-0024F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00250-002AF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/002B0-002FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00300-0036F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00370-003FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00400-004FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00500-0052F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00530-0058F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00590-005FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00600-006FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00700-0074F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00780-007BF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00900-0097F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00980-009FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00A00-00A7F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00A80-00AFF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00B00-00B7F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00B80-00BFF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00C00-00C7F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00C80-00CFF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00D00-00D7F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00D80-00DFF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00E00-00E7F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00E80-00EFF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00F00-00FFF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01000-0109F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/010A0-010FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01100-011FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01200-0137F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/013A0-013FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01400-0167F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01680-0169F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/016A0-016FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01700-0171F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01720-0173F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01740-0175F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01760-0177F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01780-017FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01800-018AF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01E00-01EFF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01F00-01FFF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02000-0206F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02070-0209F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/020A0-020CF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/020D0-020FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02100-0214F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02150-0218F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02190-021FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02200-022FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02300-023FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02400-0243F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02440-0245F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02460-024FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02500-0257F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02580-0259F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/025A0-025FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02600-026FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02700-027BF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/027C0-027EF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/027F0-027FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02800-028FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02900-0297F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02980-029FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02A00-02AFF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02E80-02EFF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02F00-02FDF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02FF0-02FFF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03000-0303F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03040-0309F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/030A0-030FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03100-0312F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03130-0318F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03190-0319F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/031A0-031BF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/031F0-031FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03200-032FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03300-033FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03400-04DBF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0A000-0A48F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0A490-0A4CF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FB00-0FB4F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FB50-0FDFF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FE00-0FE0F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FE20-0FE2F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FE30-0FE4F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FE50-0FE6F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FE70-0FEFF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FF00-0FFEF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FFF0-0FFFF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/10300-1032F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/10330-1034F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/10400-1044F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/1D000-1D0FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/1D100-1D1FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/1D400-1D7FF.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/E0000-E007F.el
+%%DATADIR%%/%%EMACS_VER%%/etc/nxml/README
 %%DATADIR%%/%%EMACS_VER%%/etc/ps-prin0.ps
 %%DATADIR%%/%%EMACS_VER%%/etc/ps-prin1.ps
-%%DATADIR%%/%%EMACS_VER%%/etc/pt-br-refcard.ps
-%%DATADIR%%/%%EMACS_VER%%/etc/pt-br-refcard.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcard.ps
-%%DATADIR%%/%%EMACS_VER%%/etc/refcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/Makefile
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/README
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/calccard.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/calccard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-dired-ref.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-dired-ref.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-refcard.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-refcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-survival.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/de-refcard.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/de-refcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/dired-ref.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/dired-ref.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-dired-ref.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-dired-ref.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-refcard.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-refcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-survival.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-booklet.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-logo.eps
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-logo.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-refcard.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-refcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/orgcard.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/orgcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/pdflayout.sty
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/pl-refcard.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/pl-refcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/pt-br-refcard.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/pt-br-refcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/refcard.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/refcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/ru-refcard.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/ru-refcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-dired-ref.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-dired-ref.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-refcard.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-refcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-survival.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/survival.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/vipcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/viperCard.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/rgb.txt
-%%DATADIR%%/%%EMACS_VER%%/etc/ru-refcard.ps
-%%DATADIR%%/%%EMACS_VER%%/etc/ru-refcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/calstbl.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/dbcalstbl.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/dbdyntbl.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/dbhier.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/dbnotn.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/dbpool.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/dbsoextbl.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/dbstart.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/docbk-dyntbl.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/docbk-soextbl.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/docbook.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/locate.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/rdfxml.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/relaxng.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/schemas.xml
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/soextbl.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-applet.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-attribs.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-base.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-bdo.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-bform.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-btable.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-csismap.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-datatypes.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-edit.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-events.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-form.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-frames.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-hypertext.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-iframe.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-image.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-inlstyle.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-legacy.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-link.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-lst.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-meta.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-nameident.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-object.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-param.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-pres.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-ruby.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-script.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-ssismap.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-struct.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-table.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-text.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-tgt.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml-xstyle.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xhtml.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/xslt.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/ses-example.ses
 %%DATADIR%%/%%EMACS_VER%%/etc/sex.6
-%%DATADIR%%/%%EMACS_VER%%/etc/sk-dired-ref.ps
-%%DATADIR%%/%%EMACS_VER%%/etc/sk-dired-ref.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/sk-refcard.ps
-%%DATADIR%%/%%EMACS_VER%%/etc/sk-refcard.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/sk-survival.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/splash.pbm
-%%DATADIR%%/%%EMACS_VER%%/etc/splash.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/splash8.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/spook.lines
-%%DATADIR%%/%%EMACS_VER%%/etc/survival.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/termcap.src
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/README
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/close.png
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/close.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/empty.png
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/empty.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/end-guide.png
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/end-guide.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/guide.png
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/guide.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/handle.png
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/handle.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/leaf.png
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/leaf.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/no-guide.png
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/no-guide.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/no-handle.png
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/no-handle.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/open.png
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/open.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/README
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/close.png
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/close.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/empty.png
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/empty.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/end-guide.png
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/end-guide.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/guide.png
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/guide.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/handle.png
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/handle.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/leaf.png
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/leaf.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/no-guide.png
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/no-guide.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/no-handle.png
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/no-handle.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/open.png
-%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/open.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/vipcard.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/viperCard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL
+%%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.bg
+%%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.cn
+%%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.cs
+%%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.de
+%%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.eo
+%%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.es
+%%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.fr
+%%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.it
+%%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.ja
+%%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.ko
+%%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.nl
+%%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.pl
+%%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.pt_BR
+%%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.ro
+%%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.ru
+%%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.sk
+%%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.sl
+%%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.sv
+%%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.th
+%%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.translators
+%%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.zh
 %%DATADIR%%/%%EMACS_VER%%/etc/yow.lines
 %%DATADIR%%/%%EMACS_VER%%/leim/ja-dic/ja-dic.el.gz
 %%DATADIR%%/%%EMACS_VER%%/leim/ja-dic/ja-dic.elc
@@ -635,6 +830,7 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/button.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/button.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/calc/README
+%%DATADIR%%/%%EMACS_VER%%/lisp/calc/README.prev
 %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-aent.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-aent.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-alg.el.gz
@@ -675,12 +871,16 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-map.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-math.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-math.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-menu.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-menu.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-misc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-misc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-mtx.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-mtx.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-nlfit.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-nlfit.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-poly.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-poly.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-prog.el.gz
@@ -834,6 +1034,8 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/disp-table.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/dnd.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/dnd.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/doc-view.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/doc-view.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/dos-fns.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/dos-fns.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/dos-vars.el.gz
@@ -884,6 +1086,8 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/authors.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/autoload.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/autoload.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/avl-tree.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/avl-tree.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/backquote.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/backquote.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/benchmark.el.gz
@@ -896,6 +1100,8 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/byte-run.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/bytecomp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/bytecomp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/check-declare.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/check-declare.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/checkdoc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/checkdoc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-compat.el.gz
@@ -904,6 +1110,7 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-extra.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-indent.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-indent.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-macs.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-macs.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-seq.el.gz
@@ -959,8 +1166,6 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lisp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lmenu.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lmenu.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lselect.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lselect.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lucid.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lucid.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/macroexp.el.gz
@@ -1099,8 +1304,6 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-netsplit.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-networks.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-networks.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-nicklist.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-nicklist.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-notify.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-notify.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-page.el.gz
@@ -1222,6 +1425,8 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/font-core.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/font-lock.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/font-lock.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/format-spec.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/format-spec.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/format.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/format.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/forms-d2.dat
@@ -1235,24 +1440,18 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/fringe.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/generic-x.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/generic-x.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/binhex.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/binhex.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/canlock.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/canlock.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/compface.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/compface.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/deuglify.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/deuglify.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/dig.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/dig.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/dns.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/dns.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/earcon.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/earcon.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/ecomplete.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/ecomplete.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/flow-fill.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/flow-fill.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/format-spec.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/format-spec.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gmm-utils.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gmm-utils.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-agent.el.gz
@@ -1265,6 +1464,8 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-audio.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-bcklg.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-bcklg.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-bookmark.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-bookmark.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-cache.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-cache.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-cite.el.gz
@@ -1289,8 +1490,6 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-ems.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-fun.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-fun.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-gl.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-gl.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-group.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-group.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-int.el.gz
@@ -1349,14 +1548,10 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-win.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/hex-util.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/hex-util.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/html2text.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/html2text.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/ietf-drums.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/ietf-drums.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/imap.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/imap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/legacy-gnus-agent.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/legacy-gnus-agent.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mail-parse.el.gz
@@ -1477,8 +1672,6 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2231.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/score-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/score-mode.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sha1.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sha1.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sieve-manage.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sieve-manage.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sieve-mode.el.gz
@@ -1493,14 +1686,14 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/spam-report.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/spam-stat.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/spam-stat.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/spam-wash.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/spam-wash.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/spam.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/spam.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/starttls.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/starttls.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/utf7.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/utf7.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/uudecode.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/uudecode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/webmail.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/webmail.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/yenc.el.gz
@@ -1517,6 +1710,8 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/help-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/help.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/help.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/hex-util.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/hex-util.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/hexl.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/hexl.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/hi-lock.el.gz
@@ -1631,6 +1826,8 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/utf-7.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/utf-8.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/utf-8.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/isearch-multi.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/isearch-multi.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/isearch.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/isearch.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/isearchb.el.gz
@@ -1729,6 +1926,8 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/ls-lisp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/macros.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/macros.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/binhex.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/binhex.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/blessmail.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/emacsbug.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/emacsbug.elc
@@ -1736,6 +1935,8 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/feedmail.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/footnote.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/footnote.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/hashcash.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/hashcash.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-extr.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-extr.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-hist.el.gz
@@ -1790,14 +1991,19 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/undigest.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/unrmail.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/unrmail.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/vms-pmail.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/vms-pmail.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/uudecode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/uudecode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/vms-pmail.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/makesum.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/makesum.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/man.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/man.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/master.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/master.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mb-depth.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mb-depth.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/md4.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/md4.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/menu-bar.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/menu-bar.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mh-e/mh-acros.el
@@ -1870,6 +2076,11 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/ange-ftp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/browse-url.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/browse-url.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/dbus.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/dig.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/dig.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.el.gz
@@ -1890,6 +2101,12 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ph.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/goto-addr.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/goto-addr.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/hmac-def.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/hmac-def.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/hmac-md5.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/hmac-md5.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/imap.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/imap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/ldap.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/ldap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/net-utils.el.gz
@@ -1898,6 +2115,8 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/netrc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/newsticker.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/newsticker.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/ntlm.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/ntlm.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/quickurl.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/quickurl.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/rcirc.el.gz
@@ -1906,22 +2125,38 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/rcompile.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/rlogin.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/rlogin.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl-cram.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl-cram.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl-digest.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl-digest.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl-ntlm.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl-ntlm.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/snmp-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/snmp-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/socks.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/socks.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/telnet.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/telnet.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tls.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tls.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-cache.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-cache.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-cmds.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-cmds.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-compat.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-compat.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-fish.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-fish.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-ftp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-ftp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-gw.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-gw.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-smb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-smb.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-util.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-util.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-uu.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-uu.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-vc.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-vc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/trampver.el.gz
@@ -1932,6 +2167,57 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/newcomment.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/novice.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/novice.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/TODO
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-enc.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-enc.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-glyph.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-glyph.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-maint.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-maint.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-ns.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-ns.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-outln.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-outln.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-parse.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-parse.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-rap.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-rap.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-uchnm.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-uchnm.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-util.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-util.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-cmpct.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-cmpct.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-dt.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-dt.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-loc.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-loc.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-maint.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-maint.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-match.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-match.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-nxml.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-nxml.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-parse.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-parse.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-pttrn.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-pttrn.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-uri.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-uri.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-util.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-util.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-valid.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-valid.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-xsd.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-xsd.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/test.invalid.xml
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/test.valid.xml
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/xmltok.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/xmltok.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/xsd-regexp.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/xsd-regexp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/auto-show.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/auto-show.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/awk-mode.el.gz
@@ -1955,6 +2241,8 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/keyswap.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lazy-lock.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lazy-lock.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lselect.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lselect.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mlsupport.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mlsupport.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/ooutline.el.gz
@@ -1973,10 +2261,6 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/scribe.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/scribe.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sun-curs.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sun-curs.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sun-fns.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sun-fns.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/swedish.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/swedish.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/uncompress.el.gz
@@ -1989,6 +2273,8 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/outline.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/paren.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/paren.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/password-cache.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/password-cache.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/patcomp.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/paths.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/pcmpl-cvs.el.gz
@@ -2032,6 +2318,8 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/blackbox.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/blackbox.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/bruce.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/play/bubbles.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/play/bubbles.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/cookie1.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/cookie1.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/decipher.el.gz
@@ -2222,6 +2510,8 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/prolog.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/ps-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/ps-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/python.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/python.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/scheme.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/scheme.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/sh-script.el.gz
@@ -2232,6 +2522,10 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/sql.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/tcl.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/tcl.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/vera-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/vera-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/verilog-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/verilog-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/vhdl-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/vhdl-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/which-func.el.gz
@@ -2286,6 +2580,8 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/server.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ses.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ses.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/sha1.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/sha1.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/shadowfile.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/shadowfile.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/shell.el.gz
@@ -2337,8 +2633,6 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/pc-win.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/rxvt.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/rxvt.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/sun-mouse.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/sun-mouse.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/sun.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/sun.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/sup-mouse.el.gz
@@ -2361,6 +2655,8 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/vt420.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/w32-win.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/w32-win.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/w32console.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/w32console.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/wyse50.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/x-win.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/x-win.elc
@@ -2372,10 +2668,14 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/artist.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/bib-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/bib-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/bibtex-style.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/bibtex-style.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/bibtex.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/bibtex.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/conf-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/conf-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/css-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/css-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/dns-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/dns-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/enriched.el.gz
@@ -2390,6 +2690,10 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/makeinfo.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/nroff-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/nroff-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org-export-latex.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org-export-latex.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org-publish.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org-publish.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/page-ext.el.gz
@@ -2430,6 +2734,8 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-vars.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/remember.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/remember.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/sgml-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/sgml-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/spell.el.gz
@@ -2540,12 +2846,20 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/userlock.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-arch.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-arch.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc-bzr.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc-bzr.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-cvs.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-cvs.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc-git.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc-git.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc-hg.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc-hg.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-hooks.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-hooks.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-mcvs.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-mcvs.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc-mtn.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/vc-mtn.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-rcs.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-rcs.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc-sccs.el.gz
@@ -2559,10 +2873,8 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
 %%DATADIR%%/%%EMACS_VER%%/lisp/version.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/view.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/view.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/vms-patch.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/vms-patch.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/vmsproc.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/vmsproc.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/vms-patch.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/vmsproc.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/vt-control.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/vt-control.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vt100-led.el.gz
@@ -2602,12 +2914,14 @@ var/games/emacs/tetris-scores
 @dirrm libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%
 @dirrm libexec/emacs/%%EMACS_VER%%
 @dirrm libexec/emacs
+@dirrm %%DATADIR%%/%%EMACS_VER%%/site-lisp
 @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/url
 @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes
 @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/term
 @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes
 @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/play
 @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/nxml
 @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/net
 @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/mh-e
 @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/mail
@@ -2624,9 +2938,15 @@ var/games/emacs/tetris-scores
 @dirrm %%DATADIR%%/%%EMACS_VER%%/leim/quail
 @dirrm %%DATADIR%%/%%EMACS_VER%%/leim/ja-dic
 @dirrm %%DATADIR%%/%%EMACS_VER%%/leim
-@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder
-@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default
-@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/tree-widget
+@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/tutorials
+@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/schema
+@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/refcards
+@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/nxml
+@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder
+@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/default
+@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget
+@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/medium
+@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grayscale
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/mail
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/low-color
@@ -2635,9 +2955,9 @@ var/games/emacs/tetris-scores
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images
+@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/gnus
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/e
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc
-@dirrm %%DATADIR%%/%%EMACS_VER%%/site-lisp
 @dirrm %%DATADIR%%/%%EMACS_VER%%
 @dirrmtry var/games/emacs
 @dirrmtry var/games