Update to 24.3:

Highlights of this release include:
 Generalized variables are now in core Emacs Lisp.
 An update for the Common Lisp emulation library.
 A new major mode for Python.

(The operating system support framework was changed -- Dragonfly
support might need fixes.)

9 files changed, 226 insertions, 290 deletions

diff --git a/editors/emacs24/Makefile b/editors/emacs24/Makefile
index c8a874afb09..9aa61ff2822 100644
--- a/editors/emacs24/Makefile
+++ b/editors/emacs24/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/02/17 06:07:25 dholland Exp $
-
-PKGREVISION=	6
+# $NetBSD: Makefile,v 1.14 2013/03/15 22:44:59 wiz Exp $
 
 CONFLICTS+=	emacs24-nox11-[0-9]*
 
diff --git a/editors/emacs24/Makefile.common b/editors/emacs24/Makefile.common
index 10970181093..5b7c64e5eef 100644
--- a/editors/emacs24/Makefile.common
+++ b/editors/emacs24/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2013/02/17 06:07:25 dholland Exp $
+# $NetBSD: Makefile.common,v 1.4 2013/03/15 22:44:59 wiz Exp $
 #
 # used by editors/emacs24/Makefile
 # used by editors/emacs24-nox11/Makefile
@@ -20,7 +20,7 @@ CONFLICTS+=	emacs-nox11-[0-9]*
 
 GNU_CONFIGURE=	yes
 INFO_FILES=	yes
-USE_TOOLS+=	gmake makeinfo gzip
+USE_TOOLS+=	autoconf automake gmake makeinfo gzip
 
 CONFIGURE_ARGS+=	--srcdir=${WRKSRC}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
@@ -74,6 +74,5 @@ CPPFLAGS+=	-DTERMINFO
 
 post-extract:
 	cp ${.CURDIR}/../../editors/emacs23/files/site-init.el ${WRKSRC}/lisp
-	cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
 	${CHMOD} -R go-w ${WRKSRC}
 	${CHMOD} ugo+rx ${WRKSRC}/leim/ja-dic ${WRKSRC}/leim/quail
diff --git a/editors/emacs24/PLIST b/editors/emacs24/PLIST
index 46d65cf7aec..c2ca3b9ed29 100644
--- a/editors/emacs24/PLIST
+++ b/editors/emacs24/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/06/26 17:02:31 asau Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/03/15 22:45:00 wiz Exp $
 bin/ctags
 bin/ebrowse
 bin/emacs
@@ -6,73 +6,74 @@ bin/emacs-${EMACS_VERSION}
 bin/emacsclient
 bin/etags
 bin/grep-changelog
-bin/rcs-checkin
-info/ada-mode.gz
-info/auth.gz
-info/autotype.gz
-info/calc.gz
-info/ccmode.gz
-info/cl.gz
-info/dbus.gz
-info/dired-x.gz
-info/ebrowse.gz
-info/ede.gz
-info/ediff.gz
-info/edt.gz
-info/efaq.gz
-info/eieio.gz
-info/eintr.gz
-info/elisp.gz
-info/emacs-gnutls.gz
-info/emacs-mime.gz
-info/emacs.gz
-info/epa.gz
-info/erc.gz
-info/ert.gz
-info/eshell.gz
-info/eudc.gz
-info/flymake.gz
-info/forms.gz
-info/gnus.gz
-info/idlwave.gz
-info/info.gz
-info/mairix-el.gz
-info/message.gz
-info/mh-e.gz
-info/newsticker.gz
-info/nxml-mode.gz
-info/org.gz
-info/pcl-cvs.gz
-info/pgg.gz
-info/rcirc.gz
-info/reftex.gz
-info/remember.gz
-info/sasl.gz
-info/sc.gz
-info/semantic.gz
-info/ses.gz
-info/sieve.gz
-info/smtpmail.gz
-info/speedbar.gz
-info/tramp.gz
-info/url.gz
-info/vip.gz
-info/viper.gz
-info/widget.gz
-info/woman.gz
+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/CENSORSHIP
@@ -261,11 +262,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
@@ -835,6 +836,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
@@ -848,6 +850,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
@@ -927,11 +930,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
@@ -1095,6 +1100,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
@@ -1400,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
@@ -1521,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
@@ -1661,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
@@ -1693,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
@@ -1753,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
@@ -1885,6 +1895,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
@@ -2041,8 +2053,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
@@ -2120,6 +2130,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
@@ -2180,6 +2192,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
@@ -2456,8 +2470,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
@@ -2466,16 +2482,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
@@ -2486,38 +2506,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
@@ -2559,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
@@ -2677,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
@@ -2864,12 +2889,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
@@ -2883,18 +2913,25 @@ 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/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
@@ -2959,6 +2996,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
@@ -3001,6 +3040,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
@@ -3051,6 +3092,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
@@ -3083,8 +3126,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
@@ -3093,6 +3135,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
@@ -3133,6 +3176,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
@@ -3149,8 +3193,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
@@ -3169,7 +3211,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
@@ -3224,6 +3265,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
@@ -3477,26 +3520,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
@@ -3507,21 +3559,32 @@ 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
@@ -3654,6 +3717,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
@@ -3786,13 +3851,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
@@ -3825,12 +3893,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/emacs24/distinfo b/editors/emacs24/distinfo
index b7de5355b00..58075c9a168 100644
--- a/editors/emacs24/distinfo
+++ b/editors/emacs24/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.8 2012/12/15 12:27:45 marino Exp $
+$NetBSD: distinfo,v 1.9 2013/03/15 22:45:00 wiz Exp $
 
