Update emacs-snapshot to 24.0.50.20100602. Based on the patch provided

by Makoto Fujiwara in PR 43415.

Notable changes since 23.2:
	* Fix alloca definition when using gcc on non-gnu systems.
	* font.c (font_range): Return the range for the font found at first.
	* xdisp.c (init_iterator): Don't turn on bidi reordering in
	unibyte buffers.  See
	http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00263.html.

10 files changed, 118 insertions, 50 deletions

diff --git a/editors/emacs-snapshot/Makefile b/editors/emacs-snapshot/Makefile
index cda48fff7cb..a31f8da571b 100644
--- a/editors/emacs-snapshot/Makefile
+++ b/editors/emacs-snapshot/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.11 2010/02/19 20:37:08 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/07 22:44:01 minskim Exp $
 
-PKGREVISION=	4
 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 0b5d1daf694..8b65660f582 100644
--- a/editors/emacs-snapshot/Makefile.common
+++ b/editors/emacs-snapshot/Makefile.common
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.common,v 1.4 2010/05/30 12:29:12 joerg Exp $
+# $NetBSD: Makefile.common,v 1.5 2010/06/07 22:44:01 minskim Exp $
 
-DISTNAME=	emacs-snapshot_20100217.orig
+DISTNAME=	emacs-snapshot_20100602.orig
 PKGNAME=	${DISTNAME:S/snapshot_/${EMACS_VERSION}./:S/.orig//}
 CATEGORIES=	editors
 MASTER_SITES=	http://emacs.orebokech.com/pool/main/e/emacs-snapshot/
+EXTRACT_SUFX=	.tar.lzma
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
diff --git a/editors/emacs-snapshot/PLIST b/editors/emacs-snapshot/PLIST
index f0a15741f97..ef7287482ce 100644
--- a/editors/emacs-snapshot/PLIST
+++ b/editors/emacs-snapshot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2010/02/19 19:04:11 minskim Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/06/07 22:44:01 minskim Exp $
 bin/b2m
 bin/ctags
 bin/ebrowse
@@ -63,10 +63,8 @@ libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/fakemail
 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}/sorted-doc
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/update-game-score
-libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/vcdiff
 man/man1/b2m.1
 man/man1/ctags.1
 man/man1/ebrowse.1
@@ -108,6 +106,7 @@ share/emacs/${EMACS_VERSION}/etc/NEWS.19
 share/emacs/${EMACS_VERSION}/etc/NEWS.20
 share/emacs/${EMACS_VERSION}/etc/NEWS.21
 share/emacs/${EMACS_VERSION}/etc/NEWS.22
+share/emacs/${EMACS_VERSION}/etc/NEWS.23
 share/emacs/${EMACS_VERSION}/etc/NXML-NEWS
 share/emacs/${EMACS_VERSION}/etc/ORDERS
 share/emacs/${EMACS_VERSION}/etc/PROBLEMS
@@ -1376,6 +1375,8 @@ share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/ia.el.gz
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/ia.elc
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/idle.el.gz
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/idle.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/imenu.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/imenu.elc
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/java.el.gz
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/java.elc
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/lex-spp.el.gz
@@ -1498,8 +1499,6 @@ share/emacs/${EMACS_VERSION}/lisp/comint.el.gz
 share/emacs/${EMACS_VERSION}/lisp/comint.elc
 share/emacs/${EMACS_VERSION}/lisp/compare-w.el.gz
 share/emacs/${EMACS_VERSION}/lisp/compare-w.elc
-share/emacs/${EMACS_VERSION}/lisp/complete.el.gz
-share/emacs/${EMACS_VERSION}/lisp/complete.elc
 share/emacs/${EMACS_VERSION}/lisp/completion.el.gz
 share/emacs/${EMACS_VERSION}/lisp/completion.elc
 share/emacs/${EMACS_VERSION}/lisp/composite.el.gz
@@ -1557,6 +1556,8 @@ share/emacs/${EMACS_VERSION}/lisp/dos-w32.el.gz
 share/emacs/${EMACS_VERSION}/lisp/dos-w32.elc
 share/emacs/${EMACS_VERSION}/lisp/double.el.gz
 share/emacs/${EMACS_VERSION}/lisp/double.elc
+share/emacs/${EMACS_VERSION}/lisp/dynamic-setting.el.gz
+share/emacs/${EMACS_VERSION}/lisp/dynamic-setting.elc
 share/emacs/${EMACS_VERSION}/lisp/ebuff-menu.el.gz
 share/emacs/${EMACS_VERSION}/lisp/ebuff-menu.elc
 share/emacs/${EMACS_VERSION}/lisp/echistory.el.gz
