--- libaitcli/src/aitcli.c	2025/12/24 00:38:48	1.21.2.6
+++ libaitcli/src/aitcli.c	2025/12/25 20:20:11	1.21.2.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitcli.c,v 1.21.2.6 2025/12/24 00:38:48 misho Exp $
+* $Id: aitcli.c,v 1.21.2.8 2025/12/25 20:20:11 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -197,11 +197,10 @@ bufCHARin(int idx, void * __restrict cli_buffer)
 	memcpy(buf->line_input + pos, buf->line_inkeys[idx].key_ch, buf->line_inkeys[idx].key_len);
 	buf->line_input[buf->line_lenin] = 0;
 
-	if (buf->line_mode == LINEMODE_INS) {
-		rewindin(buf, buf->line_posin - buf->line_inkeys[idx].key_len);
-		printfEOLin(buf);
-		rewindin(buf, buf->line_lenin - buf->line_posin);
-	}
+	rewindin(buf, buf->line_posin - buf->line_inkeys[idx].key_len);
+	printfEOLin(buf);
+	rewindin(buf, buf->line_lenin - buf->line_posin);
+
 	return RETCODE_OK;
 }
 
@@ -597,16 +596,18 @@ bufDEL(int idx, void * __restrict cli_buffer)
 	if (!cli_buffer || idx < 0 || idx > MAX_BINDKEY)
 		return RETCODE_ERR;
 
-	clrscrEOL(buf);
+	if (buf->line_bol < buf->line_eol && buf->line_eol < buf->line_len) {
+		clrscrEOL(buf);
 
-	buf->line_len--;
-	memmove(buf->line_buf + buf->line_eol - buf->line_bol, 
-			buf->line_buf + buf->line_eol - buf->line_bol + 1, 
-			buf->line_len - buf->line_eol);
-	buf->line_buf[buf->line_len - 1] = 0;
+		buf->line_len--;
+		memmove(buf->line_buf + buf->line_eol - buf->line_bol, 
+				buf->line_buf + buf->line_eol - buf->line_bol + 1, 
+				buf->line_len - buf->line_eol);
+		buf->line_buf[buf->line_len - 1] = 0;
 
-	printfEOL(buf, buf->line_len - 1, 1);
-	printfEOL(buf, -1, 1);
+		printfEOL(buf, buf->line_len - 1, 1);
+		printfEOL(buf, -1, 1);
+	}
 
 	return RETCODE_OK;
 }