fix #42547

diff --git a/ChangeLog.j b/ChangeLog.j
index 1092292..a7d5b2e 100644 (file)
--- a/ChangeLog.j
+++ b/ChangeLog.j
@@ -3,6 +3,7 @@
          * Win10\82Å\89æ\96Ê\8d¶\92[\82Ì\95¶\8e\9a\82ª\97\90\82ê\82é (#42072)
          * exe\83t\83@\83C\83\8b\82Ì\83v\83\8d\83p\83e\83B\82ª\96¢\92²\90® (#42037)
          * \81u\83Q\81[\83\80\82Ì\83I\83v\83V\83\87\83\93\88ê\97\97\81v\82ð\95\\8e¦\82³\82¹\82é\82Æ\89æ\96Ê\82ª\97\90\82ê\82é (#42529)
+         * \81u\83Q\81[\83\80\82Ì\83I\83v\83V\83\87\83\93\88ê\97\97(\92·\95¶)\81v\82Å\95\\8e¦\82ª\97\90\82ê\82é (#42547)
        * X11\82Ì\83\8d\83P\81[\83\8b\82ð\93à\95\94\82Åja_JP.EUC-JP\82É\8cÅ\92è\82·\82é (#40804)
 
 Sat Mar 13 2021  Kentaro Shirakata  <argrath@ub32.org>

diff --git a/sys/winnt/nttty.c b/sys/winnt/nttty.c
index 44bfd99..602b14b 100644 (file)
--- a/sys/winnt/nttty.c
+++ b/sys/winnt/nttty.c
@@ -255,8 +255,8 @@ static void back_buffer_flip()
                     buf[1] = (unsigned char)(back2->character);
                     WriteConsoleOutputCharacter(console.hConOut, buf, 2, pos,
                                                     &unused);
-                    front->character = back->character;
-                    front2->character = back2->character;
+                    *front = *back;
+                    *front2 = *back2;
                 }
                 pos.X++;
                 back += 2;
@@ -278,6 +278,13 @@ static void back_buffer_flip()
                     WriteConsoleOutputCharacterA(console.hConOut, &ch, 1, pos,
                                                     &unused);
                 }
+#if 1 /*JP*/
+                /* \8a¿\8e\9a\82Ì1\83o\83C\83g\96Ú\82¾\82Á\82½\8fê\8d\87\81A
+                   2\83o\83C\83g\96Ú\82ð\83N\83\8a\83A\82µ\82Ä\8am\8eÀ\82É\8dX\90V\82·\82é */
+                if (front->iskanji == 1) {
+                    (front + 1)->character = '\0';
+                }
+#endif
                 *front = *back;
             }
             back++;