Update 20150415(22) to 20150716(14)

Changes are recorded in source tree as ChangeLog.2, and too long
to list here. Thanks.

4 files changed, 33 insertions, 18 deletions

diff --git a/editors/emacs-snapshot/Makefile b/editors/emacs-snapshot/Makefile
index a51d3a58bbf..6460e5317c5 100644
--- a/editors/emacs-snapshot/Makefile
+++ b/editors/emacs-snapshot/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.59 2015/06/30 09:57:35 ryoon Exp $
+# $NetBSD: Makefile,v 1.60 2015/07/21 14:32:18 mef Exp $
 
-PKGREVISION= 1
+#PKGREVISION= 1
 .include "../../editors/emacs-snapshot/Makefile.common"
 
 .include "options.mk"
diff --git a/editors/emacs-snapshot/Makefile.common b/editors/emacs-snapshot/Makefile.common
index 5a21e30a0e1..6307cc9db5f 100644
--- a/editors/emacs-snapshot/Makefile.common
+++ b/editors/emacs-snapshot/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.67 2015/06/14 15:46:21 mef Exp $
+# $NetBSD: Makefile.common,v 1.68 2015/07/21 14:32:18 mef Exp $
 #
 # used by editors/emacs-snapshot/Makefile
 
 .include	"../../editors/emacs-snapshot/version.mk"
-DISTNAME=	emacs-snapshot_2015041522+17a8618dc7396ef485c38b4b7c37c591839b3ec5.orig
+DISTNAME=	emacs-snapshot_2015071614+bd8b5ac77250d9fe0634d58a30a3bf6d2497725a.orig
 SNAPDATE=	${DISTNAME:C/.*_(20[0-9]+)\+.*/\1/}
 PKGNAME=	emacs${_EMACS_VERSION_MAJOR}-${EMACS_VERSION}.${SNAPDATE}
 CATEGORIES=	editors
diff --git a/editors/emacs-snapshot/PLIST b/editors/emacs-snapshot/PLIST
index 39b7e67a336..1de9d466574 100644
--- a/editors/emacs-snapshot/PLIST
+++ b/editors/emacs-snapshot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2015/06/14 15:46:21 mef Exp $
+@comment $NetBSD: PLIST,v 1.38 2015/07/21 14:32:18 mef Exp $
 bin/ctags
 bin/ebrowse
 bin/emacs
@@ -1463,6 +1463,8 @@ share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/template.el.gz
 share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/template.elc
 share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/texi.el.gz
 share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/texi.elc
+share/emacs/${EMACS_VERSION}/lisp/character-fold.el.gz
+share/emacs/${EMACS_VERSION}/lisp/character-fold.elc
 share/emacs/${EMACS_VERSION}/lisp/chistory.el.gz
 share/emacs/${EMACS_VERSION}/lisp/chistory.elc
 share/emacs/${EMACS_VERSION}/lisp/cmuscheme.el.gz
@@ -1643,6 +1645,8 @@ 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/let-alist.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/let-alist.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
@@ -1653,6 +1657,8 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/macroexp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/macroexp.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/map-ynp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/map-ynp.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/map.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/map.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/nadvice.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/nadvice.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/package-x.el.gz
@@ -2264,8 +2270,12 @@ share/emacs/${EMACS_VERSION}/lisp/international/ccl.elc
 share/emacs/${EMACS_VERSION}/lisp/international/characters.el.gz
 share/emacs/${EMACS_VERSION}/lisp/international/characters.elc
 share/emacs/${EMACS_VERSION}/lisp/international/charprop.el
-share/emacs/${EMACS_VERSION}/lisp/international/cp51932.el
-share/emacs/${EMACS_VERSION}/lisp/international/eucjp-ms.el
+share/emacs/${EMACS_VERSION}/lisp/international/charscript.el.gz
+share/emacs/${EMACS_VERSION}/lisp/international/charscript.elc
+share/emacs/${EMACS_VERSION}/lisp/international/cp51932.el.gz
+share/emacs/${EMACS_VERSION}/lisp/international/cp51932.elc
+share/emacs/${EMACS_VERSION}/lisp/international/eucjp-ms.el.gz
+share/emacs/${EMACS_VERSION}/lisp/international/eucjp-ms.elc
 share/emacs/${EMACS_VERSION}/lisp/international/fontset.el.gz
 share/emacs/${EMACS_VERSION}/lisp/international/fontset.elc
 share/emacs/${EMACS_VERSION}/lisp/international/isearch-x.el.gz
@@ -2539,8 +2549,6 @@ 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
@@ -2770,6 +2778,8 @@ 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/pinentry.el.gz
+share/emacs/${EMACS_VERSION}/lisp/net/pinentry.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
@@ -2895,7 +2905,8 @@ share/emacs/${EMACS_VERSION}/lisp/obsolete/assoc.el.gz
 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/bruce.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/bruce.elc
 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
@@ -2920,7 +2931,10 @@ 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/keyswap.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/keyswap.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/landmark.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/landmark.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/lazy-lock.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/lazy-lock.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/ledit.el.gz
@@ -2947,7 +2961,8 @@ share/emacs/${EMACS_VERSION}/lisp/obsolete/options.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/options.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/otodo-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/otodo-mode.elc
-share/emacs/${EMACS_VERSION}/lisp/obsolete/patcomp.el
+share/emacs/${EMACS_VERSION}/lisp/obsolete/patcomp.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/patcomp.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/pc-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/pc-mode.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/pc-select.el.gz
@@ -3263,8 +3278,6 @@ share/emacs/${EMACS_VERSION}/lisp/play/handwrite.el.gz
 share/emacs/${EMACS_VERSION}/lisp/play/handwrite.elc
 share/emacs/${EMACS_VERSION}/lisp/play/hanoi.el.gz
 share/emacs/${EMACS_VERSION}/lisp/play/hanoi.elc
-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/morse.el.gz
@@ -3431,6 +3444,8 @@ share/emacs/${EMACS_VERSION}/lisp/progmodes/perl-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/perl-mode.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/prog-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/prog-mode.elc
+share/emacs/${EMACS_VERSION}/lisp/progmodes/project.el.gz
+share/emacs/${EMACS_VERSION}/lisp/progmodes/project.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/prolog.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/prolog.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/ps-mode.el.gz
diff --git a/editors/emacs-snapshot/distinfo b/editors/emacs-snapshot/distinfo
index 0d4be5af7ac..bb1499daa3f 100644
--- a/editors/emacs-snapshot/distinfo
+++ b/editors/emacs-snapshot/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.69 2015/06/14 15:46:22 mef Exp $
+$NetBSD: distinfo,v 1.70 2015/07/21 14:32:18 mef Exp $
 
-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 (emacs-snapshot_2015071614+bd8b5ac77250d9fe0634d58a30a3bf6d2497725a.orig.tar.xz) = 9d9516a5fe81068fc32e175ea0684eb2cd382cdb
+RMD160 (emacs-snapshot_2015071614+bd8b5ac77250d9fe0634d58a30a3bf6d2497725a.orig.tar.xz) = bc23b1eb226a180b535dabd35b74072d154c1677
+Size (emacs-snapshot_2015071614+bd8b5ac77250d9fe0634d58a30a3bf6d2497725a.orig.tar.xz) = 25788584 bytes
 SHA1 (patch-ad) = 61769812ed721e8d881a954983bbdbba01537104
 SHA1 (patch-ag) = e30b57d3536e31adbd5b0f0c91696de0de2c0f35
 SHA1 (patch-src_process.c) = e3e9ae43f4bfa373e51eb3e6a1f864ebf1bbc308