@@ -1711,6 +1712,8 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/rx.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/rx.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/shadow.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/shadow.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/smie.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/smie.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/sregex.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/sregex.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/syntax.el.gz
@@ -1971,8 +1974,6 @@ share/emacs/${EMACS_VERSION}/lisp/font-core.el.gz
 share/emacs/${EMACS_VERSION}/lisp/font-core.elc
 share/emacs/${EMACS_VERSION}/lisp/font-lock.el.gz
 share/emacs/${EMACS_VERSION}/lisp/font-lock.elc
-share/emacs/${EMACS_VERSION}/lisp/font-setting.el.gz
-share/emacs/${EMACS_VERSION}/lisp/font-setting.elc
 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
@@ -2707,6 +2708,8 @@ share/emacs/${EMACS_VERSION}/lisp/net/sasl-ntlm.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/sasl-ntlm.elc
 share/emacs/${EMACS_VERSION}/lisp/net/sasl.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/sasl.elc
+share/emacs/${EMACS_VERSION}/lisp/net/secrets.el.gz
+share/emacs/${EMACS_VERSION}/lisp/net/secrets.elc
 share/emacs/${EMACS_VERSION}/lisp/net/snmp-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/snmp-mode.elc
 share/emacs/${EMACS_VERSION}/lisp/net/socks.el.gz
@@ -2800,6 +2803,8 @@ 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/awk-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/awk-mode.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/complete.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/complete.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/fast-lock.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/fast-lock.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/iso-acc.el.gz
@@ -2825,6 +2830,8 @@ share/emacs/${EMACS_VERSION}/lisp/obsolete/rnews.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/rnews.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/rnewspost.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/rnewspost.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/s-region.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/s-region.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/sc.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/sc.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/scribe.el.gz
@@ -2847,6 +2854,8 @@ share/emacs/${EMACS_VERSION}/lisp/org/org-attach.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-attach.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-bbdb.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-bbdb.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-beamer.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-beamer.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-bibtex.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-bibtex.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-clock.el.gz
@@ -2857,10 +2866,16 @@ share/emacs/${EMACS_VERSION}/lisp/org/org-compat.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-compat.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-crypt.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-crypt.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-ctags.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-ctags.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-datetree.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-datetree.elc
 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-entities.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-entities.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-exp-blocks.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-exp-blocks.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-exp.el.gz
@@ -3128,8 +3143,8 @@ share/emacs/${EMACS_VERSION}/lisp/progmodes/flymake.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/flymake.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/fortran.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/fortran.elc
-share/emacs/${EMACS_VERSION}/lisp/progmodes/gdb-ui.el.gz
-share/emacs/${EMACS_VERSION}/lisp/progmodes/gdb-ui.elc
+share/emacs/${EMACS_VERSION}/lisp/progmodes/gdb-mi.el.gz
+share/emacs/${EMACS_VERSION}/lisp/progmodes/gdb-mi.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/glasses.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/glasses.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/grep.el.gz
@@ -3238,8 +3253,6 @@ share/emacs/${EMACS_VERSION}/lisp/rot13.el.gz
 share/emacs/${EMACS_VERSION}/lisp/rot13.elc
 share/emacs/${EMACS_VERSION}/lisp/ruler-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/ruler-mode.elc
-share/emacs/${EMACS_VERSION}/lisp/s-region.el.gz
-share/emacs/${EMACS_VERSION}/lisp/s-region.elc
 share/emacs/${EMACS_VERSION}/lisp/savehist.el.gz
 share/emacs/${EMACS_VERSION}/lisp/savehist.elc
 share/emacs/${EMACS_VERSION}/lisp/saveplace.el.gz
diff --git a/editors/emacs-snapshot/distinfo b/editors/emacs-snapshot/distinfo
index ce285e9fd45..75a887453cc 100644
--- a/editors/emacs-snapshot/distinfo
+++ b/editors/emacs-snapshot/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.8 2010/02/21 12:26:47 wiz Exp $
+$NetBSD: distinfo,v 1.9 2010/06/07 22:44:01 minskim Exp $
 
-SHA1 (emacs-snapshot_20100217.orig.tar.gz) = 835968ac4bcbd98c5d01e3f53b2d551433a5e44f
-RMD160 (emacs-snapshot_20100217.orig.tar.gz) = 7dee7d4647c491ccbd43812548b9559731e75f46
-Size (emacs-snapshot_20100217.orig.tar.gz) = 30930810 bytes
-SHA1 (patch-ab) = 53fd489995efae908827d7a3de4811daf156fd0a
+SHA1 (emacs-snapshot_20100602.orig.tar.lzma) = 2434c371f777c5c57e76a7ff6d820c05e2a22c7a
+RMD160 (emacs-snapshot_20100602.orig.tar.lzma) = c5c8b5dbcaa93f33cea352fb5b94479802c2c5bc
+Size (emacs-snapshot_20100602.orig.tar.lzma) = 22539618 bytes
+SHA1 (patch-aa) = de76919bedcdfaffe567bc80633a9e908714ec2b
+SHA1 (patch-ab) = f40d65cdbce564de8f7f5a5f8ec64f9ab747d157
 SHA1 (patch-ac) = 9378586aa9720beebf19b9d54e94ef4f08e50745