-SHA1 (emacs-24.2.tar.gz) = 5fc4fe7797f821f2021ac415a81f5f190c52c0b2
-RMD160 (emacs-24.2.tar.gz) = 26f6c2b671ed7f160875d62e47c89afec085110f
-Size (emacs-24.2.tar.gz) = 51471017 bytes
-SHA1 (patch-aa) = 114549ab6988d5473f2358b17f3229811f7fbba4
-SHA1 (patch-ab) = 44b5a84b440b4e207ae805b075491d7fed7b804b
+SHA1 (emacs-24.3.tar.gz) = 3c672a176df06e20d2661058ad49893f184b4956
+RMD160 (emacs-24.3.tar.gz) = b67e847861002bbb76ae6588ff659408763313cf
+Size (emacs-24.3.tar.gz) = 52543898 bytes
+SHA1 (patch-aa) = 0a7b298996c482f6c736597f66b34c992421e3ce
+SHA1 (patch-ab) = 043e6bb77ef2623424b4142cd137101ab2c8a295
 SHA1 (patch-ad) = 2dcb0f4b43c599d0c4af83b5f7e1f2797f96bdac
-SHA1 (patch-ag) = 3e6ee4774189185af10eada9c935120491318313
+SHA1 (patch-ag) = 407d34e97356c2e8bee26f0fd90f116dd194afcb
 SHA1 (patch-lib-careadlinkat.h) = f236d182e609bf7111c70e83e10806a75a220c29
