* src/w32console.c: Fix last change (bug#79298).

1 files changed, 10 insertions, 25 deletions

diff --git a/src/w32console.c b/src/w32console.c
index 30f511d93f9..a92ed788e00 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -351,22 +351,12 @@ w32con_write_glyphs (struct frame *f, register struct glyph *string,
       conversion_buffer = (LPCSTR) encode_terminal_code (string, n, coding);
       if (coding->produced > 0)
         {
-          /* By default, assume single-byte encoding and single-column
-             characters...  */
-          ptrdiff_t nchars = coding->produced;
-          ptrdiff_t ncols = nchars;
-          /* ...but if we are using UTF-8, correct that by computing
-             characters.  Note: multibyte_chars_in_text and strwidth
-             handle the internal encoding of characters, which is a
-             superset of UTF-8.
-             FIXME: this doesn't handle character compositions.  */
-          if (coding->encoder == encode_coding_utf_8)
-            {
-              ncols = strwidth (conversion_buffer, nchars);
-              nchars = multibyte_chars_in_text (conversion_buffer, nchars);
-            }
+          /* Compute the string's width on display by accounting for
+             character's width.  FIXME: this doesn't handle character
+             compositions.  */
+          ptrdiff_t ncols = strwidth (coding->source, coding->src_bytes);
           /* Set the attribute for these characters.  */
-          if (!FillConsoleOutputAttribute (cur_screen, char_attr, nchars,
+          if (!FillConsoleOutputAttribute (cur_screen, char_attr, ncols,
                                            cursor_coords, &r))
             {
               printf ("Failed writing console attributes: %lu\n",
@@ -420,20 +410,15 @@ w32con_write_glyphs_with_face (struct frame *f, register int x, register int y,
       /* Compute the character attributes corresponding to the face.  */
       DWORD char_attr = w32_face_attributes (f, face_id);
       COORD start_coords;
-      /* By default, assume single-byte encoding...  */
-      ptrdiff_t nchars = coding->produced;
-      /* ...but if we are using UTF-8, correct that by counting
-         characters.  Note: multibyte_chars_in_text handles the
-         internal encoding of characters, which is a superset of
-         UTF-8.
-         FIXME: this doesn't handle character compositions.  */
-      if (coding->encoder == encode_coding_utf_8)
-        nchars = multibyte_chars_in_text (conversion_buffer, nchars);
+      /* Compute the string's width on display by accounting for
+         character's width.  FIXME: this doesn't handle character
+         compositions.  */
+      ptrdiff_t ncols = strwidth (coding->source, coding->src_bytes);
 
       start_coords.X = x;
       start_coords.Y = y;
       /* Set the attribute for these characters.  */
-      if (!FillConsoleOutputAttribute (cur_screen, char_attr, nchars,
+      if (!FillConsoleOutputAttribute (cur_screen, char_attr, ncols,
                                        start_coords, &filled))
         DebPrint (("Failed writing console attributes: %d\n", GetLastError ()));
       else