 @@ -1,32 +1,32 @@
-/*	$NetBSD: v_txt.c,v 1.4 2014/01/26 21:43:45 christos Exp $ */
+/*	$NetBSD: v_txt.c,v 1.5 2017/11/21 06:35:22 rin Exp $ */
 /*-
  * Copyright (c) 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1992, 1993, 1994, 1995, 1996
  *	Keith Bostic.  All rights reserved.
+ *
  * See the LICENSE file for redistribution information.
  */
 #include "config.h"
 #include <sys/cdefs.h>
 #if 0
 #ifndef lint
 static const char sccsid[] = "Id: v_txt.c,v 10.108 2003/07/18 21:27:42 skimo Exp  (Berkeley) Date: 2003/07/18 21:27:42 ";
 #endif /* not lint */
 #else
-__RCSID("$NetBSD: v_txt.c,v 1.4 2014/01/26 21:43:45 christos Exp $");
+__RCSID("$NetBSD: v_txt.c,v 1.5 2017/11/21 06:35:22 rin Exp $");
 #endif
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <bitstring.h>
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 @@ -2265,51 +2265,63 @@ static int
 txt_emark(SCR *sp, TEXT *tp, size_t cno)
+{
 	CHAR_T ch;
 	unsigned char *kp;
 	size_t chlen, nlen, olen;
 	CHAR_T *p;
 	ch = CH_ENDMARK;
 	/*
 	 * The end mark may not be the same size as the current character.
 	 * Don't let the line shift.
 	 */
-	nlen = KEY_LEN(sp, ch);
+	nlen = KEY_COL(sp, ch);
 	if (tp->lb[cno] == '\t')
 		(void)vs_columns(sp, tp->lb, tp->lno, &cno, &olen);
 	else
-		olen = KEY_LEN(sp, tp->lb[cno]);
+		olen = KEY_COL(sp, tp->lb[cno]);
 	/*
 	 * If the line got longer, well, it's weird, but it's easy.  If
 	 * it's the same length, it's easy.  If it got shorter, we have
 	 * to fix it up.
 	 */
 	if (olen > nlen) {
 		BINC_RETW(sp, tp->lb, tp->lb_len, tp->len + olen);
 		chlen = olen - nlen;
 		if (tp->insert != 0)
 			MEMMOVEW(tp->lb + cno + 1 + chlen,
 			    tp->lb + cno + 1, tp->insert);
 		tp->len += chlen;
 		tp->owrite += chlen;
 		p = tp->lb + cno;
 		if (tp->lb[cno] == '\t')
 			for (cno += chlen; chlen--;)
 				*p++ = ' ';
-		else
+		else if (INTISWIDE(tp->lb[cno])) {
 			/*
 			 * Do not put the end mark on a part of a multi-width
 			 * char, which results in screen corruption.
 			 */
 			for (; chlen >= nlen; chlen -= nlen) {
 				cno++;
 				*p++ = ch;
+			}
 			/* Paranoia: nlen is usually 1. */
 			for (cno += chlen; chlen--;)
 				*p++ = ' ';
 		} else
 			for (kp = KEY_NAME(sp, tp->lb[cno]),
 			    cno += chlen; chlen--;)
 				*p++ = *kp++;
+	}
 	tp->lb[cno] = ch;
 	return (vs_change(sp, tp->lno, LINE_RESET));
+}
 /*
  * txt_err --
  *	Handle an error during input processing.
  */
 static void
 @@ -2447,61 +2459,66 @@ txt_insch(SCR *sp, TEXT *tp, ARG_CHAR_T
 		cno = tp->cno;
 		/*
 		 * If the old or new characters are tabs, then the length of the
 		 * display depends on the character position in the display.  We
 		 * don't even try to handle this here, just ask the screen.
 		 */
 		if (*chp == '\t') {
 			savech = tp->lb[cno];
 			tp->lb[cno] = '\t';
 			(void)vs_columns(sp, tp->lb, tp->lno, &cno, &nlen);
 			tp->lb[cno] = savech;
 		} else
-			nlen = KEY_LEN(sp, *chp);
+			nlen = KEY_COL(sp, *chp);
 		/*
 		 * Eat overwrite characters until we run out of them or we've
 		 * handled the length of the new character.  If we only eat
 		 * part of an overwrite character, break it into its component
 		 * elements and display the remaining components.
 		 */
 		for (copydown = 0; nlen != 0 && tp->owrite != 0;) {
 			--tp->owrite;
 			if (tp->lb[cno] == '\t')
 				(void)vs_columns(sp,
 				    tp->lb, tp->lno, &cno, &olen);
 			else
-				olen = KEY_LEN(sp, tp->lb[cno]);
+				olen = KEY_COL(sp, tp->lb[cno]);
 			if (olen == nlen) {
 				nlen = 0;
 				break;
+			}
 			if (olen < nlen) {
 				++copydown;
 				nlen -= olen;
 			} else {
 				BINC_RETW(sp,
 				    tp->lb, tp->lb_len, tp->len + olen);
 				chlen = olen - nlen;
 				MEMMOVEW(tp->lb + cno + 1 + chlen,
 				    tp->lb + cno + 1,
 				    tp->owrite + tp->insert);
 				tp->len += chlen;
 				tp->owrite += chlen;
-				if (tp->lb[cno] == '\t')
+				/*
 				 * Do not rewrite a part of a multi-width char,
 				 * which results in screen corruption.
 				 */
 				if (tp->lb[cno] == '\t'
 				    || INTISWIDE(tp->lb[cno]))
 					for (p = tp->lb + cno + 1; chlen--;)
 						*p++ = ' ';
 				else
 					for (kp =
 					    KEY_NAME(sp, tp->lb[cno]) + nlen,
 					    p = tp->lb + cno + 1; chlen--;)
 						*p++ = *kp++;
 				nlen = 0;
 				break;
+			}
+		}
 		/*