Update emacs-snapshot to 24.3.50.20130207.

Patches provided by Makoto Fujiwara in PR 47552 and modified by me.

Notable changes since 24.3:
** `apropos-variable' is now `apropos-user-option'
** `eval-defun' on an already defined defcustom calls the :set function,
   if there is one.
** The option `set-mark-default-inactive' has been deleted.
   This unfinished feature was introduced by accident in Emacs 23.1;
   simply disabling Transient Mark mode does the same thing.
** `initial-buffer-choice' can now specify a function to set up the
   initial buffer.
** ACL support has been added.
** New option `scroll-bar-adjust-thumb-portion'.
** Improved fullscreen support for Nextstep (Mac OS X).
** New commands `toggle-frame-fullscreen' and `toggle-frame-maximized',
   bound to <f11> and M-<f10>, respectively.
** Delphi mode is now called OPascal mode.
** jit-lock-debug-mode lets you use the debuggers on code run via jit-lock.
** completing-read-multiple's separator can now be a regexp.  The
   default separator is changed to allow surrounding spaces around the
   comma.

See share/emacs/24.3.50/etc/NEWS for the complete list of changes.

10 files changed, 264 insertions, 213 deletions

diff --git a/editors/emacs-snapshot/Makefile b/editors/emacs-snapshot/Makefile
index 679304cc91a..6c19c1d3355 100644
--- a/editors/emacs-snapshot/Makefile
+++ b/editors/emacs-snapshot/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.35 2013/01/26 21:37:26 adam Exp $
+# $NetBSD: Makefile,v 1.36 2013/02/12 04:47:31 minskim Exp $
 
-PKGREVISION=	7
 CONFLICTS+=	emacs-nox11-[0-9]*
 
 .include "../../editors/emacs-snapshot/Makefile.common"
diff --git a/editors/emacs-snapshot/Makefile.common b/editors/emacs-snapshot/Makefile.common
index d25c2248a2c..8f5c23a6260 100644
--- a/editors/emacs-snapshot/Makefile.common
+++ b/editors/emacs-snapshot/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.53 2012/10/03 11:43:32 asau Exp $
+# $NetBSD: Makefile.common,v 1.54 2013/02/12 04:47:31 minskim Exp $
 
