2 files changed, 12 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1cc7e860d12..76ffcd9ffa4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-14  Gerd Moellmann  <gerd@gnu.org>
+
+        * xterm.c (x_produce_glyphs): If the distance from the current
+        position to the next tab stop is less than a canonical character
+        width, use the tab stop after that.
+
 2000-09-14  Dave Love  <fx@gnu.org>
 
         * buffer.c (alloc_buffer_text): Fix xmalloc call.
diff --git a/src/xterm.c b/src/xterm.c
index f72b20cda50..25e9d223ffb 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1947,6 +1947,12 @@ x_produce_glyphs (it)
           int tab_width = it->tab_width * CANON_X_UNIT (it->f);
           int x = it->current_x + it->continuation_lines_width;
           int next_tab_x = ((1 + x + tab_width - 1) / tab_width) * tab_width;
+
+          /* If the distance from the current position to the next tab
+             stop is less than a canonical character width, use the
+             tab stop after that.  */
+          if (next_tab_x - x < CANON_X_UNIT (it->f))
+            next_tab_x += tab_width;
       
           it->pixel_width = next_tab_x - x;
           it->nglyphs = 1;