Fix copy&paste segfault without -km option.
patch provided via PR 46502 by Yasushi Oshima. Bump PKGREVISION.
This commit is contained in:
parent
4a6315d3e1
commit
a8903c3e30
3 changed files with 23 additions and 16 deletions
|
@ -1,7 +1,7 @@
|
|||
# $NetBSD: Makefile,v 1.56 2012/05/26 15:52:41 ryoon Exp $
|
||||
# $NetBSD: Makefile,v 1.57 2012/05/31 13:05:27 obache Exp $
|
||||
|
||||
DISTNAME= kterm-6.2.0
|
||||
PKGREVISION= 22
|
||||
PKGREVISION= 23
|
||||
CATEGORIES= x11
|
||||
MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/}
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: distinfo,v 1.23 2012/05/26 15:52:41 ryoon Exp $
|
||||
$NetBSD: distinfo,v 1.24 2012/05/31 13:05:27 obache Exp $
|
||||
|
||||
SHA1 (kterm-6.2.0-scroll-wd0.2.patch) = 384d938d3cfea48ae31426c918be6b8df59eb1de
|
||||
RMD160 (kterm-6.2.0-scroll-wd0.2.patch) = e2ea4285def5c4ec8b88d36a20a328cc1082a469
|
||||
|
@ -19,5 +19,5 @@ SHA1 (patch-KTerm.ad) = 7fccdb89f586e4db634a2efc9a919a6525982964
|
|||
SHA1 (patch-aa) = 6afc18d4c35f86077e00d3444d8ba6953463f073
|
||||
SHA1 (patch-ab) = 011b1fc5033f61784e57030c78f6cca5a82722d1
|
||||
SHA1 (patch-ac) = 926a43c2bb1b78cd87dae39b10800a1e7cdfe0ce
|
||||
SHA1 (patch-ad) = 1c561043ac178f792ed8e61a9944f0f8b06248d3
|
||||
SHA1 (patch-ad) = 35e78a604a19d52e4367419acacab054c5653f42
|
||||
SHA1 (patch-ae) = 52a2e974fee9330465f3036267bb99fd8df40f67
|
||||
|
|
|
@ -1,6 +1,10 @@
|
|||
$NetBSD: patch-ad,v 1.4 2012/05/26 15:52:41 ryoon Exp $
|
||||
$NetBSD: patch-ad,v 1.5 2012/05/31 13:05:27 obache Exp $
|
||||
|
||||
--- main.c.orig 2012-05-26 01:55:25.000000000 +0000
|
||||
* Add missing initialization of VMIN and VTIME member of termio's c_cc array
|
||||
as xterm(1) do.
|
||||
* Fix copy & paste segfault with ext06 patches.
|
||||
|
||||
--- main.c.orig 2012-05-31 12:41:16.000000000 +0000
|
||||
+++ main.c
|
||||
@@ -1310,6 +1310,8 @@ char **argv;
|
||||
d_tio.c_cc[VQUIT] = CQUIT; /* '^\' */
|
||||
|
@ -11,16 +15,19 @@ $NetBSD: patch-ad,v 1.4 2012/05/26 15:52:41 ryoon Exp $
|
|||
#ifdef VSWTCH
|
||||
d_tio.c_cc[VSWTCH] = CSWTCH; /* usually '^Z' */
|
||||
#endif
|
||||
@@ -1617,10 +1619,12 @@ char **argv;
|
||||
@@ -1612,6 +1614,7 @@ char **argv;
|
||||
update_reversevideo();
|
||||
}
|
||||
#ifdef KTERM_KANJIMODE
|
||||
+ make_unicode_map();
|
||||
if (term->misc.k_m) {
|
||||
switch (term->misc.k_m[0]) {
|
||||
case 'e': case 'E': case 'x': case 'X':
|
||||
term->flags |= EUC_KANJI;
|
||||
update_eucmode();
|
||||
+ make_unicode_map();
|
||||
break;
|
||||
case 's': case 'S': case 'm': case 'M':
|
||||
term->flags |= SJIS_KANJI;
|
||||
update_sjismode();
|
||||
+ make_unicode_map();
|
||||
break;
|
||||
@@ -1625,7 +1628,6 @@ char **argv;
|
||||
case 'u': case 'U':
|
||||
term->flags |= UTF8_KANJI;
|
||||
update_utf8mode();
|
||||
- make_unicode_map();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
|
Loading…
Reference in a new issue