-DISTNAME=	emacs-snapshot_20120319.orig
+DISTNAME=	emacs-snapshot_20130207.orig
 PKGNAME=	${DISTNAME:S/snapshot_/${EMACS_VERSION}./:S/.orig//}
 CATEGORIES=	editors
 MASTER_SITES=	http://emacs.naquadah.org/unstable/
@@ -14,8 +14,6 @@ LICENSE=	gnu-gpl-v3
 SETGIDGAME=		yes
 MAKE_JOBS_SAFE=		no
 
-BROKEN=	emacs24 has been released; emacs25 snapshots are not yet available.
-
 CONFLICTS+=	emacs-nox11-[0-9]*
 
 GNU_CONFIGURE=	yes
diff --git a/editors/emacs-snapshot/PLIST b/editors/emacs-snapshot/PLIST
index 5284c414bdd..7d667eaeb5d 100644
--- a/editors/emacs-snapshot/PLIST
+++ b/editors/emacs-snapshot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2012/01/08 21:56:03 minskim Exp $
+@comment $NetBSD: PLIST,v 1.29 2013/02/12 04:47:31 minskim Exp $
 bin/ctags
 bin/ebrowse
 bin/emacs
@@ -6,73 +6,77 @@ bin/emacs-${EMACS_VERSION}
 bin/emacsclient
 bin/etags
 bin/grep-changelog
-bin/rcs-checkin
-info/ada-mode
-info/auth
-info/autotype
-info/calc
-info/ccmode
-info/cl
-info/dbus
-info/dired-x
-info/ebrowse
-info/ede
-info/ediff
-info/edt
-info/efaq
-info/eieio
-info/eintr
-info/elisp
-info/emacs-mime
-info/emacs
-info/epa
-info/erc
-info/ert
-info/eshell
-info/eudc
-info/flymake
-info/forms
-info/gnus
-info/idlwave
-info/mairix-el
-info/message
-info/mh-e
-info/newsticker
-info/nxml-mode
-info/org
-info/pcl-cvs
-info/pgg
-info/rcirc
-info/reftex
-info/remember
-info/sasl
-info/sc
-info/semantic
-info/ses
-info/sieve
-info/smtpmail
-info/speedbar
-info/tramp
-info/url
-info/vip
-info/viper
-info/widget
-info/woman
+info/ada-mode.info.gz
+info/auth.info.gz
+info/autotype.info.gz
+info/bovine.info.gz
+info/calc.info.gz
+info/ccmode.info.gz
+info/cl.info.gz
+info/dbus.info.gz
+info/dired-x.info.gz
+info/ebrowse.info.gz
+info/ede.info.gz
+info/ediff.info.gz
+info/edt.info.gz
+info/efaq.info.gz
+info/eieio.info.gz
+info/eintr.info.gz
+info/elisp.info.gz
+info/emacs-gnutls.info.gz
+info/emacs-mime.info.gz
+info/emacs.info.gz
+info/epa.info.gz
+info/erc.info.gz
+info/ert.info.gz
+info/eshell.info.gz
+info/eudc.info.gz
+info/flymake.info.gz
+info/forms.info.gz
+info/gnus.info.gz
+info/htmlfontify.info.gz
+info/idlwave.info.gz
+info/info.info.gz
+info/mairix-el.info.gz
+info/message.info.gz
+info/mh-e.info.gz
+info/newsticker.info.gz
+info/nxml-mode.info.gz
+info/org.info.gz
+info/pcl-cvs.info.gz
+info/pgg.info.gz
+info/rcirc.info.gz
+info/reftex.info.gz
+info/remember.info.gz
+info/sasl.info.gz
+info/sc.info.gz
+info/semantic.info.gz
+info/ses.info.gz
+info/sieve.info.gz
+info/smtpmail.info.gz
+info/speedbar.info.gz
+info/srecode.info.gz
+info/tramp.info.gz
+info/url.info.gz
+info/vip.info.gz
+info/viper.info.gz
+info/widget.info.gz
+info/wisent.info.gz
+info/woman.info.gz
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/hexl
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/movemail
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/profile
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/rcs2log
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/update-game-score
-libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/vcdiff
 man/man1/ctags.1
 man/man1/ebrowse.1
 man/man1/emacs.1
 man/man1/emacsclient.1
 man/man1/etags.1
 man/man1/grep-changelog.1
-man/man1/rcs-checkin.1
 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
@@ -107,6 +111,7 @@ share/emacs/${EMACS_VERSION}/etc/NEWS.23
 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
@@ -258,11 +263,11 @@ share/emacs/${EMACS_VERSION}/etc/edt-user.el
 share/emacs/${EMACS_VERSION}/etc/emacs-buffer.gdb
 share/emacs/${EMACS_VERSION}/etc/emacs.desktop
 share/emacs/${EMACS_VERSION}/etc/emacs.icon
-share/emacs/${EMACS_VERSION}/etc/emacs.py
-share/emacs/${EMACS_VERSION}/etc/emacs2.py
-share/emacs/${EMACS_VERSION}/etc/emacs3.py
 share/emacs/${EMACS_VERSION}/etc/enriched.doc
-share/emacs/${EMACS_VERSION}/etc/forms-d2.dat
+share/emacs/${EMACS_VERSION}/etc/forms/README
+share/emacs/${EMACS_VERSION}/etc/forms/forms-d2.dat
+share/emacs/${EMACS_VERSION}/etc/forms/forms-d2.el
+share/emacs/${EMACS_VERSION}/etc/forms/forms-pass.el
 share/emacs/${EMACS_VERSION}/etc/future-bug
 share/emacs/${EMACS_VERSION}/etc/gnus-tut.txt
 share/emacs/${EMACS_VERSION}/etc/gnus/gnus-setup.ast
@@ -832,6 +837,7 @@ share/emacs/${EMACS_VERSION}/etc/org/OrgOdtStyles.xml
 share/emacs/${EMACS_VERSION}/etc/org/README
 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/refcards/Makefile
 share/emacs/${EMACS_VERSION}/etc/refcards/README
 share/emacs/${EMACS_VERSION}/etc/refcards/calccard.pdf
@@ -845,6 +851,7 @@ share/emacs/${EMACS_VERSION}/etc/refcards/de-refcard.pdf
 share/emacs/${EMACS_VERSION}/etc/refcards/de-refcard.tex
 share/emacs/${EMACS_VERSION}/etc/refcards/dired-ref.pdf
 share/emacs/${EMACS_VERSION}/etc/refcards/dired-ref.tex
+share/emacs/${EMACS_VERSION}/etc/refcards/emacsver.tex
 share/emacs/${EMACS_VERSION}/etc/refcards/fr-dired-ref.pdf
 share/emacs/${EMACS_VERSION}/etc/refcards/fr-dired-ref.tex
 share/emacs/${EMACS_VERSION}/etc/refcards/fr-refcard.pdf
@@ -924,11 +931,13 @@ 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
 share/emacs/${EMACS_VERSION}/etc/srecode/default.srt
 share/emacs/${EMACS_VERSION}/etc/srecode/doc-cpp.srt
 share/emacs/${EMACS_VERSION}/etc/srecode/doc-default.srt
 share/emacs/${EMACS_VERSION}/etc/srecode/doc-java.srt
+share/emacs/${EMACS_VERSION}/etc/srecode/ede-autoconf.srt
 share/emacs/${EMACS_VERSION}/etc/srecode/ede-make.srt
 share/emacs/${EMACS_VERSION}/etc/srecode/el.srt
 share/emacs/${EMACS_VERSION}/etc/srecode/getset-cpp.srt
@@ -941,6 +950,7 @@ share/emacs/${EMACS_VERSION}/etc/srecode/wisent.srt
 share/emacs/${EMACS_VERSION}/etc/themes/adwaita-theme.el
 share/emacs/${EMACS_VERSION}/etc/themes/deeper-blue-theme.el
 share/emacs/${EMACS_VERSION}/etc/themes/dichromacy-theme.el
+share/emacs/${EMACS_VERSION}/etc/themes/leuven-theme.el
 share/emacs/${EMACS_VERSION}/etc/themes/light-blue-theme.el
 share/emacs/${EMACS_VERSION}/etc/themes/manoj-dark-theme.el
 share/emacs/${EMACS_VERSION}/etc/themes/misterioso-theme.el
@@ -1092,6 +1102,8 @@ share/emacs/${EMACS_VERSION}/leim/quail/viqr.el.gz
 share/emacs/${EMACS_VERSION}/leim/quail/viqr.elc
 share/emacs/${EMACS_VERSION}/leim/quail/vntelex.el.gz
 share/emacs/${EMACS_VERSION}/leim/quail/vntelex.elc
+share/emacs/${EMACS_VERSION}/leim/quail/vnvni.el.gz
+share/emacs/${EMACS_VERSION}/leim/quail/vnvni.elc
 share/emacs/${EMACS_VERSION}/leim/quail/welsh.el.gz
 share/emacs/${EMACS_VERSION}/leim/quail/welsh.elc
 share/emacs/${EMACS_VERSION}/lisp/COPYING
@@ -1132,8 +1144,6 @@ share/emacs/${EMACS_VERSION}/lisp/buff-menu.el.gz
 share/emacs/${EMACS_VERSION}/lisp/buff-menu.elc
 share/emacs/${EMACS_VERSION}/lisp/button.el.gz
 share/emacs/${EMACS_VERSION}/lisp/button.elc
-share/emacs/${EMACS_VERSION}/lisp/calc/README
-share/emacs/${EMACS_VERSION}/lisp/calc/README.prev
 share/emacs/${EMACS_VERSION}/lisp/calc/calc-aent.el.gz
 share/emacs/${EMACS_VERSION}/lisp/calc/calc-aent.elc
 share/emacs/${EMACS_VERSION}/lisp/calc/calc-alg.el.gz
@@ -1397,6 +1407,8 @@ share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/el.el.gz
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/el.elc
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/gcc.el.gz
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/gcc.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/grammar.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/grammar.elc
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/make-by.el.gz
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/make-by.elc
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/make.el.gz
@@ -1518,6 +1530,8 @@ share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent.el.gz
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent.elc
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/comp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/comp.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/grammar.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/grammar.elc
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/java-tags.el.gz
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/java-tags.elc
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/javascript.el.gz
@@ -1658,8 +1672,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/assoc.el.gz
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/assoc.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
@@ -1690,20 +1702,19 @@ 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-indent.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-indent.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-lib.el.gz
+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-seq.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-seq.elc
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl-specs.el
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cl.elc
 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/cust-print.el.gz
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cust-print.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
@@ -1750,6 +1761,8 @@ 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/lisp-mnt.el.gz
@@ -1762,6 +1775,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/nadvice.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/nadvice.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/package-x.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/package-x.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/package.el.gz
@@ -1882,6 +1897,8 @@ share/emacs/${EMACS_VERSION}/lisp/erc/erc-compat.el.gz
 share/emacs/${EMACS_VERSION}/lisp/erc/erc-compat.elc
 share/emacs/${EMACS_VERSION}/lisp/erc/erc-dcc.el.gz
 share/emacs/${EMACS_VERSION}/lisp/erc/erc-dcc.elc
+share/emacs/${EMACS_VERSION}/lisp/erc/erc-desktop-notifications.el.gz
+share/emacs/${EMACS_VERSION}/lisp/erc/erc-desktop-notifications.elc
 share/emacs/${EMACS_VERSION}/lisp/erc/erc-ezbounce.el.gz
 share/emacs/${EMACS_VERSION}/lisp/erc/erc-ezbounce.elc
 share/emacs/${EMACS_VERSION}/lisp/erc/erc-fill.el.gz
@@ -2038,8 +2055,6 @@ share/emacs/${EMACS_VERSION}/lisp/format-spec.el.gz
 share/emacs/${EMACS_VERSION}/lisp/format-spec.elc
 share/emacs/${EMACS_VERSION}/lisp/format.el.gz
 share/emacs/${EMACS_VERSION}/lisp/format.elc
-share/emacs/${EMACS_VERSION}/lisp/forms-d2.el
-share/emacs/${EMACS_VERSION}/lisp/forms-pass.el
 share/emacs/${EMACS_VERSION}/lisp/forms.el.gz
 share/emacs/${EMACS_VERSION}/lisp/forms.elc
 share/emacs/${EMACS_VERSION}/lisp/frame.el.gz
@@ -2117,6 +2132,8 @@ share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-mlspl.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-mlspl.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-msg.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-msg.elc
+share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-notifications.el.gz
+share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-notifications.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-picon.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-picon.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/gnus-range.el.gz
@@ -2177,6 +2194,8 @@ share/emacs/${EMACS_VERSION}/lisp/gnus/message.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/message.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/messcompat.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/messcompat.elc
+share/emacs/${EMACS_VERSION}/lisp/gnus/mm-archive.el.gz
+share/emacs/${EMACS_VERSION}/lisp/gnus/mm-archive.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/mm-bodies.el.gz
 share/emacs/${EMACS_VERSION}/lisp/gnus/mm-bodies.elc
 share/emacs/${EMACS_VERSION}/lisp/gnus/mm-decode.el.gz
@@ -2453,8 +2472,10 @@ share/emacs/${EMACS_VERSION}/lisp/kermit.el.gz
 share/emacs/${EMACS_VERSION}/lisp/kermit.elc
 share/emacs/${EMACS_VERSION}/lisp/kmacro.el.gz
 share/emacs/${EMACS_VERSION}/lisp/kmacro.elc
-share/emacs/${EMACS_VERSION}/lisp/language/burmese.el
-share/emacs/${EMACS_VERSION}/lisp/language/cham.el
+share/emacs/${EMACS_VERSION}/lisp/language/burmese.el.gz
+share/emacs/${EMACS_VERSION}/lisp/language/burmese.elc
+share/emacs/${EMACS_VERSION}/lisp/language/cham.el.gz
+share/emacs/${EMACS_VERSION}/lisp/language/cham.elc
 share/emacs/${EMACS_VERSION}/lisp/language/china-util.el.gz
 share/emacs/${EMACS_VERSION}/lisp/language/china-util.elc
 share/emacs/${EMACS_VERSION}/lisp/language/chinese.el.gz
@@ -2463,16 +2484,20 @@ share/emacs/${EMACS_VERSION}/lisp/language/cyril-util.el.gz
 share/emacs/${EMACS_VERSION}/lisp/language/cyril-util.elc
 share/emacs/${EMACS_VERSION}/lisp/language/cyrillic.el.gz
 share/emacs/${EMACS_VERSION}/lisp/language/cyrillic.elc
-share/emacs/${EMACS_VERSION}/lisp/language/czech.el
-share/emacs/${EMACS_VERSION}/lisp/language/english.el
+share/emacs/${EMACS_VERSION}/lisp/language/czech.el.gz
+share/emacs/${EMACS_VERSION}/lisp/language/czech.elc
+share/emacs/${EMACS_VERSION}/lisp/language/english.el.gz
+share/emacs/${EMACS_VERSION}/lisp/language/english.elc
 share/emacs/${EMACS_VERSION}/lisp/language/ethio-util.el.gz
 share/emacs/${EMACS_VERSION}/lisp/language/ethio-util.elc
 share/emacs/${EMACS_VERSION}/lisp/language/ethiopic.el.gz
 share/emacs/${EMACS_VERSION}/lisp/language/ethiopic.elc
 share/emacs/${EMACS_VERSION}/lisp/language/european.el.gz
 share/emacs/${EMACS_VERSION}/lisp/language/european.elc
-share/emacs/${EMACS_VERSION}/lisp/language/georgian.el
-share/emacs/${EMACS_VERSION}/lisp/language/greek.el
+share/emacs/${EMACS_VERSION}/lisp/language/georgian.el.gz
+share/emacs/${EMACS_VERSION}/lisp/language/georgian.elc
+share/emacs/${EMACS_VERSION}/lisp/language/greek.el.gz
+share/emacs/${EMACS_VERSION}/lisp/language/greek.elc
 share/emacs/${EMACS_VERSION}/lisp/language/hanja-util.el.gz
 share/emacs/${EMACS_VERSION}/lisp/language/hanja-util.elc
 share/emacs/${EMACS_VERSION}/lisp/language/hebrew.el.gz
@@ -2483,38 +2508,47 @@ share/emacs/${EMACS_VERSION}/lisp/language/indian.el.gz
 share/emacs/${EMACS_VERSION}/lisp/language/indian.elc
 share/emacs/${EMACS_VERSION}/lisp/language/japan-util.el.gz
 share/emacs/${EMACS_VERSION}/lisp/language/japan-util.elc
-share/emacs/${EMACS_VERSION}/lisp/language/japanese.el
-share/emacs/${EMACS_VERSION}/lisp/language/khmer.el
+share/emacs/${EMACS_VERSION}/lisp/language/japanese.el.gz
+share/emacs/${EMACS_VERSION}/lisp/language/japanese.elc
+share/emacs/${EMACS_VERSION}/lisp/language/khmer.el.gz
+share/emacs/${EMACS_VERSION}/lisp/language/khmer.elc
 share/emacs/${EMACS_VERSION}/lisp/language/korea-util.el.gz
 share/emacs/${EMACS_VERSION}/lisp/language/korea-util.elc
-share/emacs/${EMACS_VERSION}/lisp/language/korean.el
+share/emacs/${EMACS_VERSION}/lisp/language/korean.el.gz
+share/emacs/${EMACS_VERSION}/lisp/language/korean.elc
 share/emacs/${EMACS_VERSION}/lisp/language/lao-util.el.gz
 share/emacs/${EMACS_VERSION}/lisp/language/lao-util.elc
-share/emacs/${EMACS_VERSION}/lisp/language/lao.el
-share/emacs/${EMACS_VERSION}/lisp/language/misc-lang.el
-share/emacs/${EMACS_VERSION}/lisp/language/romanian.el
-share/emacs/${EMACS_VERSION}/lisp/language/sinhala.el
-share/emacs/${EMACS_VERSION}/lisp/language/slovak.el
-share/emacs/${EMACS_VERSION}/lisp/language/tai-viet.el
+share/emacs/${EMACS_VERSION}/lisp/language/lao.el.gz
+share/emacs/${EMACS_VERSION}/lisp/language/lao.elc
+share/emacs/${EMACS_VERSION}/lisp/language/misc-lang.el.gz
+share/emacs/${EMACS_VERSION}/lisp/language/misc-lang.elc
+share/emacs/${EMACS_VERSION}/lisp/language/romanian.el.gz
+share/emacs/${EMACS_VERSION}/lisp/language/romanian.elc
+share/emacs/${EMACS_VERSION}/lisp/language/sinhala.el.gz
+share/emacs/${EMACS_VERSION}/lisp/language/sinhala.elc
+share/emacs/${EMACS_VERSION}/lisp/language/slovak.el.gz
+share/emacs/${EMACS_VERSION}/lisp/language/slovak.elc
+share/emacs/${EMACS_VERSION}/lisp/language/tai-viet.el.gz
+share/emacs/${EMACS_VERSION}/lisp/language/tai-viet.elc
 share/emacs/${EMACS_VERSION}/lisp/language/thai-util.el.gz
 share/emacs/${EMACS_VERSION}/lisp/language/thai-util.elc
 share/emacs/${EMACS_VERSION}/lisp/language/thai-word.el.gz
 share/emacs/${EMACS_VERSION}/lisp/language/thai-word.elc
-share/emacs/${EMACS_VERSION}/lisp/language/thai.el
+share/emacs/${EMACS_VERSION}/lisp/language/thai.el.gz
+share/emacs/${EMACS_VERSION}/lisp/language/thai.elc
 share/emacs/${EMACS_VERSION}/lisp/language/tibet-util.el.gz
 share/emacs/${EMACS_VERSION}/lisp/language/tibet-util.elc
 share/emacs/${EMACS_VERSION}/lisp/language/tibetan.el.gz
 share/emacs/${EMACS_VERSION}/lisp/language/tibetan.elc
 share/emacs/${EMACS_VERSION}/lisp/language/tv-util.el.gz
 share/emacs/${EMACS_VERSION}/lisp/language/tv-util.elc
-share/emacs/${EMACS_VERSION}/lisp/language/utf-8-lang.el
+share/emacs/${EMACS_VERSION}/lisp/language/utf-8-lang.el.gz
+share/emacs/${EMACS_VERSION}/lisp/language/utf-8-lang.elc
 share/emacs/${EMACS_VERSION}/lisp/language/viet-util.el.gz
 share/emacs/${EMACS_VERSION}/lisp/language/viet-util.elc
 share/emacs/${EMACS_VERSION}/lisp/language/vietnamese.el.gz
 share/emacs/${EMACS_VERSION}/lisp/language/vietnamese.elc
 share/emacs/${EMACS_VERSION}/lisp/ldefs-boot.el
-share/emacs/${EMACS_VERSION}/lisp/ledit.el.gz
-share/emacs/${EMACS_VERSION}/lisp/ledit.elc
 share/emacs/${EMACS_VERSION}/lisp/linum.el.gz
 share/emacs/${EMACS_VERSION}/lisp/linum.elc
 share/emacs/${EMACS_VERSION}/lisp/loaddefs.el
@@ -2523,8 +2557,6 @@ share/emacs/${EMACS_VERSION}/lisp/loadhist.elc
 share/emacs/${EMACS_VERSION}/lisp/loadup.el
 share/emacs/${EMACS_VERSION}/lisp/locate.el.gz
 share/emacs/${EMACS_VERSION}/lisp/locate.elc
-share/emacs/${EMACS_VERSION}/lisp/longlines.el.gz
-share/emacs/${EMACS_VERSION}/lisp/longlines.elc
 share/emacs/${EMACS_VERSION}/lisp/lpr.el.gz
 share/emacs/${EMACS_VERSION}/lisp/lpr.elc
 share/emacs/${EMACS_VERSION}/lisp/ls-lisp.el.gz
@@ -2556,8 +2588,6 @@ share/emacs/${EMACS_VERSION}/lisp/mail/mailclient.el.gz
 share/emacs/${EMACS_VERSION}/lisp/mail/mailclient.elc
 share/emacs/${EMACS_VERSION}/lisp/mail/mailheader.el.gz
 share/emacs/${EMACS_VERSION}/lisp/mail/mailheader.elc
-share/emacs/${EMACS_VERSION}/lisp/mail/mailpost.el.gz
-share/emacs/${EMACS_VERSION}/lisp/mail/mailpost.elc
 share/emacs/${EMACS_VERSION}/lisp/mail/metamail.el.gz
 share/emacs/${EMACS_VERSION}/lisp/mail/metamail.elc
 share/emacs/${EMACS_VERSION}/lisp/mail/mspools.el.gz
@@ -2674,8 +2704,6 @@ share/emacs/${EMACS_VERSION}/lisp/mouse-copy.el.gz
 share/emacs/${EMACS_VERSION}/lisp/mouse-copy.elc
 share/emacs/${EMACS_VERSION}/lisp/mouse-drag.el.gz
 share/emacs/${EMACS_VERSION}/lisp/mouse-drag.elc
-share/emacs/${EMACS_VERSION}/lisp/mouse-sel.el.gz
-share/emacs/${EMACS_VERSION}/lisp/mouse-sel.elc
 share/emacs/${EMACS_VERSION}/lisp/mouse.el.gz
 share/emacs/${EMACS_VERSION}/lisp/mouse.elc
 share/emacs/${EMACS_VERSION}/lisp/mpc.el.gz
@@ -2776,6 +2804,8 @@ share/emacs/${EMACS_VERSION}/lisp/net/telnet.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/telnet.elc
 share/emacs/${EMACS_VERSION}/lisp/net/tls.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/tls.elc
+share/emacs/${EMACS_VERSION}/lisp/net/tramp-adb.el.gz
+share/emacs/${EMACS_VERSION}/lisp/net/tramp-adb.elc
 share/emacs/${EMACS_VERSION}/lisp/net/tramp-cache.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/tramp-cache.elc
 share/emacs/${EMACS_VERSION}/lisp/net/tramp-cmds.el.gz
@@ -2861,12 +2891,17 @@ share/emacs/${EMACS_VERSION}/lisp/nxml/xsd-regexp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/nxml/xsd-regexp.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/abbrevlist.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/abbrevlist.elc
+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/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/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
@@ -2880,18 +2915,27 @@ share/emacs/${EMACS_VERSION}/lisp/obsolete/iso-swed.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
+share/emacs/${EMACS_VERSION}/lisp/obsolete/ledit.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/ledit.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/levents.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/levents.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/lmenu.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/lmenu.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/longlines.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/longlines.elc
 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/mouse-sel.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/mouse-sel.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/old-emacs-lock.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/old-emacs-lock.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/old-whitespace.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/old-whitespace.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/options.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/options.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/patcomp.el
 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
@@ -2922,6 +2966,8 @@ share/emacs/${EMACS_VERSION}/lisp/obsolete/swedish.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/swedish.elc
 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/vc-mcvs.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/vc-mcvs.elc
 share/emacs/${EMACS_VERSION}/lisp/org/ob-C.el.gz
@@ -2956,6 +3002,8 @@ share/emacs/${EMACS_VERSION}/lisp/org/ob-gnuplot.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/ob-gnuplot.elc
 share/emacs/${EMACS_VERSION}/lisp/org/ob-haskell.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/ob-haskell.elc
+share/emacs/${EMACS_VERSION}/lisp/org/ob-io.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/ob-io.elc
 share/emacs/${EMACS_VERSION}/lisp/org/ob-java.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/ob-java.elc
 share/emacs/${EMACS_VERSION}/lisp/org/ob-js.el.gz
@@ -2998,6 +3046,8 @@ share/emacs/${EMACS_VERSION}/lisp/org/ob-ruby.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/ob-ruby.elc
 share/emacs/${EMACS_VERSION}/lisp/org/ob-sass.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/ob-sass.elc
+share/emacs/${EMACS_VERSION}/lisp/org/ob-scala.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/ob-scala.elc
 share/emacs/${EMACS_VERSION}/lisp/org/ob-scheme.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/ob-scheme.elc
 share/emacs/${EMACS_VERSION}/lisp/org/ob-screen.el.gz
@@ -3048,6 +3098,8 @@ share/emacs/${EMACS_VERSION}/lisp/org/org-docbook.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-docbook.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-docview.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-docview.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-element.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-element.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-entities.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-entities.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-eshell.el.gz
@@ -3080,8 +3132,7 @@ share/emacs/${EMACS_VERSION}/lisp/org/org-info.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-info.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-inlinetask.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-inlinetask.elc
-share/emacs/${EMACS_VERSION}/lisp/org/org-install.el.gz
-share/emacs/${EMACS_VERSION}/lisp/org/org-install.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-install.el
 share/emacs/${EMACS_VERSION}/lisp/org/org-irc.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-irc.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-jsinfo.el.gz
@@ -3090,6 +3141,7 @@ share/emacs/${EMACS_VERSION}/lisp/org/org-latex.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-latex.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-list.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-list.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-loaddefs.el
 share/emacs/${EMACS_VERSION}/lisp/org/org-lparse.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-lparse.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-mac-message.el.gz
@@ -3130,6 +3182,7 @@ share/emacs/${EMACS_VERSION}/lisp/org/org-taskjuggler.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-taskjuggler.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-timer.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-timer.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-version.el
 share/emacs/${EMACS_VERSION}/lisp/org/org-vm.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-vm.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-w3m.el.gz
@@ -3146,8 +3199,6 @@ share/emacs/${EMACS_VERSION}/lisp/paren.el.gz
 share/emacs/${EMACS_VERSION}/lisp/paren.elc
 share/emacs/${EMACS_VERSION}/lisp/password-cache.el.gz
 share/emacs/${EMACS_VERSION}/lisp/password-cache.elc
-share/emacs/${EMACS_VERSION}/lisp/patcomp.el
-share/emacs/${EMACS_VERSION}/lisp/paths.el
 share/emacs/${EMACS_VERSION}/lisp/pcmpl-cvs.el.gz
 share/emacs/${EMACS_VERSION}/lisp/pcmpl-cvs.elc
 share/emacs/${EMACS_VERSION}/lisp/pcmpl-gnu.el.gz
@@ -3166,7 +3217,6 @@ share/emacs/${EMACS_VERSION}/lisp/play/animate.el.gz
 share/emacs/${EMACS_VERSION}/lisp/play/animate.elc
 share/emacs/${EMACS_VERSION}/lisp/play/blackbox.el.gz
 share/emacs/${EMACS_VERSION}/lisp/play/blackbox.elc
-share/emacs/${EMACS_VERSION}/lisp/play/bruce.el
 share/emacs/${EMACS_VERSION}/lisp/play/bubbles.el.gz
 share/emacs/${EMACS_VERSION}/lisp/play/bubbles.elc
 share/emacs/${EMACS_VERSION}/lisp/play/cookie1.el.gz
@@ -3221,6 +3271,8 @@ share/emacs/${EMACS_VERSION}/lisp/printing.el.gz
 share/emacs/${EMACS_VERSION}/lisp/printing.elc
 share/emacs/${EMACS_VERSION}/lisp/proced.el.gz
 share/emacs/${EMACS_VERSION}/lisp/proced.elc
+share/emacs/${EMACS_VERSION}/lisp/profiler.el.gz
+share/emacs/${EMACS_VERSION}/lisp/profiler.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/ada-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/ada-mode.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/ada-prj.el.gz
@@ -3281,8 +3333,6 @@ share/emacs/${EMACS_VERSION}/lisp/progmodes/cwarn.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/cwarn.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/dcl-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/dcl-mode.elc
-share/emacs/${EMACS_VERSION}/lisp/progmodes/delphi.el.gz
-share/emacs/${EMACS_VERSION}/lisp/progmodes/delphi.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/ebnf-abn.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/ebnf-abn.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/ebnf-bnf.el.gz
@@ -3357,6 +3407,8 @@ share/emacs/${EMACS_VERSION}/lisp/progmodes/octave-inf.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/octave-inf.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/octave-mod.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/octave-mod.elc
+share/emacs/${EMACS_VERSION}/lisp/progmodes/opascal.el.gz
+share/emacs/${EMACS_VERSION}/lisp/progmodes/opascal.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/pascal.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/pascal.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/perl-mode.el.gz
@@ -3474,26 +3526,35 @@ share/emacs/${EMACS_VERSION}/lisp/tempo.el.gz
 share/emacs/${EMACS_VERSION}/lisp/tempo.elc
 share/emacs/${EMACS_VERSION}/lisp/term.el.gz
 share/emacs/${EMACS_VERSION}/lisp/term.elc
-share/emacs/${EMACS_VERSION}/lisp/term/AT386.el
+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
-share/emacs/${EMACS_VERSION}/lisp/term/bobcat.el
+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
 share/emacs/${EMACS_VERSION}/lisp/term/common-win.elc
-share/emacs/${EMACS_VERSION}/lisp/term/cygwin.el
+share/emacs/${EMACS_VERSION}/lisp/term/cygwin.el.gz
+share/emacs/${EMACS_VERSION}/lisp/term/cygwin.elc
 share/emacs/${EMACS_VERSION}/lisp/term/internal.el.gz
 share/emacs/${EMACS_VERSION}/lisp/term/internal.elc
-share/emacs/${EMACS_VERSION}/lisp/term/iris-ansi.el
-share/emacs/${EMACS_VERSION}/lisp/term/linux.el
-share/emacs/${EMACS_VERSION}/lisp/term/lk201.el
-share/emacs/${EMACS_VERSION}/lisp/term/news.el
+share/emacs/${EMACS_VERSION}/lisp/term/iris-ansi.el.gz
+share/emacs/${EMACS_VERSION}/lisp/term/iris-ansi.elc
+share/emacs/${EMACS_VERSION}/lisp/term/linux.el.gz
+share/emacs/${EMACS_VERSION}/lisp/term/linux.elc
+share/emacs/${EMACS_VERSION}/lisp/term/lk201.el.gz
+share/emacs/${EMACS_VERSION}/lisp/term/lk201.elc
+share/emacs/${EMACS_VERSION}/lisp/term/news.el.gz
+share/emacs/${EMACS_VERSION}/lisp/term/news.elc
 share/emacs/${EMACS_VERSION}/lisp/term/ns-win.el.gz
 share/emacs/${EMACS_VERSION}/lisp/term/ns-win.elc
 share/emacs/${EMACS_VERSION}/lisp/term/pc-win.el.gz
 share/emacs/${EMACS_VERSION}/lisp/term/pc-win.elc
 share/emacs/${EMACS_VERSION}/lisp/term/rxvt.el.gz
 share/emacs/${EMACS_VERSION}/lisp/term/rxvt.elc
-share/emacs/${EMACS_VERSION}/lisp/term/screen.el
+share/emacs/${EMACS_VERSION}/lisp/term/screen.el.gz
+share/emacs/${EMACS_VERSION}/lisp/term/screen.elc
 share/emacs/${EMACS_VERSION}/lisp/term/sun.el.gz
 share/emacs/${EMACS_VERSION}/lisp/term/sun.elc
 share/emacs/${EMACS_VERSION}/lisp/term/sup-mouse.el.gz
@@ -3504,27 +3565,36 @@ 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
-share/emacs/${EMACS_VERSION}/lisp/term/vt125.el
-share/emacs/${EMACS_VERSION}/lisp/term/vt200.el
-share/emacs/${EMACS_VERSION}/lisp/term/vt201.el
-share/emacs/${EMACS_VERSION}/lisp/term/vt220.el
-share/emacs/${EMACS_VERSION}/lisp/term/vt240.el
-share/emacs/${EMACS_VERSION}/lisp/term/vt300.el
-share/emacs/${EMACS_VERSION}/lisp/term/vt320.el
-share/emacs/${EMACS_VERSION}/lisp/term/vt400.el
-share/emacs/${EMACS_VERSION}/lisp/term/vt420.el
+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
 share/emacs/${EMACS_VERSION}/lisp/term/w32console.elc
-share/emacs/${EMACS_VERSION}/lisp/term/wyse50.el
+share/emacs/${EMACS_VERSION}/lisp/term/wyse50.el.gz
+share/emacs/${EMACS_VERSION}/lisp/term/wyse50.elc
 share/emacs/${EMACS_VERSION}/lisp/term/x-win.el.gz
 share/emacs/${EMACS_VERSION}/lisp/term/x-win.elc
 share/emacs/${EMACS_VERSION}/lisp/term/xterm.el.gz
 share/emacs/${EMACS_VERSION}/lisp/term/xterm.elc
-share/emacs/${EMACS_VERSION}/lisp/terminal.el.gz
-share/emacs/${EMACS_VERSION}/lisp/terminal.elc
 share/emacs/${EMACS_VERSION}/lisp/textmodes/artist.el.gz
 share/emacs/${EMACS_VERSION}/lisp/textmodes/artist.elc
 share/emacs/${EMACS_VERSION}/lisp/textmodes/bib-mode.el.gz
@@ -3651,6 +3721,8 @@ share/emacs/${EMACS_VERSION}/lisp/url/url-dav.el.gz
 share/emacs/${EMACS_VERSION}/lisp/url/url-dav.elc
 share/emacs/${EMACS_VERSION}/lisp/url/url-dired.el.gz
 share/emacs/${EMACS_VERSION}/lisp/url/url-dired.elc
+share/emacs/${EMACS_VERSION}/lisp/url/url-domsuf.el.gz
+share/emacs/${EMACS_VERSION}/lisp/url/url-domsuf.elc
 share/emacs/${EMACS_VERSION}/lisp/url/url-expand.el.gz
 share/emacs/${EMACS_VERSION}/lisp/url/url-expand.elc
 share/emacs/${EMACS_VERSION}/lisp/url/url-file.el.gz
@@ -3783,13 +3855,16 @@ share/emacs/${EMACS_VERSION}/lisp/vc/vc.el.gz
 share/emacs/${EMACS_VERSION}/lisp/vc/vc.elc
 share/emacs/${EMACS_VERSION}/lisp/vcursor.el.gz
 share/emacs/${EMACS_VERSION}/lisp/vcursor.elc
-share/emacs/${EMACS_VERSION}/lisp/version.el
+share/emacs/${EMACS_VERSION}/lisp/version.el.gz
+share/emacs/${EMACS_VERSION}/lisp/version.elc
 share/emacs/${EMACS_VERSION}/lisp/view.el.gz
 share/emacs/${EMACS_VERSION}/lisp/view.elc
 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
@@ -3822,12 +3897,8 @@ share/emacs/${EMACS_VERSION}/site-lisp/subdirs.el
 share/emacs/site-lisp/subdirs.el
 share/icons/hicolor/128x128/apps/emacs.png
 share/icons/hicolor/16x16/apps/emacs.png
-share/icons/hicolor/16x16/apps/emacs22.png
 share/icons/hicolor/24x24/apps/emacs.png
-share/icons/hicolor/24x24/apps/emacs22.png
 share/icons/hicolor/32x32/apps/emacs.png
-share/icons/hicolor/32x32/apps/emacs22.png
 share/icons/hicolor/48x48/apps/emacs.png
-share/icons/hicolor/48x48/apps/emacs22.png
 share/icons/hicolor/scalable/apps/emacs.svg
 share/icons/hicolor/scalable/mimetypes/emacs-document.svg
diff --git a/editors/emacs-snapshot/distinfo b/editors/emacs-snapshot/distinfo
index c55e3cab613..4d5d97ebe6e 100644
--- a/editors/emacs-snapshot/distinfo
+++ b/editors/emacs-snapshot/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.55 2012/03/21 23:05:02 minskim Exp $
+$NetBSD: distinfo,v 1.56 2013/02/12 04:47:31 minskim Exp $
 
-SHA1 (emacs-snapshot_20120319.orig.tar.xz) = dfa31663ccbac53553c82798b19c148c94229d8c
-RMD160 (emacs-snapshot_20120319.orig.tar.xz) = 8a7fe6443639c1a453f564f543d2d26a0ea7c57e
-Size (emacs-snapshot_20120319.orig.tar.xz) = 23475004 bytes
-SHA1 (patch-aa) = e77be157f2ad3c8002afe6c5483e61ff4769b85d
-SHA1 (patch-ac) = 7792cd247bcc40eafb4ec28f98bd0d2d9bd4b0c3
-SHA1 (patch-ad) = b8faf958f7ab3effd6c8dbcbf51fe70ddb2ecdae
+SHA1 (emacs-snapshot_20130207.orig.tar.xz) = dcf272866f5cb0d66d96e3774728497a4e976561
+RMD160 (emacs-snapshot_20130207.orig.tar.xz) = 93e61813ddf5383d9f28bf72037424f97458bc37
+Size (emacs-snapshot_20130207.orig.tar.xz) = 24269140 bytes
+SHA1 (patch-aa) = 9050d1ab70667c75fa422b07b7c07f7bd5034ce3
+SHA1 (patch-ad) = 5c2e132d64fddd900db762afee8086ff4f2d71da
 SHA1 (patch-ae) = 2dfe31015550feeaa47955136d3bbe2aa6790095
-SHA1 (patch-ag) = 2fc1d3fd953e595eb0ed1f3f5289a70a754e1aed
+SHA1 (patch-ag) = d7e0875965317b862fd65c42aba3b98c0548ca3e
diff --git a/editors/emacs-snapshot/options.mk b/editors/emacs-snapshot/options.mk
index 2713c1f36bd..8c11f638a6f 100644
--- a/editors/emacs-snapshot/options.mk
+++ b/editors/emacs-snapshot/options.mk
@@ -1,13 +1,13 @@
-# $NetBSD: options.mk,v 1.7 2011/10/09 14:02:06 obache Exp $
+# $NetBSD: options.mk,v 1.8 2013/02/12 04:47:31 minskim Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.emacs
-PKG_SUPPORTED_OPTIONS=	dbus xft2 svg
+PKG_SUPPORTED_OPTIONS=	dbus gconf gnutls imagemagick svg xft2
 PKG_OPTIONS_OPTIONAL_GROUPS+= window-system
 PKG_OPTIONS_GROUP.window-system= x11 nextstep
 PKG_OPTIONS_OPTIONAL_GROUPS+= toolkit
 PKG_OPTIONS_GROUP.toolkit= gtk motif xaw
-PKG_SUGGESTED_OPTIONS=	dbus svg x11 xft2
+PKG_SUGGESTED_OPTIONS=	dbus gconf gnutls imagemagick svg x11 xaw xft2
 
 .include "../../mk/bsd.options.mk"
 
@@ -21,6 +21,33 @@ CONFIGURE_ARGS+=	--without-dbus
 .  endif
 
 ###
+### Support gconf
+###
+.  if !empty(PKG_OPTIONS:Mgconf) && empty(PKG_OPTIONS:Mnextstep)
+.include "../../devel/gconfmm/buildlink3.mk"
+.  else
+CONFIGURE_ARGS+=	--without-gconf
+.  endif
+
+###
+### Support gnutls
+###
+.  if !empty(PKG_OPTIONS:Mgnutls)
+.include "../../security/gnutls/buildlink3.mk"
+.  else
+CONFIGURE_ARGS+=	--without-gnutls
+.  endif
+
+###
+### Support ImageMagick
+###
+.  if !empty(PKG_OPTIONS:Mimagemagick)
+.include "../../graphics/ImageMagick/buildlink3.mk"
+.  else
+CONFIGURE_ARGS+=	--without-imagemagic
+.  endif
+
+###
 ### Support SVG
 ###
 .  if !empty(PKG_OPTIONS:Msvg) && empty(PKG_OPTIONS:Mnextstep)
diff --git a/editors/emacs-snapshot/patches/patch-aa b/editors/emacs-snapshot/patches/patch-aa
index 1841cb8f917..d48d5d37fd5 100644
--- a/editors/emacs-snapshot/patches/patch-aa
+++ b/editors/emacs-snapshot/patches/patch-aa
@@ -1,11 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2011/12/09 01:35:08 marino Exp $
+$NetBSD: patch-aa,v 1.5 2013/02/12 04:47:31 minskim Exp $
 
---- configure.in.orig	2011-12-06 08:31:42.000000000 +0000
-+++ configure.in
-@@ -441,6 +441,14 @@ case "${canonical}" in
-       sparc64-*)        machine=sparc ;;
-     esac
+Add DragonFly configuration.
+
+--- configure.ac.orig	2013-02-07 14:39:42.000000000 +0000
++++ configure.ac
+@@ -428,6 +428,15 @@ case "${canonical}" in
+     opsys=gnu-linux
    ;;
