From 66474ebf0b57c055e9e7d17e930871547c7b7921 Mon Sep 17 00:00:00 2001
From: roy <roy>
Date: Wed, 20 Jan 2010 03:21:20 +0000
Subject: 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.

---
 editors/emacs21/Makefile         |  4 ++--
 editors/emacs21/distinfo         |  3 ++-
 editors/emacs21/patches/patch-cf | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 editors/emacs21/patches/patch-cf

(limited to 'editors/emacs21')

diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index e09ce6d2e8f..1bd14e4bea0 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2009/08/26 19:58:43 sno Exp $
+# $NetBSD: Makefile,v 1.13 2010/01/20 03:21:21 roy Exp $
 
-PKGREVISION=	15
+PKGREVISION=	16
 CATEGORIES=	editors
 COMMENT=	GNU editing macros (editor)
 
diff --git a/editors/emacs21/distinfo b/editors/emacs21/distinfo
index b1fc10ebb30..13d72da0708 100644
--- a/editors/emacs21/distinfo
+++ b/editors/emacs21/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2008/07/13 18:03:01 dholland Exp $
+$NetBSD: distinfo,v 1.8 2010/01/20 03:21:21 roy Exp $
 
 SHA1 (emacs-21.4a.tar.gz) = cdb33731180fe4a912838af805dd35e3f55394d4
 RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a
@@ -31,4 +31,5 @@ SHA1 (patch-az) = 43753accb1b9ffc2c63e638c31236b8e4880080b
 SHA1 (patch-ba) = ae05985ce8cabffdfbfb84905e1d6b0de7690b25
 SHA1 (patch-bb) = bf748292c57459b1240da01f9d3df16e4dc40fa2
 SHA1 (patch-bg) = 567ccce83e2b6d898a87f20763d5ff4b19c30deb
+SHA1 (patch-cf) = d15c7fbbafb75632ba7c2edb2ccaeaff06c202c6
 SHA1 (patch-xx) = cf1cb21e0bd96202622ff54e39d202bdae78c942
diff --git a/editors/emacs21/patches/patch-cf b/editors/emacs21/patches/patch-cf
new file mode 100644
index 00000000000..cf3203bf1df
--- /dev/null
+++ b/editors/emacs21/patches/patch-cf
@@ -0,0 +1,18 @@
+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 21:25:59.000000000 +0000
++++ src/term.c	2010-01-14 21:26:27.000000000 +0000
+@@ -1647,11 +1647,7 @@
+ 	     terminal_type);
+ #endif
+     }
+-#ifdef TERMINFO
+   area = (char *) xmalloc (2044);
+-#else
+-  area = (char *) xmalloc (strlen (buffer));
+-#endif /* not TERMINFO */
+   if (area == 0)
+     abort ();
+ 
-- 
cgit v1.2.3