Update from 20140101 to 20150415(22).

     prev version: emacs24-24.3.50.20140101nb10
  current version: emacs25-25.0.50.2015041522
(upstream)
  Upstream changes are too many to list here. Year and
  3 month between them. But it includes (at least)
   - the changes from emacs24 to emacs25
     (This may require adding emacs25 on
     EMACS_VERSIONS_ACCEPTED in some packages)
(pkgsrc)
 - (Makefile.common) sequence now resembles (wip)/emacs-current/Makefile
 - (Makefile)
   Add missing send-pr.el setup (at /usr/share/gnats) in site-init.el
 - (files/site-init.el)
   Copied from editors/emacs24
 - Drop patch-ae:            "if [ $# == 0 ]; then"  ( == -> =)
        patch-configure.ac:  ksh bad substitution problem
        patch-src_image.c:   Fix build with giflib 5.1.
 - (options.mk)
   * configuration now resembles (wip)/emacs-current/options.mk
   * Add options xaw3d and xml (also in PKG_SUGGESTED_OPTIONS)
   * Correction typo on CONFIGURE_ARGS on --without-imagemagic(k)

10 files changed, 251 insertions, 211 deletions

diff --git a/editors/emacs-snapshot/Makefile b/editors/emacs-snapshot/Makefile
index 8318e06b5dd..ec5f7382dc4 100644
--- a/editors/emacs-snapshot/Makefile
+++ b/editors/emacs-snapshot/Makefile
@@ -1,7 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2015/04/25 14:20:41 tnn Exp $
-
-PKGREVISION=	10
-CONFLICTS+=	emacs${_EMACS_VERSION_MAJOR}-nox11-[0-9]*
+# $NetBSD: Makefile,v 1.58 2015/06/14 15:46:21 mef Exp $
 
 .include "../../editors/emacs-snapshot/Makefile.common"
 
diff --git a/editors/emacs-snapshot/Makefile.common b/editors/emacs-snapshot/Makefile.common
index 78ab3d999ab..5a21e30a0e1 100644
--- a/editors/emacs-snapshot/Makefile.common
+++ b/editors/emacs-snapshot/Makefile.common
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile.common,v 1.66 2014/10/05 16:41:06 wiz Exp $
+# $NetBSD: Makefile.common,v 1.67 2015/06/14 15:46:21 mef Exp $
 #
 # used by editors/emacs-snapshot/Makefile
 