+ 
 +  ## DragonFly ports
 +  *-*-dragonfly*)
 +    opsys=dragonfly
@@ -14,10 +16,11 @@ $NetBSD: patch-aa,v 1.4 2011/12/09 01:35:08 marino Exp $
 +      amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;;
 +    esac
 +  ;;
- 
-   ## FreeBSD kernel + glibc based userland
-   *-*-kfreebsd*gnu* )
-@@ -956,6 +964,8 @@ case "$opsys" in
++
+   ## FreeBSD ports
+   *-*-freebsd* )
+     opsys=freebsd
+@@ -1014,6 +1023,8 @@ case "$opsys" in
  
    freebsd) LIBS_SYSTEM="-lutil" ;;
  
@@ -26,7 +29,7 @@ $NetBSD: patch-aa,v 1.4 2011/12/09 01:35:08 marino Exp $
    hpux*) LIBS_SYSTEM="-l:libdld.sl" ;;
  
    sol2*) LIBS_SYSTEM="-lsocket -lnsl" ;;
-@@ -1010,6 +1020,10 @@ case $opsys in
+@@ -1071,6 +1082,10 @@ case $opsys in
      LIB_STANDARD=-lc
      START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o'
      ;;
diff --git a/editors/emacs-snapshot/patches/patch-ac b/editors/emacs-snapshot/patches/patch-ac
deleted file mode 100644
index 51e307e8783..00000000000
--- a/editors/emacs-snapshot/patches/patch-ac
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2011/05/20 22:56:39 minskim Exp $
-
---- Makefile.in.orig	2011-05-19 07:55:34.000000000 +0000
-+++ Makefile.in
-@@ -132,7 +132,7 @@ MAN_PAGES=ctags.1 ebrowse.1 emacs.1 emac
- infodir=@infodir@
- INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse	\
-            ede ediff edt eieio efaq eintr elisp emacs emacs-mime epa erc \
--	   ert eshell eudc flymake forms gnus idlwave info mairix-el	\
-+	   ert eshell eudc flymake forms gnus idlwave mairix-el	\
- 	   message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc	\
- 	   reftex remember sasl sc semantic ses sieve smtpmail speedbar \
- 	   tramp url vip viper widget woman
-@@ -460,7 +460,7 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INP
- install: all install-arch-indep install-arch-dep install-leim blessmail
- 	@true
- 
--MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done
-+MV_DIRS = for i in $$dir; do if test -e $$i ; then rm -fr `basename "$$i"` ; mv "$$i" . ; fi; done
- 
- ### Install the executables that were compiled specifically for this machine.
- ### It would be nice to do something for a parallel make
-@@ -626,7 +626,6 @@ install-arch-indep: mkdir info install-e
- 	      test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
- 	      for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
- 	        ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
--	        chmod a+r $(DESTDIR)${infodir}/$$f; \
- 	        if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
- 	          rm -f $(DESTDIR)${infodir}/$$f.gz; \
- 	          ${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \
-@@ -635,16 +634,7 @@ install-arch-indep: mkdir info install-e
- 	   done); \
- 	else true; fi
- 	-unset CDPATH; \
--	thisdir=`/bin/pwd`; \
--	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \
--	then \
--	  for elt in $(INFO_FILES); do \
--	    test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
--	    (cd $${thisdir}; \
--	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
--	  done; \
--	else true; fi
--	-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
-+	chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
- 	thisdir=`/bin/pwd`; \
- 	cd ${mansrcdir}; \
- 	for page in ${MAN_PAGES}; do \
diff --git a/editors/emacs-snapshot/patches/patch-ad b/editors/emacs-snapshot/patches/patch-ad
index 569ee42d27c..bf0dabc6955 100644
--- a/editors/emacs-snapshot/patches/patch-ad
+++ b/editors/emacs-snapshot/patches/patch-ad
@@ -1,4 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2010/06/07 22:44:01 minskim Exp $
+$NetBSD: patch-ad,v 1.2 2013/02/12 04:47:32 minskim Exp $
+
+Magic line to avoid segmentation fault during build (not always happen).
 
 --- lisp/cus-dep.el.orig	2010-06-02 09:53:41.000000000 -0700
 +++ lisp/cus-dep.el
diff --git a/editors/emacs-snapshot/patches/patch-ag b/editors/emacs-snapshot/patches/patch-ag
index d94c9867e65..3d880433ab6 100644
--- a/editors/emacs-snapshot/patches/patch-ag
+++ b/editors/emacs-snapshot/patches/patch-ag
@@ -1,20 +1,20 @@
-$NetBSD: patch-ag,v 1.3 2010/06/07 22:44:01 minskim Exp $
+$NetBSD: patch-ag,v 1.4 2013/02/12 04:47:32 minskim Exp $
 
 When running terminfo but compiled for termcap, we cannot assume
 that we actually have anything useable in termcap_term_buffer so just
 use the terminfo fixed size defined ealier.
 
---- src/term.c.orig	2010-06-02 16:53:42.000000000 +0000
-+++ src/term.c
-@@ -3635,11 +3635,6 @@ use the Bourne shell command `TERM=... e
+--- src/term.c.orig	2013-01-31 02:44:41.000000000 +0900
++++ src/term.c	2013-02-07 23:03:54.000000000 +0900
+@@ -3072,11 +3072,6 @@ use the Bourne shell command `TERM=... e
                     terminal_type);
      }
  
 -#ifndef TERMINFO
 -  if (strlen (tty->termcap_term_buffer) >= buffer_size)
