summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--term.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/term.c b/term.c
index 00e31e6b..87cd71f0 100644
--- a/term.c
+++ b/term.c
@@ -1,6 +1,6 @@
/* $Id$ */
/*
- * Copyright (c) 2010-2021 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2022 Ingo Schwarze <schwarze@openbsd.org>
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
*
* Permission to use, copy, modify, and distribute this software for any
@@ -636,12 +636,14 @@ term_word(struct termp *p, const char *word)
if (a2roffsu(seq, &su, SCALE_EM) == NULL)
continue;
uc += term_hen(p, &su);
- if (uc > 0)
- while (uc-- > 0)
+ if (uc > 0) {
+ while (uc > 0) {
bufferc(p, ASCII_NBRSP);
- else if (p->col > (size_t)(-uc))
+ uc -= term_len(p, 1);
+ }
+ } else if (p->col > (size_t)(-uc)) {
p->col += uc;
- else {
+ } else {
uc += p->col;
p->col = 0;
if (p->tcol->offset > (size_t)(-uc)) {