-DISTNAME=	emacs-snapshot_20140101.orig
-SNAPDATE=	${DISTNAME:S/emacs-snapshot_//:S/.orig//}
+.include	"../../editors/emacs-snapshot/version.mk"
+DISTNAME=	emacs-snapshot_2015041522+17a8618dc7396ef485c38b4b7c37c591839b3ec5.orig
+SNAPDATE=	${DISTNAME:C/.*_(20[0-9]+)\+.*/\1/}
 PKGNAME=	emacs${_EMACS_VERSION_MAJOR}-${EMACS_VERSION}.${SNAPDATE}
 CATEGORIES=	editors
-MASTER_SITES=	http://emacs.naquadah.org/unstable/
+MASTER_SITES=	http://londo.ganneff.de/pool/main/e/emacs-snapshot/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	minskim@NetBSD.org
@@ -14,33 +15,28 @@ HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
 COMMENT=	GNU editing macros (development version)
 LICENSE=	gnu-gpl-v3
 
-SETGIDGAME=		yes
-MAKE_JOBS_SAFE=		no
+USE_TOOLS+=	autoconf automake gmake gzip makeinfo
+AUTOCONF_REQD=	2.65
 
 CONFLICTS+=	emacs-nox11-[0-9]*
+SETGIDGAME=	yes
+MAKE_JOBS_SAFE=	no
 
-GNU_CONFIGURE=	yes
-INFO_FILES=	yes
-USE_TOOLS+=	automake autoconf gmake makeinfo gzip
+GNU_CONFIGURE=		yes
+INFO_FILES=		yes
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/:S/.orig//}
 
-AUTOCONF_REQUIRED=	 2.6.5
-CONFIGURE_ARGS+=	--srcdir=${WRKSRC}
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
-CONFIGURE_ARGS+=	--with-gameuser=${GAMEOWN}
+CONFIGURE_ARGS+=	--srcdir=${WRKSRC:Q}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--with-gameuser=${GAMEOWN:Q}
 
+BUILD_TARGET=		bootstrap
 BUILD_DEFS+=		VARBASE
 BUILD_DEFS+=		GAMES_USER GAMES_GROUP GAMEDATAMODE
-PLIST_SRC+=		../../editors/emacs-snapshot/PLIST
-
-.include "../../editors/emacs-snapshot/version.mk"
-
-BUILD_TARGET=		bootstrap
-EMACS_VERSION=		${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}.${_EMACS_VERSION_MICRO}
+PLIST_SRC+=		PLIST
 PLIST_SUBST+=		EMACS_VERSION=${EMACS_VERSION}
 
-REPLACE_PERL=		lib-src/grep-changelog
-CHECK_INTERPRETER_SKIP=	bin/grep-changelog
+EMACS_VERSION=		${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}.${_EMACS_VERSION_MICRO}
 
 MAKE_DIRS_PERMS+=	${VARBASE}/games/emacs ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
 CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/snake-scores \
@@ -49,6 +45,9 @@ CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/tetris-scores \
 			${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
 SPECIAL_PERMS+=		libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/update-game-score ${SETGID_GAMES_PERMS}
 
+REPLACE_PERL=		lib-src/grep-changelog
+CHECK_INTERPRETER_SKIP=	bin/grep-changelog
+
 # build PATH in the dumped emacs is not a problem
 CHECK_WRKREF_SKIP+=	bin/emacs
 CHECK_WRKREF_SKIP+=	bin/emacs-${EMACS_VERSION}
@@ -75,6 +74,8 @@ post-extract:
 	cp ${.CURDIR}/../../editors/emacs23/files/site-init.el ${WRKSRC}/lisp
 	cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
 	${CHMOD} -R go-w ${WRKSRC}
+	# set auto-load for send-pr library
+	cp ${FILESDIR}/site-init.el ${WRKSRC}/lisp
 
 pre-configure:
 	cd ${WRKSRC} && ./autogen.sh
diff --git a/editors/emacs-snapshot/PLIST b/editors/emacs-snapshot/PLIST
index 113b498d02e..39b7e67a336 100644
--- a/editors/emacs-snapshot/PLIST
+++ b/editors/emacs-snapshot/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.36 2014/01/10 02:11:28 minskim Exp $
+@comment $NetBSD: PLIST,v 1.37 2015/06/14 15:46:21 mef Exp $
 bin/ctags
 bin/ebrowse
 bin/emacs
 bin/emacs-${EMACS_VERSION}
 bin/emacsclient
 bin/etags
-bin/grep-changelog
 info/ada-mode.info.gz
 info/auth.info.gz
 info/autotype.info.gz
@@ -31,6 +30,7 @@ info/erc.info.gz
 info/ert.info.gz
 info/eshell.info.gz
 info/eudc.info.gz
+info/eww.info.gz
 info/flymake.info.gz
 info/forms.info.gz
 info/gnus.info.gz
@@ -61,6 +61,7 @@ info/srecode.info.gz
 info/todo-mode.info.gz
 info/tramp.info.gz
 info/url.info.gz
+info/vhdl-mode.info.gz
 info/vip.info.gz
 info/viper.info.gz
 info/widget.info.gz
@@ -76,13 +77,11 @@ man/man1/ebrowse.1
 man/man1/emacs.1
 man/man1/emacsclient.1
 man/man1/etags.1
-man/man1/grep-changelog.1
+share/appdata/emacs.appdata.xml
 share/applications/emacs.desktop
 share/emacs/${EMACS_VERSION}/etc/AUTHORS
 share/emacs/${EMACS_VERSION}/etc/CALC-NEWS
 share/emacs/${EMACS_VERSION}/etc/CENSORSHIP
-share/emacs/${EMACS_VERSION}/etc/CONTRIBUTE
-share/emacs/${EMACS_VERSION}/etc/COOKIES
 share/emacs/${EMACS_VERSION}/etc/COPYING
 share/emacs/${EMACS_VERSION}/etc/DEBUG
 share/emacs/${EMACS_VERSION}/etc/DEVEL.HUMOR
@@ -95,14 +94,11 @@ share/emacs/${EMACS_VERSION}/etc/FTP
 share/emacs/${EMACS_VERSION}/etc/GNU
 share/emacs/${EMACS_VERSION}/etc/GNUS-NEWS
 share/emacs/${EMACS_VERSION}/etc/HELLO
-share/emacs/${EMACS_VERSION}/etc/INTERVIEW
 share/emacs/${EMACS_VERSION}/etc/JOKES
 share/emacs/${EMACS_VERSION}/etc/LINUX-GNU
 share/emacs/${EMACS_VERSION}/etc/MACHINES
-share/emacs/${EMACS_VERSION}/etc/MAILINGLISTS
 share/emacs/${EMACS_VERSION}/etc/MH-E-NEWS
 share/emacs/${EMACS_VERSION}/etc/MORE.STUFF
-share/emacs/${EMACS_VERSION}/etc/MOTIVATION
 share/emacs/${EMACS_VERSION}/etc/NEWS
 share/emacs/${EMACS_VERSION}/etc/NEWS.1-17
 share/emacs/${EMACS_VERSION}/etc/NEWS.18
@@ -111,18 +107,17 @@ share/emacs/${EMACS_VERSION}/etc/NEWS.20
 share/emacs/${EMACS_VERSION}/etc/NEWS.21
 share/emacs/${EMACS_VERSION}/etc/NEWS.22
 share/emacs/${EMACS_VERSION}/etc/NEWS.23
+share/emacs/${EMACS_VERSION}/etc/NEWS.24
 share/emacs/${EMACS_VERSION}/etc/NEXTSTEP
 share/emacs/${EMACS_VERSION}/etc/NXML-NEWS
 share/emacs/${EMACS_VERSION}/etc/ORDERS
 share/emacs/${EMACS_VERSION}/etc/ORG-NEWS
 share/emacs/${EMACS_VERSION}/etc/PROBLEMS
 share/emacs/${EMACS_VERSION}/etc/README
-share/emacs/${EMACS_VERSION}/etc/SERVICE
 share/emacs/${EMACS_VERSION}/etc/TERMS
 share/emacs/${EMACS_VERSION}/etc/THE-GNU-PROJECT
 share/emacs/${EMACS_VERSION}/etc/TODO
 share/emacs/${EMACS_VERSION}/etc/WHY-FREE
-share/emacs/${EMACS_VERSION}/etc/celibacy.1
 share/emacs/${EMACS_VERSION}/etc/charsets/8859-10.map
 share/emacs/${EMACS_VERSION}/etc/charsets/8859-11.map
 share/emacs/${EMACS_VERSION}/etc/charsets/8859-13.map
@@ -256,14 +251,12 @@ share/emacs/${EMACS_VERSION}/etc/charsets/VSCII.map
 share/emacs/${EMACS_VERSION}/etc/charsets/stdenc.map
 share/emacs/${EMACS_VERSION}/etc/charsets/symbol.map
 share/emacs/${EMACS_VERSION}/etc/compilation.txt
-share/emacs/${EMACS_VERSION}/etc/condom.1
-share/emacs/${EMACS_VERSION}/etc/copying.paper
 share/emacs/${EMACS_VERSION}/etc/e/README
 share/emacs/${EMACS_VERSION}/etc/e/eterm-color
 share/emacs/${EMACS_VERSION}/etc/e/eterm-color.ti
-share/emacs/${EMACS_VERSION}/etc/echo.msg
 share/emacs/${EMACS_VERSION}/etc/edt-user.el
 share/emacs/${EMACS_VERSION}/etc/emacs-buffer.gdb
+share/emacs/${EMACS_VERSION}/etc/emacs.appdata.xml
 share/emacs/${EMACS_VERSION}/etc/emacs.desktop
 share/emacs/${EMACS_VERSION}/etc/emacs.icon
 share/emacs/${EMACS_VERSION}/etc/enriched.txt
@@ -453,14 +446,48 @@ share/emacs/${EMACS_VERSION}/etc/images/help.xpm
 share/emacs/${EMACS_VERSION}/etc/images/home.pbm
 share/emacs/${EMACS_VERSION}/etc/images/home.xpm
 share/emacs/${EMACS_VERSION}/etc/images/icons/README
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/closed.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/closed.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/empty.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/empty.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/end-connector.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/end-connector.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/extender-connector.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/extender-connector.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/leaf.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/leaf.xpm
 share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/locked-encrypted.png
 share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/locked-encrypted.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/mid-connector.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/mid-connector.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/opened.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/opened.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/skip-descender.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/skip-descender.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/through-descender.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/through-descender.xpm
 share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/unlocked-encrypted.png
 share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/unlocked-encrypted.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/closed.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/closed.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/empty.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/empty.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/end-connector.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/end-connector.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/extender-connector.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/extender-connector.xpm
 share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/leaf.png
 share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/leaf.xpm
 share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png
 share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/locked-encrypted.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/mid-connector.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/mid-connector.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/opened.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/opened.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/skip-descender.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/skip-descender.xpm
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/through-descender.png
+share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/through-descender.xpm
 share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png
 share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.xpm
 share/emacs/${EMACS_VERSION}/etc/images/icons/hicolor/128x128/apps/emacs.png
@@ -563,6 +590,8 @@ share/emacs/${EMACS_VERSION}/etc/images/newsticker/next-feed.xpm
 share/emacs/${EMACS_VERSION}/etc/images/newsticker/next-item.xpm
 share/emacs/${EMACS_VERSION}/etc/images/newsticker/prev-feed.xpm
 share/emacs/${EMACS_VERSION}/etc/images/newsticker/prev-item.xpm
+share/emacs/${EMACS_VERSION}/etc/images/newsticker/rss-feed.png
+share/emacs/${EMACS_VERSION}/etc/images/newsticker/rss-feed.svg
 share/emacs/${EMACS_VERSION}/etc/images/newsticker/update.xpm
 share/emacs/${EMACS_VERSION}/etc/images/next-node.pbm
 share/emacs/${EMACS_VERSION}/etc/images/next-node.xpm
@@ -804,9 +833,10 @@ share/emacs/${EMACS_VERSION}/etc/nxml/test-valid.xml
 share/emacs/${EMACS_VERSION}/etc/org/OrgOdtContentTemplate.xml
 share/emacs/${EMACS_VERSION}/etc/org/OrgOdtStyles.xml
 share/emacs/${EMACS_VERSION}/etc/org/README
+share/emacs/${EMACS_VERSION}/etc/package-keyring.gpg
 share/emacs/${EMACS_VERSION}/etc/ps-prin0.ps
 share/emacs/${EMACS_VERSION}/etc/ps-prin1.ps
-share/emacs/${EMACS_VERSION}/etc/publicsuffix.txt
+share/emacs/${EMACS_VERSION}/etc/publicsuffix.txt.gz
 share/emacs/${EMACS_VERSION}/etc/refcards/Makefile
 share/emacs/${EMACS_VERSION}/etc/refcards/README
 share/emacs/${EMACS_VERSION}/etc/refcards/calccard.tex
@@ -816,6 +846,7 @@ share/emacs/${EMACS_VERSION}/etc/refcards/cs-survival.tex
 share/emacs/${EMACS_VERSION}/etc/refcards/de-refcard.tex
 share/emacs/${EMACS_VERSION}/etc/refcards/dired-ref.tex
 share/emacs/${EMACS_VERSION}/etc/refcards/emacsver.tex
+share/emacs/${EMACS_VERSION}/etc/refcards/emacsver.tex.in
 share/emacs/${EMACS_VERSION}/etc/refcards/fr-dired-ref.tex
 share/emacs/${EMACS_VERSION}/etc/refcards/fr-refcard.tex
 share/emacs/${EMACS_VERSION}/etc/refcards/fr-survival.tex
@@ -882,7 +913,6 @@ share/emacs/${EMACS_VERSION}/etc/schema/xhtml-xstyle.rnc
 share/emacs/${EMACS_VERSION}/etc/schema/xhtml.rnc
 share/emacs/${EMACS_VERSION}/etc/schema/xslt.rnc
 share/emacs/${EMACS_VERSION}/etc/ses-example.ses
-share/emacs/${EMACS_VERSION}/etc/sex.6
 share/emacs/${EMACS_VERSION}/etc/spook.lines
 share/emacs/${EMACS_VERSION}/etc/srecode/c.srt
 share/emacs/${EMACS_VERSION}/etc/srecode/cpp.srt
@@ -1146,10 +1176,14 @@ share/emacs/${EMACS_VERSION}/lisp/cedet/ede/autoconf-edit.el.gz
 share/emacs/${EMACS_VERSION}/lisp/cedet/ede/autoconf-edit.elc
 share/emacs/${EMACS_VERSION}/lisp/cedet/ede/base.el.gz
 share/emacs/${EMACS_VERSION}/lisp/cedet/ede/base.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/config.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/config.elc
 share/emacs/${EMACS_VERSION}/lisp/cedet/ede/cpp-root.el.gz
 share/emacs/${EMACS_VERSION}/lisp/cedet/ede/cpp-root.elc
 share/emacs/${EMACS_VERSION}/lisp/cedet/ede/custom.el.gz
 share/emacs/${EMACS_VERSION}/lisp/cedet/ede/custom.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/detect.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/detect.elc
 share/emacs/${EMACS_VERSION}/lisp/cedet/ede/dired.el.gz
 share/emacs/${EMACS_VERSION}/lisp/cedet/ede/dired.elc
 share/emacs/${EMACS_VERSION}/lisp/cedet/ede/emacs.el.gz
@@ -1480,6 +1514,8 @@ share/emacs/${EMACS_VERSION}/lisp/dnd.el.gz
 share/emacs/${EMACS_VERSION}/lisp/dnd.elc
 share/emacs/${EMACS_VERSION}/lisp/doc-view.el.gz
 share/emacs/${EMACS_VERSION}/lisp/doc-view.elc
+share/emacs/${EMACS_VERSION}/lisp/dom.el.gz
+share/emacs/${EMACS_VERSION}/lisp/dom.elc
 share/emacs/${EMACS_VERSION}/lisp/dos-fns.el.gz
 share/emacs/${EMACS_VERSION}/lisp/dos-fns.elc
 share/emacs/${EMACS_VERSION}/lisp/dos-vars.el.gz
@@ -1506,8 +1542,6 @@ share/emacs/${EMACS_VERSION}/lisp/elide-head.el.gz
 share/emacs/${EMACS_VERSION}/lisp/elide-head.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/advice.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/advice.elc
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/authors.el.gz
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/authors.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/autoload.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/autoload.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/avl-tree.el.gz
@@ -1534,6 +1568,8 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/checkdoc.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/checkdoc.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-extra.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-extra.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-generic.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-generic.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-indent.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-indent.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-lib.el.gz
@@ -1541,6 +1577,8 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-lib.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-loaddefs.el
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-macs.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-macs.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-preloaded.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-preloaded.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-seq.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-seq.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl.el.gz
@@ -1549,6 +1587,8 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/copyright.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/copyright.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/crm.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/crm.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cursor-sensor.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cursor-sensor.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/debug.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/debug.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/derived.el.gz
@@ -1563,6 +1603,8 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/edebug.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/edebug.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-base.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-base.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-compat.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-compat.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-core.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-core.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-custom.el.gz
@@ -1589,18 +1631,18 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/ewoc.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/ewoc.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/find-func.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/find-func.elc
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/find-gc.el.gz
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/find-gc.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/float-sup.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/float-sup.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/generator.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/generator.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/generic.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/generic.elc
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/gulp.el.gz
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/gulp.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/gv.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/gv.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/helper.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/helper.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/inline.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/inline.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lisp-mnt.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lisp-mnt.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lisp-mode.el.gz
@@ -1631,6 +1673,8 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/ring.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/ring.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/rx.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/rx.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/seq.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/seq.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/shadow.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/shadow.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/smie.el.gz
@@ -1659,8 +1703,6 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/warnings.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/warnings.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lock.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lock.elc
-share/emacs/${EMACS_VERSION}/lisp/emulation/crisp.el.gz
-share/emacs/${EMACS_VERSION}/lisp/emulation/crisp.elc
 share/emacs/${EMACS_VERSION}/lisp/emulation/cua-base.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emulation/cua-base.elc
 share/emacs/${EMACS_VERSION}/lisp/emulation/cua-gmrk.el.gz
@@ -1679,16 +1721,6 @@ share/emacs/${EMACS_VERSION}/lisp/emulation/edt.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emulation/edt.elc
 share/emacs/${EMACS_VERSION}/lisp/emulation/keypad.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emulation/keypad.elc
-share/emacs/${EMACS_VERSION}/lisp/emulation/tpu-edt.el.gz
-share/emacs/${EMACS_VERSION}/lisp/emulation/tpu-edt.elc
-share/emacs/${EMACS_VERSION}/lisp/emulation/tpu-extras.el.gz
-share/emacs/${EMACS_VERSION}/lisp/emulation/tpu-extras.elc
-share/emacs/${EMACS_VERSION}/lisp/emulation/tpu-mapper.el.gz
-share/emacs/${EMACS_VERSION}/lisp/emulation/tpu-mapper.elc
-share/emacs/${EMACS_VERSION}/lisp/emulation/vi.el.gz
-share/emacs/${EMACS_VERSION}/lisp/emulation/vi.elc
-share/emacs/${EMACS_VERSION}/lisp/emulation/vip.el.gz
-share/emacs/${EMACS_VERSION}/lisp/emulation/vip.elc
 share/emacs/${EMACS_VERSION}/lisp/emulation/viper-cmd.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emulation/viper-cmd.elc
 share/emacs/${EMACS_VERSION}/lisp/emulation/viper-ex.el.gz
@@ -1705,8 +1737,6 @@ share/emacs/${EMACS_VERSION}/lisp/emulation/viper-util.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emulation/viper-util.elc
 share/emacs/${EMACS_VERSION}/lisp/emulation/viper.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emulation/viper.elc
-share/emacs/${EMACS_VERSION}/lisp/emulation/ws-mode.el.gz
-share/emacs/${EMACS_VERSION}/lisp/emulation/ws-mode.elc
 share/emacs/${EMACS_VERSION}/lisp/env.el.gz
 share/emacs/${EMACS_VERSION}/lisp/env.elc
 share/emacs/${EMACS_VERSION}/lisp/epa-dired.el.gz
@@ -1936,6 +1966,8 @@ share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-cache.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-cache.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-cite.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-cite.elc
+share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-cloud.el.gz
+share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-cloud.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-cus.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-cus.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-delay.el.gz
@@ -1990,8 +2022,6 @@ share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-salt.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-salt.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-score.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-score.elc
-share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-setup.el.gz
-share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-setup.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-sieve.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-sieve.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-spec.el.gz
@@ -2136,8 +2166,6 @@ share/emacs/${EMACS_VERSION}/lisp/gnus/rfc2045.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/rfc2045.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/rfc2047.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/rfc2047.elc
-share/emacs/${EMACS_VERSION}/lisp/gnus/rfc2104.el.gz
-share/emacs/${EMACS_VERSION}/lisp/gnus/rfc2104.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/rfc2231.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/rfc2231.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/rtree.el.gz
@@ -2281,6 +2309,7 @@ share/emacs/${EMACS_VERSION}/lisp/international/titdic-cnv.elc
 share/emacs/${EMACS_VERSION}/lisp/international/ucs-normalize.el.gz
 share/emacs/${EMACS_VERSION}/lisp/international/ucs-normalize.elc
 share/emacs/${EMACS_VERSION}/lisp/international/uni-bidi.el
+share/emacs/${EMACS_VERSION}/lisp/international/uni-brackets.el
 share/emacs/${EMACS_VERSION}/lisp/international/uni-category.el
 share/emacs/${EMACS_VERSION}/lisp/international/uni-combining.el
 share/emacs/${EMACS_VERSION}/lisp/international/uni-comment.el
@@ -2300,8 +2329,6 @@ share/emacs/${EMACS_VERSION}/lisp/isearch.el.gz
 share/emacs/${EMACS_VERSION}/lisp/isearch.elc
 share/emacs/${EMACS_VERSION}/lisp/isearchb.el.gz
 share/emacs/${EMACS_VERSION}/lisp/isearchb.elc
-share/emacs/${EMACS_VERSION}/lisp/iswitchb.el.gz
-share/emacs/${EMACS_VERSION}/lisp/iswitchb.elc
 share/emacs/${EMACS_VERSION}/lisp/jit-lock.el.gz
 share/emacs/${EMACS_VERSION}/lisp/jit-lock.elc
 share/emacs/${EMACS_VERSION}/lisp/jka-cmpr-hook.el.gz
@@ -2512,6 +2539,8 @@ share/emacs/${EMACS_VERSION}/lisp/leim/quail/vnvni.el.gz
 share/emacs/${EMACS_VERSION}/lisp/leim/quail/vnvni.elc
 share/emacs/${EMACS_VERSION}/lisp/leim/quail/welsh.el.gz
 share/emacs/${EMACS_VERSION}/lisp/leim/quail/welsh.elc
+share/emacs/${EMACS_VERSION}/lisp/let-alist.el.gz
+share/emacs/${EMACS_VERSION}/lisp/let-alist.elc
 share/emacs/${EMACS_VERSION}/lisp/linum.el.gz
 share/emacs/${EMACS_VERSION}/lisp/linum.elc
 share/emacs/${EMACS_VERSION}/lisp/loaddefs.el
@@ -2737,12 +2766,16 @@ share/emacs/${EMACS_VERSION}/lisp/net/newst-treeview.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/newst-treeview.elc
 share/emacs/${EMACS_VERSION}/lisp/net/newsticker.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/newsticker.elc
+share/emacs/${EMACS_VERSION}/lisp/net/nsm.el.gz
+share/emacs/${EMACS_VERSION}/lisp/net/nsm.elc
 share/emacs/${EMACS_VERSION}/lisp/net/ntlm.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/ntlm.elc
 share/emacs/${EMACS_VERSION}/lisp/net/quickurl.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/quickurl.elc
 share/emacs/${EMACS_VERSION}/lisp/net/rcirc.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/rcirc.elc
+share/emacs/${EMACS_VERSION}/lisp/net/rfc2104.el.gz
+share/emacs/${EMACS_VERSION}/lisp/net/rfc2104.elc
 share/emacs/${EMACS_VERSION}/lisp/net/rlogin.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/rlogin.elc
 share/emacs/${EMACS_VERSION}/lisp/net/sasl-cram.el.gz
@@ -2751,6 +2784,8 @@ share/emacs/${EMACS_VERSION}/lisp/net/sasl-digest.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/sasl-digest.elc
 share/emacs/${EMACS_VERSION}/lisp/net/sasl-ntlm.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/sasl-ntlm.elc
+share/emacs/${EMACS_VERSION}/lisp/net/sasl-scram-rfc.el.gz
+share/emacs/${EMACS_VERSION}/lisp/net/sasl-scram-rfc.elc
 share/emacs/${EMACS_VERSION}/lisp/net/sasl.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/sasl.elc
 share/emacs/${EMACS_VERSION}/lisp/net/secrets.el.gz
@@ -2861,22 +2896,30 @@ share/emacs/${EMACS_VERSION}/lisp/obsolete/assoc.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/awk-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/awk-mode.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/bruce.el
+share/emacs/${EMACS_VERSION}/lisp/obsolete/cc-compat.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/cc-compat.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/cl-compat.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/cl-compat.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/complete.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/complete.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/crisp.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/crisp.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/cust-print.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/cust-print.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/erc-hecomplete.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/erc-hecomplete.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/fast-lock.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/fast-lock.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/gulp.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/gulp.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/iso-acc.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/iso-acc.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/iso-insert.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/iso-insert.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/iso-swed.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/iso-swed.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/iswitchb.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/iswitchb.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/keyswap.el
 share/emacs/${EMACS_VERSION}/lisp/obsolete/lazy-lock.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/lazy-lock.elc
@@ -2892,6 +2935,8 @@ share/emacs/${EMACS_VERSION}/lisp/obsolete/lucid.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/lucid.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/mailpost.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/mailpost.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/meese.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/meese.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/mouse-sel.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/mouse-sel.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/old-emacs-lock.el.gz
@@ -2939,8 +2984,22 @@ share/emacs/${EMACS_VERSION}/lisp/obsolete/sym-comp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/sym-comp.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/terminal.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/terminal.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/tpu-edt.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/tpu-edt.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/tpu-extras.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/tpu-extras.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/tpu-mapper.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/tpu-mapper.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/vc-arch.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/vc-arch.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/vc-mcvs.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/vc-mcvs.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/vi.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/vi.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/vip.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/vip.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/ws-mode.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/ws-mode.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/xesam.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/xesam.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/yow.el.gz
@@ -3208,8 +3267,6 @@ share/emacs/${EMACS_VERSION}/lisp/play/landmark.el.gz
 share/emacs/${EMACS_VERSION}/lisp/play/landmark.elc
 share/emacs/${EMACS_VERSION}/lisp/play/life.el.gz
 share/emacs/${EMACS_VERSION}/lisp/play/life.elc
-share/emacs/${EMACS_VERSION}/lisp/play/meese.el.gz
-share/emacs/${EMACS_VERSION}/lisp/play/meese.elc
 share/emacs/${EMACS_VERSION}/lisp/play/morse.el.gz
 share/emacs/${EMACS_VERSION}/lisp/play/morse.elc
 share/emacs/${EMACS_VERSION}/lisp/play/mpuz.el.gz
@@ -3252,8 +3309,6 @@ share/emacs/${EMACS_VERSION}/lisp/progmodes/bat-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/bat-mode.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/bug-reference.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/bug-reference.elc
-share/emacs/${EMACS_VERSION}/lisp/progmodes/cap-words.el.gz
-share/emacs/${EMACS_VERSION}/lisp/progmodes/cap-words.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-align.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-align.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-awk.el.gz
@@ -3262,8 +3317,6 @@ share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-bytecomp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-bytecomp.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-cmds.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-cmds.elc
-share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-compat.el.gz
-share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-compat.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-defs.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-defs.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-engine.el.gz
@@ -3314,6 +3367,8 @@ share/emacs/${EMACS_VERSION}/lisp/progmodes/ebnf2ps.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/ebnf2ps.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/ebrowse.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/ebrowse.elc
+share/emacs/${EMACS_VERSION}/lisp/progmodes/elisp-mode.el.gz
+share/emacs/${EMACS_VERSION}/lisp/progmodes/elisp-mode.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/etags.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/etags.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/executable.el.gz
@@ -3404,6 +3459,8 @@ share/emacs/${EMACS_VERSION}/lisp/progmodes/vhdl-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/vhdl-mode.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/which-func.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/which-func.elc
+share/emacs/${EMACS_VERSION}/lisp/progmodes/xref.el.gz
+share/emacs/${EMACS_VERSION}/lisp/progmodes/xref.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/xscheme.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/xscheme.elc
 share/emacs/${EMACS_VERSION}/lisp/ps-bdf.el.gz
@@ -3492,8 +3549,6 @@ share/emacs/${EMACS_VERSION}/lisp/term.elc
 share/emacs/${EMACS_VERSION}/lisp/term/AT386.el.gz
 share/emacs/${EMACS_VERSION}/lisp/term/AT386.elc
 share/emacs/${EMACS_VERSION}/lisp/term/README
-share/emacs/${EMACS_VERSION}/lisp/term/apollo.el.gz
-share/emacs/${EMACS_VERSION}/lisp/term/apollo.elc
 share/emacs/${EMACS_VERSION}/lisp/term/bobcat.el.gz
 share/emacs/${EMACS_VERSION}/lisp/term/bobcat.elc
 share/emacs/${EMACS_VERSION}/lisp/term/common-win.el.gz
@@ -3526,26 +3581,8 @@ share/emacs/${EMACS_VERSION}/lisp/term/tvi970.el.gz
 share/emacs/${EMACS_VERSION}/lisp/term/tvi970.elc
 share/emacs/${EMACS_VERSION}/lisp/term/vt100.el.gz
 share/emacs/${EMACS_VERSION}/lisp/term/vt100.elc
-share/emacs/${EMACS_VERSION}/lisp/term/vt102.el.gz
-share/emacs/${EMACS_VERSION}/lisp/term/vt102.elc
-share/emacs/${EMACS_VERSION}/lisp/term/vt125.el.gz
-share/emacs/${EMACS_VERSION}/lisp/term/vt125.elc
 share/emacs/${EMACS_VERSION}/lisp/term/vt200.el.gz
 share/emacs/${EMACS_VERSION}/lisp/term/vt200.elc
-share/emacs/${EMACS_VERSION}/lisp/term/vt201.el.gz
-share/emacs/${EMACS_VERSION}/lisp/term/vt201.elc
-share/emacs/${EMACS_VERSION}/lisp/term/vt220.el.gz
-share/emacs/${EMACS_VERSION}/lisp/term/vt220.elc
-share/emacs/${EMACS_VERSION}/lisp/term/vt240.el.gz
-share/emacs/${EMACS_VERSION}/lisp/term/vt240.elc
-share/emacs/${EMACS_VERSION}/lisp/term/vt300.el.gz
-share/emacs/${EMACS_VERSION}/lisp/term/vt300.elc
-share/emacs/${EMACS_VERSION}/lisp/term/vt320.el.gz
-share/emacs/${EMACS_VERSION}/lisp/term/vt320.elc
-share/emacs/${EMACS_VERSION}/lisp/term/vt400.el.gz
-share/emacs/${EMACS_VERSION}/lisp/term/vt400.elc
-share/emacs/${EMACS_VERSION}/lisp/term/vt420.el.gz
-share/emacs/${EMACS_VERSION}/lisp/term/vt420.elc
 share/emacs/${EMACS_VERSION}/lisp/term/w32-win.el.gz
 share/emacs/${EMACS_VERSION}/lisp/term/w32-win.elc
 share/emacs/${EMACS_VERSION}/lisp/term/w32console.el.gz
@@ -3726,6 +3763,8 @@ share/emacs/${EMACS_VERSION}/lisp/url/url-proxy.el.gz
 share/emacs/${EMACS_VERSION}/lisp/url/url-proxy.elc
 share/emacs/${EMACS_VERSION}/lisp/url/url-queue.el.gz
 share/emacs/${EMACS_VERSION}/lisp/url/url-queue.elc
+share/emacs/${EMACS_VERSION}/lisp/url/url-tramp.el.gz
+share/emacs/${EMACS_VERSION}/lisp/url/url-tramp.elc
 share/emacs/${EMACS_VERSION}/lisp/url/url-util.el.gz
 share/emacs/${EMACS_VERSION}/lisp/url/url-util.elc
 share/emacs/${EMACS_VERSION}/lisp/url/url-vars.el.gz
@@ -3786,8 +3825,6 @@ share/emacs/${EMACS_VERSION}/lisp/vc/smerge-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/vc/smerge-mode.elc
 share/emacs/${EMACS_VERSION}/lisp/vc/vc-annotate.el.gz
 share/emacs/${EMACS_VERSION}/lisp/vc/vc-annotate.elc
-share/emacs/${EMACS_VERSION}/lisp/vc/vc-arch.el.gz
-share/emacs/${EMACS_VERSION}/lisp/vc/vc-arch.elc
 share/emacs/${EMACS_VERSION}/lisp/vc/vc-bzr.el.gz
 share/emacs/${EMACS_VERSION}/lisp/vc/vc-bzr.elc
 share/emacs/${EMACS_VERSION}/lisp/vc/vc-cvs.el.gz
@@ -3798,6 +3835,8 @@ share/emacs/${EMACS_VERSION}/lisp/vc/vc-dir.el.gz
 share/emacs/${EMACS_VERSION}/lisp/vc/vc-dir.elc
 share/emacs/${EMACS_VERSION}/lisp/vc/vc-dispatcher.el.gz
 share/emacs/${EMACS_VERSION}/lisp/vc/vc-dispatcher.elc
+share/emacs/${EMACS_VERSION}/lisp/vc/vc-filewise.el.gz
+share/emacs/${EMACS_VERSION}/lisp/vc/vc-filewise.elc
 share/emacs/${EMACS_VERSION}/lisp/vc/vc-git.el.gz
 share/emacs/${EMACS_VERSION}/lisp/vc/vc-git.elc
 share/emacs/${EMACS_VERSION}/lisp/vc/vc-hg.el.gz
@@ -3810,6 +3849,8 @@ share/emacs/${EMACS_VERSION}/lisp/vc/vc-rcs.el.gz
 share/emacs/${EMACS_VERSION}/lisp/vc/vc-rcs.elc
 share/emacs/${EMACS_VERSION}/lisp/vc/vc-sccs.el.gz
 share/emacs/${EMACS_VERSION}/lisp/vc/vc-sccs.elc
+share/emacs/${EMACS_VERSION}/lisp/vc/vc-src.el.gz
+share/emacs/${EMACS_VERSION}/lisp/vc/vc-src.elc
 share/emacs/${EMACS_VERSION}/lisp/vc/vc-svn.el.gz
 share/emacs/${EMACS_VERSION}/lisp/vc/vc-svn.elc
 share/emacs/${EMACS_VERSION}/lisp/vc/vc.el.gz
@@ -3824,8 +3865,6 @@ share/emacs/${EMACS_VERSION}/lisp/vt-control.el.gz
 share/emacs/${EMACS_VERSION}/lisp/vt-control.elc
 share/emacs/${EMACS_VERSION}/lisp/vt100-led.el.gz
 share/emacs/${EMACS_VERSION}/lisp/vt100-led.elc
-share/emacs/${EMACS_VERSION}/lisp/w32-common-fns.el.gz
-share/emacs/${EMACS_VERSION}/lisp/w32-common-fns.elc
 share/emacs/${EMACS_VERSION}/lisp/w32-fns.el.gz
 share/emacs/${EMACS_VERSION}/lisp/w32-fns.elc
 share/emacs/${EMACS_VERSION}/lisp/w32-vars.el.gz
diff --git a/editors/emacs-snapshot/distinfo b/editors/emacs-snapshot/distinfo
index 739964605e7..0d4be5af7ac 100644
--- a/editors/emacs-snapshot/distinfo
+++ b/editors/emacs-snapshot/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.68 2015/04/14 03:39:49 mef Exp $
+$NetBSD: distinfo,v 1.69 2015/06/14 15:46:22 mef Exp $
 
-SHA1 (emacs-snapshot_20140101.orig.tar.xz) = b5241baa81e1ed8a694caf29aa11cd7602d60b61
-RMD160 (emacs-snapshot_20140101.orig.tar.xz) = 6bd8e699b7520612b1f4b731dff2654ed528c9d9
-Size (emacs-snapshot_20140101.orig.tar.xz) = 23162636 bytes
+SHA1 (emacs-snapshot_2015041522+17a8618dc7396ef485c38b4b7c37c591839b3ec5.orig.tar.xz) = c3b1cb7d8e0d320a0926ccbbad088d33bc906a4d
+RMD160 (emacs-snapshot_2015041522+17a8618dc7396ef485c38b4b7c37c591839b3ec5.orig.tar.xz) = a2853f1bf78eea16cc069b4021987b6702f1d58f
+Size (emacs-snapshot_2015041522+17a8618dc7396ef485c38b4b7c37c591839b3ec5.orig.tar.xz) = 23982000 bytes
 SHA1 (patch-ad) = 61769812ed721e8d881a954983bbdbba01537104
-SHA1 (patch-ae) = 2dfe31015550feeaa47955136d3bbe2aa6790095
 SHA1 (patch-ag) = e30b57d3536e31adbd5b0f0c91696de0de2c0f35
-SHA1 (patch-configure.ac) = c3c11fde7d781a539a8bf66363762c35ac83201d
-SHA1 (patch-src_image.c) = 4769e3df1e305495ed85af41faf87e1a40428c4e
 SHA1 (patch-src_process.c) = e3e9ae43f4bfa373e51eb3e6a1f864ebf1bbc308
diff --git a/editors/emacs-snapshot/files/site-init.el b/editors/emacs-snapshot/files/site-init.el
new file mode 100644
index 00000000000..2a87bd8d5b6
--- /dev/null
+++ b/editors/emacs-snapshot/files/site-init.el
@@ -0,0 +1,4 @@
+;; $NetBSD: site-init.el,v 1.1 2015/06/14 15:46:22 mef Exp $
+
+(autoload 'send-pr "/usr/share/gnats/send-pr.el" 
+  "Command to create and send a problem report." t)
diff --git a/editors/emacs-snapshot/options.mk b/editors/emacs-snapshot/options.mk
index 40e3bffe1ac..c371db0a9b6 100644
--- a/editors/emacs-snapshot/options.mk
+++ b/editors/emacs-snapshot/options.mk
@@ -1,16 +1,28 @@
-# $NetBSD: options.mk,v 1.9 2014/05/31 15:56:26 wiz Exp $
+# $NetBSD: options.mk,v 1.10 2015/06/14 15:46:22 mef Exp $
 #
 
+### Set options
 PKG_OPTIONS_VAR=	PKG_OPTIONS.emacs
-PKG_SUPPORTED_OPTIONS=	dbus gconf gnutls imagemagick svg xft2
+PKG_SUPPORTED_OPTIONS=	dbus gconf gnutls imagemagick svg xaw3d xft2 xml
+# xaw3d is only valid with tookit = xaw
+
 PKG_OPTIONS_OPTIONAL_GROUPS+= window-system
 PKG_OPTIONS_GROUP.window-system= x11 nextstep
+# tempted to have 'nox11' :-)
+
 PKG_OPTIONS_OPTIONAL_GROUPS+= toolkit
-PKG_OPTIONS_GROUP.toolkit= gtk motif xaw
-PKG_SUGGESTED_OPTIONS=	dbus gconf gnutls imagemagick svg x11 xaw xft2
+#  --with-x-toolkit=KIT    use an X toolkit (KIT one of: yes or gtk, gtk2,
+#                          gtk3, lucid or athena, motif, no)
+# gtk in next line implies gtk2, xaw = athena = lucid
+PKG_OPTIONS_GROUP.toolkit= gtk motif xaw lucid
+# gtk is default in the logic below (even not included in SUGGESTED_=
+# gconf, gtk and xft2 will be ingnored for nextstep even shown as selected.
+
+PKG_SUGGESTED_OPTIONS=	dbus gconf gnutls imagemagick svg xaw3d xft2 xml x11
 
 .include "../../mk/bsd.options.mk"
 
+### ---	 Check window-system independent options first
 ###
 ### Support D-BUS
 ###
@@ -21,12 +33,14 @@ CONFIGURE_ARGS+=	--without-dbus
 .  endif
 
 ###
-### Support gconf
+### Support XML2
 ###
-.  if !empty(PKG_OPTIONS:Mgconf) && empty(PKG_OPTIONS:Mnextstep)
-.include "../../devel/gconfmm/buildlink3.mk"
+.  if !empty(PKG_OPTIONS:Mxml)
+USE_TOOLS+=             pkg-config
+BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.17
+.include "../../textproc/libxml2/buildlink3.mk"
 .  else
-CONFIGURE_ARGS+=	--without-gconf
+CONFIGURE_ARGS+=        --without-xml2
 .  endif
 
 ###
@@ -44,57 +58,42 @@ CONFIGURE_ARGS+=	--without-gnutls
 .  if !empty(PKG_OPTIONS:Mimagemagick)
 .include "../../graphics/ImageMagick/buildlink3.mk"
 .  else
-CONFIGURE_ARGS+=	--without-imagemagic
+CONFIGURE_ARGS+=	--without-imagemagick
 .  endif
 
 ###
+### Check non nextstep (implies x11) options  ---------------------
+###
+### x11 is selected (as SUGGESTED above)
+###
+.if !empty(PKG_OPTIONS:Mx11)
+###
 ### Support SVG
 ###
-.  if !empty(PKG_OPTIONS:Msvg) && empty(PKG_OPTIONS:Mnextstep)
+.  if !empty(PKG_OPTIONS:Msvg)
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .  else
 CONFIGURE_ARGS+=	--without-rsvg
 .  endif
 
 ###
-### Any of the "toolkit" options with no window-system option implies "x11"
+### Support gconf
 ###
-.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mmotif) || !empty(PKG_OPTIONS:Mxaw) || !empty(PKG_OPTIONS:Mxft2)
-.  if empty(PKG_OPTIONS:Mx11) && empty(PKG_OPTIONS:Mnextstep)
-PKG_OPTIONS+=		x11
+.  if !empty(PKG_OPTIONS:Mgconf)
+.include "../../devel/gconfmm/buildlink3.mk"
+.  else
+CONFIGURE_ARGS+=	--without-gconf
 .  endif
-.endif
 
 ###
-### Default to using the GTK toolkit if none is specified.
+### Support Xaw3d (This is only valid with Lucid Toolkit)
 ###
-.if !empty(PKG_OPTIONS:Mx11)
-.  if empty(PKG_OPTIONS:Mgtk) && empty(PKG_OPTIONS:Mmotif) && empty(PKG_OPTIONS:Mxaw)
-PKG_OPTIONS+=		gtk
+.  if !empty(PKG_OPTIONS:Mxaw3d)
+.include "../../x11/Xaw3d/buildlink3.mk"
+.  else
+CONFIGURE_ARGS+=	--without-xaw3d
 .  endif
-.endif
-
-###
-### Support drawing pretty X11 widgets.
-###
-.if !empty(PKG_OPTIONS:Mx11)
-
-CONFIGURE_ARGS+=	--with-x
-CONFIGURE_ARGS+=	--with-xpm
-CONFIGURE_ARGS+=	--with-jpeg
-CONFIGURE_ARGS+=	--with-tiff
-CONFIGURE_ARGS+=	--with-gif
-CONFIGURE_ARGS+=	--with-png
-
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/giflib/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/libXrender/buildlink3.mk"
-
-###
 ### Enable font backend
 ###
 .  if !empty(PKG_OPTIONS:Mxft2)
@@ -104,47 +103,66 @@ CONFIGURE_ARGS+=	--with-png
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../devel/m17n-lib/buildlink3.mk"
 .  else
-CONFIGURE_ARGS+=	--without-xft --without-otf --without-m17n-flt
+CONFIGURE_ARGS+=	--without-xft --without-libotf --without-m17n-flt
 .  endif
 
 ###
-### Support using GTK X11 widgets.
+### Toolkit selection
 ###
-.  if !empty(PKG_OPTIONS:Mgtk)
+.  if (empty(PKG_OPTIONS:Mxaw) && empty(PKG_OPTIONS:Mlucid) &&  empty(PKG_OPTIONS:Mmotif))
+# defaults to gtk
 USE_TOOLS+=		pkg-config
 .include "../../x11/gtk2/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-x-toolkit=gtk
-
-###
-### Support using Motif X11 widgets.
-###
+.  elif !empty(PKG_OPTIONS:Mgtk)
+USE_TOOLS+=		pkg-config
+.include "../../x11/gtk2/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-x-toolkit=gtk
+.  elif !empty(PKG_OPTIONS:Mxaw)
+.include "../../mk/xaw.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-x-toolkit=athena
+.  elif !empty(PKG_OPTIONS:Mlucid)
+.include "../../mk/xaw.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-x-toolkit=athena
 .  elif !empty(PKG_OPTIONS:Mmotif)
 .include "../../mk/motif.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-x-toolkit=motif
+.  endif
 
 ###
-### Support using Xaw (Lucid) X11 widgets.
-###
-.  elif !empty(PKG_OPTIONS:Mxaw)
-.include "../../mk/xaw.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-x-toolkit=athena
-.  endif
+### End of Check non nextstep (implies x11) options  ---------------------
+
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
 
 ###
 ### Support using NextStep (Cocoa or GNUstep) windowing system
 ###
+#  If you check the variable system-configuration-options after Emacs is
+#  built, you may see many x11 related configurations. But if you have
+#  --without-x there, all other x11 related configurations were ignored.
+#
 .elif !empty(PKG_OPTIONS:Mnextstep)
 .  if exists(/System/Library/Frameworks/Cocoa.framework)
 APPLICATIONS_DIR=	Applications
+NS_APPBINDIR=		nextstep/Emacs.app/Contents/MacOS
 PLIST_SRC+=		PLIST.cocoa
 CHECK_WRKREF_SKIP+=	Applications/Emacs.app/Contents/MacOS/Emacs
 .  else
 .include "../../x11/gnustep-gui/buildlink3.mk"
 MAKE_FILE=		Makefile
 APPLICATIONS_DIR=	share/GNUstep/Local/Applications
+NS_APPBINDIR=		nextstep/Emacs.app
 PLIST_SRC+=		PLIST.gnustep
 CHECK_WRKREF_SKIP+=	share/GNUstep/Local/Applications/Emacs.app/Emacs
 .  endif
+# more args for nextstep
 CONFIGURE_ARGS+=	--without-x
 CONFIGURE_ARGS+=	--with-ns
 CONFIGURE_ARGS+=	--disable-ns-self-contained
@@ -156,7 +174,7 @@ post-install:
 	cd ${WRKSRC}/nextstep && \
 		pax -rw -pp -pm Emacs.app ${DESTDIR}${PREFIX}/${APPLICATIONS_DIR}
 
-.else
+.else  # no window system
 CONFIGURE_ARGS+=	--without-x
 CONFIGURE_ARGS+=	--without-xpm
 CONFIGURE_ARGS+=	--without-jpeg
@@ -164,3 +182,35 @@ CONFIGURE_ARGS+=	--without-tiff
 CONFIGURE_ARGS+=	--without-gif
 CONFIGURE_ARGS+=	--without-png
 .endif
+
+# Local Variables:
+# mode: outline-minor
+# outline-regexp: "\\(.[ \t]*\\(if\\|endif\\|else\\|elif\\|include.*options\\|PKG_SUGGES\\)\\)\\|### .\\|# Local"
+# End:
+
+### How To Test (or the possible combinations) -- watch the result of 'make configure'
+# Set PKG_OPTIONS.emacs=	result
+# ----------		----------------------------------------------------------
+# (none)		.. x11 gtk    svg gconf       xft2 dbus gnutls imagemagick
+
+#  xaw			.. x11 lucid  svg gconf xaw3d xft2 dbus gnutls imagemagick
+#  lucid		.. x11 lucid  svg gconf xaw3d xft2 dbus gnutls imagemagick
+#  motif		.. x11 motif  svg gconf       xft2 dbus gnutls imagemagick
+
+# -x11 nextstep		.. nextstep
+# -xft2			.. x11 gtk    svg gconf		   dbus gnutls imagemagick
+# -gnutls		.. x11 gtk    svg gconf       xft2 dbus	       imagemagick
+# -gnutls -imagemagick -dbus
+#                       .. x11 gtk    svg gconf       xft2
+# -x11 -svg -gconf -xaw3d -xft2
+#                       .. nox11	                   dbus gnutls             xml2
+# -x11 			.. nox11			   dbus gnutls imagemagick
+#			.. nox11 but several x11 libraries built and not used
+
+### Window system options and result matrix
+#        x11 | YES  none     NO
+#   nextstep |
+#   -------- +----- -------- -------
+#        YES | --   NextStep NextStep
+#       none | X11  X11      (no Window)
+#         NO | X11  X11      (no Window)
diff --git a/editors/emacs-snapshot/patches/patch-ae b/editors/emacs-snapshot/patches/patch-ae
deleted file mode 100644
index e438b8c9f67..00000000000
--- a/editors/emacs-snapshot/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2011/03/01 17:57:16 minskim Exp $
-
-The "test" command, as well as the "[" command, are not required to know
-the "==" operator.
-
---- test/indent/shell.sh.orig	2011-02-24 08:45:25.000000000 +0000
-+++ test/indent/shell.sh
-@@ -70,7 +70,7 @@ help2
- EOF2
- }
- bar () {
--    if [ $# == 0 ]; then
-+    if [ $# = 0 ]; then
-         while
-             f                   # KNOWN INDENT BUG
-         do
diff --git a/editors/emacs-snapshot/patches/patch-configure.ac b/editors/emacs-snapshot/patches/patch-configure.ac
deleted file mode 100644
index df4ddeee54d..00000000000
--- a/editors/emacs-snapshot/patches/patch-configure.ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.2 2015/04/14 03:39:49 mef Exp $
-
-Kill a substitution that /bin/sh on NetBSD objects to.
-./configure.lineno: 3557: Syntax error: Bad substitution
-
---- configure.ac.orig	2014-04-16 19:32:38.000000000 +0000
-+++ configure.ac
-@@ -34,7 +34,7 @@ then
-       # "/c/foo/bar", to simplify later conversions to native Windows
-       # format ("c:/foo/bar")
-       srcdir=`cd "${srcdir}" && pwd -W`
--      srcdir="/${srcdir:0:1}${srcdir:2}"
-+      #srcdir="/${srcdir:0:1}${srcdir:2}"
-       ;;
-   esac
- fi
diff --git a/editors/emacs-snapshot/patches/patch-src_image.c b/editors/emacs-snapshot/patches/patch-src_image.c
deleted file mode 100644
index 8f72a455c45..00000000000
--- a/editors/emacs-snapshot/patches/patch-src_image.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_image.c,v 1.1 2014/06/29 18:07:30 dholland Exp $
-
-Fix build with giflib 5.1.
-
---- src/image.c.orig	2013-12-31 19:06:18.000000000 +0000
-+++ src/image.c
-@@ -7289,7 +7289,7 @@ init_gif_functions (void)
- 
- #else
- 
--#define fn_DGifCloseFile	DGifCloseFile
-+#define fn_DGifCloseFile(gf)	DGifCloseFile((gf), NULL)
- #define fn_DGifSlurp		DGifSlurp
- #define fn_DGifOpen		DGifOpen
- #define fn_DGifOpenFileName	DGifOpenFileName
diff --git a/editors/emacs-snapshot/version.mk b/editors/emacs-snapshot/version.mk
index 53ca0739d3b..69e6ebc34cd 100644
--- a/editors/emacs-snapshot/version.mk
+++ b/editors/emacs-snapshot/version.mk
@@ -1,11 +1,10 @@
-# $NetBSD: version.mk,v 1.14 2013/02/17 06:18:01 dholland Exp $
+# $NetBSD: version.mk,v 1.15 2015/06/14 15:46:22 mef Exp $
 
 _EMACS_FLAVOR=	emacs
-#_EMACS_REQD=	emacs25>=25
-_EMACS_REQD=	emacs24>=24.3
+_EMACS_REQD=	emacs25>=25
 _EMACS_PKGDEP.base=
 _EMACS_PKGDEP.leim=
 
-_EMACS_VERSION_MAJOR=	24
-_EMACS_VERSION_MINOR=	3
+_EMACS_VERSION_MAJOR=	25
+_EMACS_VERSION_MINOR=	0
 _EMACS_VERSION_MICRO=	50