--    abort ();
+-    emacs_abort ();
 -  buffer_size = strlen (tty->termcap_term_buffer);
 -#endif
-   tty->termcap_strings_buffer = area = (char *) xmalloc (buffer_size);
+   tty->termcap_strings_buffer = area = xmalloc (buffer_size);
    tty->TS_ins_line = tgetstr ("al", address);
    tty->TS_ins_multi_lines = tgetstr ("AL", address);
diff --git a/editors/emacs-snapshot/version.mk b/editors/emacs-snapshot/version.mk
index 46b7a4104f6..928e83d81bb 100644
--- a/editors/emacs-snapshot/version.mk
+++ b/editors/emacs-snapshot/version.mk
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.12 2012/03/06 03:01:30 minskim Exp $
+# $NetBSD: version.mk,v 1.13 2013/02/12 04:47:31 minskim Exp $
 
 _EMACS_FLAVOR=	emacs
 _EMACS_REQD=	emacs>=23
@@ -6,5 +6,5 @@ _EMACS_PKGDEP.base=
 _EMACS_PKGDEP.leim=
 
 _EMACS_VERSION_MAJOR=	24
-_EMACS_VERSION_MINOR=	0
-_EMACS_VERSION_MICRO=	94
+_EMACS_VERSION_MINOR=	3
+_EMACS_VERSION_MICRO=	50