diff options
| author | roy <roy> | 2010-05-15 10:00:57 +0000 |
|---|---|---|
| committer | roy <roy> | 2010-05-15 10:00:57 +0000 |
| commit | 92d3382669ce03b7ebc92699f4b893d3cd45f386 (patch) | |
| tree | 97a7c52ab732f20b6cd41020a93479b820b49df6 /editors/emacs | |
| parent | d7cc081bcf1b72366a6c3ecf6dadb47dc49fe9d2 (diff) | |
| download | pkgsrc-92d3382669ce03b7ebc92699f4b893d3cd45f386.tar.gz | |
Fix termcap support.
Diffstat (limited to 'editors/emacs')
| -rw-r--r-- | editors/emacs/Makefile | 4 | ||||
| -rw-r--r-- | editors/emacs/distinfo | 4 | ||||
| -rw-r--r-- | editors/emacs/patches/patch-ag | 16 |
3 files changed, 14 insertions, 10 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 8fb2d695c16..6d179ab10d4 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.127 2010/01/24 13:26:10 wiz Exp $ +# $NetBSD: Makefile,v 1.128 2010/05/15 10:00:57 roy Exp $ -PKGREVISION= 4 +PKGREVISION= 5 CONFLICTS+= emacs-nox11-[0-9]* diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo index 78c9fb7813c..8ce464a3282 100644 --- a/editors/emacs/distinfo +++ b/editors/emacs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.44 2010/02/21 12:24:54 wiz Exp $ +$NetBSD: distinfo,v 1.45 2010/05/15 10:00:57 roy Exp $ SHA1 (emacs-23.1.tar.gz) = e993445d14d2fdedd1418bc32c8c4ea30442bc51 RMD160 (emacs-23.1.tar.gz) = c557149f59916b82f0ae156f87406126b03671b4 @@ -8,4 +8,4 @@ SHA1 (patch-ab) = dcd6903d62b58b5c587001b26f0d300bcb54fe6d SHA1 (patch-ac) = 9afbc10d2bd0f32cdfde8ae6a32236182dbac558 SHA1 (patch-ae) = 2b016d6b4bb796cf5bddc55f104139e01209adb6 SHA1 (patch-af) = c888cd3863e533d38f437292d9f800bcd3159529 -SHA1 (patch-ag) = f10b733c75e7b24642e8bd6963acb95d9c942991 +SHA1 (patch-ag) = f462ad22762469360d90060afbc73e660e9f7db5 diff --git a/editors/emacs/patches/patch-ag b/editors/emacs/patches/patch-ag index 7497caeb3e1..fba4a12728f 100644 --- a/editors/emacs/patches/patch-ag +++ b/editors/emacs/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.12 2010/02/21 12:24:54 wiz Exp $ +$NetBSD: patch-ag,v 1.13 2010/05/15 10:00:57 roy Exp $ When running terminfo but compiled for termcap, we cannot assume that we actually have anything useable in termcap_term_buffer so just @@ -6,11 +6,15 @@ use the terminfo fixed size defined ealier. --- src/term.c 2010-01-06 10:11:04.000000000 +0000 +++ src/term.c 2010-01-06 10:11:53.000000000 +0000 -@@ -3593,7 +3593,6 @@ - #ifndef TERMINFO - if (strlen (tty->termcap_term_buffer) >= buffer_size) - abort (); -- buffer_size = strlen (tty->termcap_term_buffer); +@@ -3590,11 +3590,6 @@ #endif + } + +-#ifndef TERMINFO +- if (strlen (tty->termcap_term_buffer) >= buffer_size) +- abort (); +- buffer_size = strlen (tty->termcap_term_buffer); +-#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); |