-SHA1 (patch-src-s-bsd--common.h) = bea4405e7cbe0a71b41f8ea52030eeb629d95a40
diff --git a/editors/emacs24/files/dragonfly.h b/editors/emacs24/files/dragonfly.h
deleted file mode 100644
index c02b96ad84b..00000000000
--- a/editors/emacs24/files/dragonfly.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* System description header for DragonFly systems.
-   This file describes the parameters that system description files
-   should define or not.
-   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-   Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* Get most of the stuff from bsd-common */
-#include "bsd-common.h"
-
-/* For mem-limits.h. */
-#define BSD4_2
-
-/* These aren't needed, since we have getloadavg.  */
-#undef KERNEL_FILE
-#undef LDAV_SYMBOL
-
-#define PENDING_OUTPUT_COUNT(FILE) __fpending(FILE)
-
-#define LIBS_DEBUG
-#define LIBS_SYSTEM -lutil
-#define TERMINFO
-#define LIBS_TERMCAP -lncurses
-#define SYSV_SYSTEM_DIR
-
-/* freebsd has POSIX-style pgrp behavior. */
-#undef BSD_PGRPS
-#define GETPGRP_NO_ARG
-
-#define ORDINARY_LINK
-#define START_FILES
-#define LIB_STANDARD -lc
-
-#define LD_SWITCH_SYSTEM_1
-#define UNEXEC unexelf.o
-#undef LIB_GCC
-#define LIB_GCC
-
-#define HAVE_WAIT_HEADER
-#define HAVE_GETLOADAVG 1
-#define HAVE_TERMIOS
-#define NO_TERMIO
-#define DECLARE_GETPWUID_WITH_UID_T
-
-/* freebsd uses OXTABS instead of the expected TAB3. */
-#define TABDLY OXTABS
-#define TAB3 OXTABS
-
-/* this silences a few compilation warnings */
-#undef BSD_SYSTEM
-#define BSD_SYSTEM 199506
-
-/* Needed to avoid hanging when child process writes an error message
-   and exits -- enami tsugutomo <enami@ba2.so-net.or.jp>.  */
-#define vfork fork
-
-/* Don't close pty in process.c to make it as controlling terminal.
-   It is already a controlling terminal of subprocess, because we did
-   ioctl TIOCSCTTY.  */
-#define DONT_REOPEN_PTY
-
-/* If the system's imake configuration file defines `NeedWidePrototypes'
-   as `NO', we must define NARROWPROTO manually.  Such a define is
-   generated in the Makefile generated by `xmkmf'.  If we don't 
-   define NARROWPROTO, we will see the wrong function prototypes
-   for X functions taking float or double parameters.  */
-
-#define NARROWPROTO 1
-
-#define C_SWITCH_SYSTEM
-#define LD_SWITCH_SYSTEM
-
-/* Circumvent a bug in FreeBSD.  In the following sequence of
-   writes/reads on a PTY, read(2) returns bogus data:
-
-   write(2)  1022 bytes
-   write(2)   954 bytes, get EAGAIN
-   read(2)   1024 bytes in process_read_output
-   read(2)     11 bytes in process_read_output
-
-   That is, read(2) returns more bytes than have ever been written
-   successfully.  The 1033 bytes read are the 1022 bytes written
-   successfully after processing (for example with CRs added if the
-   terminal is set up that way which it is here).  The same bytes will
-   be seen again in a later read(2), without the CRs.  */
-
-#define BROKEN_PTY_READ_AFTER_EAGAIN 1
-
-/* Tell that garbage collector that setjmp is known to save all
-   registers relevant for conservative garbage collection in the
-   jmp_buf.  */
-
-#define GC_SETJMP_WORKS 1
-
-/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the
-   stack.  */
-
-#define GC_MARK_STACK 	GC_MAKE_GCPROS_NOOPS
-
-/* Define USE_MMAP_FOR_BUFFERS to let Emacs use mmap(2) to allocate
-   buffer text.  This overrides REL_ALLOC.  */
-
-#define USE_MMAP_FOR_BUFFERS	1
-
-/* Use sigprocmask(2) and friends instead of sigblock(2); the man page
-   of sigblock says it is obsolete.  */
-
-#define POSIX_SIGNALS		1
diff --git a/editors/emacs24/patches/patch-aa b/editors/emacs24/patches/patch-aa
index d36e9604fd1..6a2a49ca957 100644
--- a/editors/emacs24/patches/patch-aa
+++ b/editors/emacs24/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.5 2012/12/15 12:27:45 marino Exp $
+$NetBSD: patch-aa,v 1.6 2013/03/15 22:45:00 wiz Exp $
 
 Add DragonFly
 
---- configure.in.orig	2012-08-23 05:33:42.000000000 +0000
-+++ configure.in
-@@ -469,6 +469,14 @@ case "${canonical}" in
-       vax-*)       machine=vax ;;
-     esac
+--- configure.ac.orig	2013-03-05 08:24:59.000000000 +0000
++++ configure.ac
+@@ -476,6 +476,14 @@ case "${canonical}" in
+   powerpc-ibm-aix[56]*  )
+     opsys=aix4-2
    ;;
 +  ## DragonFly ports
 +  *-*-dragonfly*)
@@ -17,9 +17,9 @@ Add DragonFly
 +    esac
 +  ;;
  
-   ## OpenBSD ports
-   *-*-openbsd* )
-@@ -955,7 +955,7 @@
+   ## Silicon Graphics machines
+   ## Iris 4D
+@@ -992,7 +1000,7 @@ case "$opsys" in
    ## IBM's X11R5 uses -lIM and -liconv in AIX 3.2.2.
    aix4-2) LIBS_SYSTEM="-lrts -lIM -liconv" ;;
  
@@ -28,7 +28,7 @@ Add DragonFly
  
    hpux*) LIBS_SYSTEM="-l:libdld.sl" ;;
  