-SHA1 (patch-ag) = 14508236b1092c0ab4765b0a7064e3f9443ade5d
+SHA1 (patch-ad) = b8faf958f7ab3effd6c8dbcbf51fe70ddb2ecdae
+SHA1 (patch-ag) = 2fc1d3fd953e595eb0ed1f3f5289a70a754e1aed
diff --git a/editors/emacs-snapshot/options.mk b/editors/emacs-snapshot/options.mk
index 402a04169fb..9fab2f59929 100644
--- a/editors/emacs-snapshot/options.mk
+++ b/editors/emacs-snapshot/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2010/02/19 19:04:11 minskim Exp $
+# $NetBSD: options.mk,v 1.4 2010/06/07 22:44:01 minskim Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.emacs
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+=	--without-dbus
 ###
 ### Support SVG
 ###
-.  if !empty(PKG_OPTIONS:Msvg)
+.  if !empty(PKG_OPTIONS:Msvg) && empty(PKG_OPTIONS:Mnextstep)
 .include "../../graphics/librsvg/buildlink3.mk"
 .  else
 CONFIGURE_ARGS+=	--without-rsvg
diff --git a/editors/emacs-snapshot/patches/patch-aa b/editors/emacs-snapshot/patches/patch-aa
new file mode 100644
index 00000000000..270d87db2ef
--- /dev/null
+++ b/editors/emacs-snapshot/patches/patch-aa
@@ -0,0 +1,39 @@
+$NetBSD: patch-aa,v 1.1 2010/06/07 22:44:01 minskim Exp $
+
+--- configure.in.orig	2010-06-02 16:53:45.000000000 +0000
++++ configure.in
+@@ -45,7 +45,7 @@ archlibdir='${libexecdir}/emacs/${versio
+ docdir='${datadir}/emacs/${version}/etc'
+ gamedir='${localstatedir}/games/emacs'
+ 
+-gameuser=games
++gameuser=${GAMEOWN}
+ 
+ dnl OPTION_DEFAULT_OFF(NAME, HELP-STRING)
+ dnl Create a new --with option that defaults to being disabled.
+@@ -403,6 +403,14 @@ case "${canonical}" in
+       sparc64-*)        machine=sparc ;;
+     esac
+   ;;
++  ## DragonFly ports
++  *-*-dragonfly*)
++    opsys=dragonfly
++    case "${canonical}" in
++      i[3456]86-*-dragonfly*)     machine=intel386 ;;
++      amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;;
++    esac
++  ;;
+ 
+   ## FreeBSD kernel + glibc based userland
+   *-*-kfreebsd*gnu* )
+@@ -1527,9 +1535,9 @@ if test "${HAVE_NS}" = yes; then
+   window_system=nextstep
+   with_xft=no
+   # set up packaging dirs
++  if test "${EN_NS_SELF_CONTAINED}" = yes; then
+   exec_prefix=${ns_appbindir}
+   libexecdir=${ns_appbindir}/libexec
+-  if test "${EN_NS_SELF_CONTAINED}" = yes; then
+      prefix=${ns_appresdir}
+   fi
+   ns_frag=$srcdir/src/ns.mk
diff --git a/editors/emacs-snapshot/patches/patch-ab b/editors/emacs-snapshot/patches/patch-ab
index c89a9464cac..786cc234883 100644
--- a/editors/emacs-snapshot/patches/patch-ab
+++ b/editors/emacs-snapshot/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2009/06/07 20:12:06 hasso Exp $
+$NetBSD: patch-ab,v 1.3 2010/06/07 22:44:01 minskim Exp $
 
---- configure.orig	2009-06-04 20:29:50 +0300
-+++ configure	2009-06-07 21:41:16 +0300
-@@ -1979,7 +1979,7 @@ archlibdir='${libexecdir}/emacs/${versio
+--- configure.orig	2010-06-07 21:57:22.000000000 +0000
++++ configure
+@@ -2523,7 +2523,7 @@ archlibdir='${libexecdir}/emacs/${versio
  docdir='${datadir}/emacs/${version}/etc'
  gamedir='${localstatedir}/games/emacs'
  
