diff options
| author | peter <peter@FreeBSD.org> | 2013-12-08 00:08:03 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2013-12-08 00:08:03 +0000 |
| commit | 88f067f6f42aec540934d4c6b71050ba53822c5a (patch) | |
| tree | 3ccba027bacbc0ab878ed7f65d1918d5eab1bd50 | |
| parent | e7ebb9541a8be6ea07b5eccf2bff421fe6d5e84e (diff) | |
| download | FreeBSD-src-88f067f6f42aec540934d4c6b71050ba53822c5a.zip FreeBSD-src-88f067f6f42aec540934d4c6b71050ba53822c5a.tar.gz | |
Vendor import nvi-2.1.2-c80f493b038 a multikey mapping fix
PR: bin/182463
| -rw-r--r-- | contrib/nvi/cl/cl_term.c | 12 | ||||
| -rw-r--r-- | contrib/nvi/common/key.c | 4 | ||||
| -rw-r--r-- | contrib/nvi/common/key.h | 10 |
3 files changed, 16 insertions, 10 deletions
diff --git a/contrib/nvi/cl/cl_term.c b/contrib/nvi/cl/cl_term.c index 3d8cdb2..7e8f6c7 100644 --- a/contrib/nvi/cl/cl_term.c +++ b/contrib/nvi/cl/cl_term.c @@ -10,7 +10,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "$Id: cl_term.c,v 10.33 2012/04/21 23:51:46 zy Exp $"; +static const char sccsid[] = "$Id: cl_term.c,v 10.34 2013/12/07 16:21:14 wjenkner Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -187,14 +187,18 @@ cl_term_init(SCR *sp) int cl_term_end(GS *gp) { - SEQ *qp, *nqp; + SEQ *qp, *nqp, *pre_qp = NULL; /* Delete screen specific mappings. */ SLIST_FOREACH_SAFE(qp, gp->seqq, q, nqp) if (F_ISSET(qp, SEQ_SCREEN)) { - SLIST_REMOVE_HEAD(gp->seqq, q); + if (qp == SLIST_FIRST(gp->seqq)) + SLIST_REMOVE_HEAD(gp->seqq, q); + else + SLIST_REMOVE_AFTER(pre_qp, q); (void)seq_free(qp); - } + } else + pre_qp = qp; return (0); } diff --git a/contrib/nvi/common/key.c b/contrib/nvi/common/key.c index 652b8f3..9fc20b7 100644 --- a/contrib/nvi/common/key.c +++ b/contrib/nvi/common/key.c @@ -10,7 +10,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "$Id: key.c,v 10.53 2013/03/11 01:20:53 yamt Exp $"; +static const char sccsid[] = "$Id: key.c,v 10.54 2013/11/13 12:15:27 zy Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -272,7 +272,7 @@ v_key_name( * The code prints non-printable wide characters in 4 or 5 digits * Unicode escape sequences, so only supports plane 0 to 15. */ - if (ISPRINT(ach)) + if (CAN_PRINT(sp, ach)) goto done; nopr: if (iscntrl(ch) && (ch < 0x20 || ch == 0x7f)) { sp->cname[0] = '^'; diff --git a/contrib/nvi/common/key.h b/contrib/nvi/common/key.h index 3eeca12..43cef77 100644 --- a/contrib/nvi/common/key.h +++ b/contrib/nvi/common/key.h @@ -6,7 +6,7 @@ * * See the LICENSE file for redistribution information. * - * $Id: key.h,v 10.55 2012/10/07 01:31:17 zy Exp $ + * $Id: key.h,v 10.56 2013/11/13 12:15:27 zy Exp $ */ #include "multibyte.h" @@ -23,8 +23,9 @@ #define INPUT2INT5(sp,cw,n,nlen,w,wlen) \ sp->conv.input2int(sp, n, nlen, &(cw), &wlen, &w) #define CONST +#define INTISWIDE(c) (wctob(c) == EOF) #define CHAR_WIDTH(sp, ch) wcwidth(ch) -#define INTISWIDE(c) (wctob(c) == EOF) +#define CAN_PRINT(sp, ch) (CHAR_WIDTH(sp, ch) > 0) #else #define FILE2INT5(sp,buf,n,nlen,w,wlen) \ (w = n, wlen = nlen, 0) @@ -36,9 +37,10 @@ (n = w, nlen = wlen, 0) #define INPUT2INT5(sp,buf,n,nlen,w,wlen) \ (w = n, wlen = nlen, 0) -#define CONST const -#define INTISWIDE(c) 0 +#define CONST const +#define INTISWIDE(c) 0 #define CHAR_WIDTH(sp, ch) 1 +#define CAN_PRINT(sp, ch) isprint(ch) #endif #define FILE2INT(sp,n,nlen,w,wlen) \ FILE2INT5(sp,sp->cw,n,nlen,w,wlen) |