-@@ -999,6 +1007,11 @@ case $opsys in
+@@ -1038,6 +1046,11 @@ case $opsys in
      LIB_MATH=
      START_FILES='pre-crt0.o'
      ;;
@@ -38,9 +38,9 @@ Add DragonFly
 +    START_FILES='$(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o'
 +    ;;
    freebsd )
-     LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o'
-     START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o $(CRT_DIR)/crtbegin.o'
-@@ -1095,6 +1108,28 @@ fi                              # crt_fi
+     LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtn.o'
+     START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o'
+@@ -1143,6 +1156,28 @@ fi                              # crt_fi
  AC_SUBST(CRT_DIR)
  
  case $opsys in
diff --git a/editors/emacs24/patches/patch-ab b/editors/emacs24/patches/patch-ab
index 967038af4d9..74b545436af 100644
--- a/editors/emacs24/patches/patch-ab
+++ b/editors/emacs24/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.5 2012/12/15 12:27:45 marino Exp $
+$NetBSD: patch-ab,v 1.6 2013/03/15 22:45:00 wiz Exp $
 
 Add DragonFly
 
---- configure.orig	2012-08-23 06:37:10.000000000 +0000
+--- configure.orig	2013-03-08 08:13:36.000000000 +0000
 +++ configure
-@@ -4476,6 +4476,15 @@ case "${canonical}" in
-     esac
+@@ -4539,6 +4539,15 @@ case "${canonical}" in
+     opsys=netbsd
    ;;
  
 +  ## DragonFly ports
@@ -20,7 +20,7 @@ Add DragonFly
    ## OpenBSD ports
    *-*-openbsd* )
      opsys=openbsd
-@@ -7854,7 +7854,7 @@
+@@ -8341,7 +8350,7 @@ case "$opsys" in
    ## IBM's X11R5 uses -lIM and -liconv in AIX 3.2.2.
    aix4-2) LIBS_SYSTEM="-lrts -lIM -liconv" ;;
  
@@ -29,7 +29,7 @@ Add DragonFly
  
    hpux*) LIBS_SYSTEM="-l:libdld.sl" ;;
  
-@@ -8095,6 +8104,11 @@ case $opsys in
+@@ -8382,6 +8391,11 @@ case $opsys in
      LIB_MATH=
      START_FILES='pre-crt0.o'
      ;;
@@ -39,9 +39,9 @@ Add DragonFly
 +    START_FILES='$(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o'
 +    ;;
    freebsd )
-     LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o'
-     START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o $(CRT_DIR)/crtbegin.o'
-@@ -8209,6 +8223,51 @@ fi                              # crt_fi
+     LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtn.o'
+     START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o'
+@@ -8508,6 +8522,51 @@ fi                              # crt_fi
  
  
  case $opsys in
diff --git a/editors/emacs24/patches/patch-ag b/editors/emacs24/patches/patch-ag
index 09d6a7bd417..12833e705c9 100644
--- a/editors/emacs24/patches/patch-ag
+++ b/editors/emacs24/patches/patch-ag
@@ -1,20 +1,20 @@
-$NetBSD: patch-ag,v 1.1 2012/06/16 21:03:42 dholland Exp $
+$NetBSD: patch-ag,v 1.2 2013/03/15 22:45:00 wiz 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 2010-01-06 10:11:04.000000000 +0000
-+++ src/term.c	2012-06-09 13:23:09.000000000 +0900
-@@ -3161,11 +3161,6 @@
+--- src/term.c.orig	2013-01-01 20:37:17.000000000 +0000
++++ src/term.c
+@@ -3111,11 +3111,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/emacs24/version.mk b/editors/emacs24/version.mk
index f0100db4ca8..ca535adc0e3 100644
--- a/editors/emacs24/version.mk
+++ b/editors/emacs24/version.mk
@@ -1,7 +1,7 @@
-# $NetBSD: version.mk,v 1.4 2013/03/07 22:04:39 joerg Exp $
+# $NetBSD: version.mk,v 1.5 2013/03/15 22:45:00 wiz Exp $
 
 _EMACS_FLAVOR=	emacs
-_EMACS_REQD=	emacs24>=24.1<24.3
+_EMACS_REQD=	emacs24>=24.1<24.4
 
 _EMACS_VERSION_MAJOR=	24
-_EMACS_VERSION_MINOR=	2
+_EMACS_VERSION_MINOR=	3