@@ -11,10 +11,10 @@ $NetBSD: patch-ab,v 1.2 2009/06/07 20:12:06 hasso Exp $
  
  
  
-@@ -2529,6 +2529,15 @@ case "${canonical}" in
+@@ -3158,6 +3158,14 @@ case "${canonical}" in
+       sparc64-*)        machine=sparc ;;
      esac
    ;;
- 
 +  ## DragonFly ports
 +  *-*-dragonfly*)
 +    opsys=dragonfly
@@ -23,19 +23,17 @@ $NetBSD: patch-ab,v 1.2 2009/06/07 20:12:06 hasso Exp $
 +      amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;;
 +    esac
 +  ;;
-+
+ 
    ## FreeBSD kernel + glibc based userland
    *-*-kfreebsd*gnu* )
-     opsys=gnu-kfreebsd
-@@ -9605,9 +9614,9 @@ if test "${HAVE_NS}" = yes; then
+@@ -7427,9 +7435,9 @@ if test "${HAVE_NS}" = yes; then
    window_system=nextstep
    with_xft=no
    # set up packaging dirs
--  exec_prefix=${ns_appbindir}
--  libexecdir=${ns_appbindir}/libexec
-   if test "${EN_NS_SELF_CONTAINED}" = yes; then
-+     exec_prefix=${ns_appbindir}
-+     libexecdir=${ns_appbindir}/libexec
++  if test "${EN_NS_SELF_CONTAINED}" = yes; then
+   exec_prefix=${ns_appbindir}
+   libexecdir=${ns_appbindir}/libexec
+-  if test "${EN_NS_SELF_CONTAINED}" = yes; then
       prefix=${ns_appresdir}
    fi
- fi
+   ns_frag=$srcdir/src/ns.mk
diff --git a/editors/emacs-snapshot/patches/patch-ad b/editors/emacs-snapshot/patches/patch-ad
new file mode 100644
index 00000000000..569ee42d27c
--- /dev/null
+++ b/editors/emacs-snapshot/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2010/06/07 22:44:01 minskim Exp $
+
+--- lisp/cus-dep.el.orig	2010-06-02 09:53:41.000000000 -0700
++++ lisp/cus-dep.el
+@@ -59,6 +59,7 @@ Usage: emacs -batch -l ./cus-dep.el -f c
+             (unless (or (string-match custom-dependencies-no-scan-regexp file)
+                         (string-match preloaded file)
+                         (not (file-exists-p file)))
++              (message file)
+               (erase-buffer)
+               (insert-file-contents file)
+               (goto-char (point-min))
diff --git a/editors/emacs-snapshot/patches/patch-ag b/editors/emacs-snapshot/patches/patch-ag
index 700b2c9872b..d94c9867e65 100644
--- a/editors/emacs-snapshot/patches/patch-ag
+++ b/editors/emacs-snapshot/patches/patch-ag
@@ -1,16 +1,20 @@
-$NetBSD: patch-ag,v 1.2 2010/02/21 12:26:47 wiz Exp $
+$NetBSD: patch-ag,v 1.3 2010/06/07 22:44:01 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	2010-01-14 22:17:00.000000000 +0000
-+++ src/term.c	2010-01-14 22:22:09.000000000 +0000
-@@ -3593,7 +3593,6 @@
- #ifndef TERMINFO
-   if (strlen (tty->termcap_term_buffer) >= buffer_size)
-     abort ();
+--- 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
+                    terminal_type);
+     }
+ 
+-#ifndef TERMINFO
+-  if (strlen (tty->termcap_term_buffer) >= buffer_size)
+-    abort ();
 -  buffer_size = strlen (tty->termcap_term_buffer);
- #endif
+-#endif
    tty->termcap_strings_buffer = area = (char *) 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 e1fb9de29f1..e99618344f6 100644
--- a/editors/emacs-snapshot/version.mk
+++ b/editors/emacs-snapshot/version.mk
@@ -1,10 +1,10 @@
-# $NetBSD: version.mk,v 1.6 2010/02/19 19:04:11 minskim Exp $
+# $NetBSD: version.mk,v 1.7 2010/06/07 22:44:01 minskim Exp $
 
 _EMACS_FLAVOR=	emacs
 _EMACS_REQD=	emacs>=23
 _EMACS_PKGDEP.base=
 _EMACS_PKGDEP.leim=
 
-_EMACS_VERSION_MAJOR=	23
-_EMACS_VERSION_MINOR=	1
-_EMACS_VERSION_MICRO=	92
+_EMACS_VERSION_MAJOR=	24
+_EMACS_VERSION_MINOR=	0
+_EMACS_VERSION_MICRO=	50