Merge branch 'master' of https://github.com/mintty/mintty

paolo-sz · paolo-sz · commit 47c8474d2e29 · 2020-04-25T22:56:09.000+02:00
diff --git a/src/termout.c b/src/termout.c
@@ -801,9 +801,6 @@ static void
     curs->wrapnext = false;
   }
 
-  if (term.insert && width > 0)
-    insert_char(width);
-
   bool single_width = false;
   if (cfg.charwidth >= 10 || cs_single_forced) {
     if (width > 1) {
@@ -815,6 +812,9 @@ static void
     }
   }
 
+  if (term.insert && width > 0)
+    insert_char(width);
+
   switch (width) {
     when 1:  // Normal character.
       term_check_boundary(curs->x, curs->y);
@@ -2401,6 +2401,9 @@ static void
         else
           child_printf("\e[>77;%u;0c", DECIMAL_VERSION);
       }
+    when CPAIR('>', 'q'):     /* Report terminal name and version */
+      if (!arg0)
+        child_printf("\eP>|%s %s\e\\", APPNAME, VERSION);
     when 'a':        /* HPR: move right N cols */
       move(curs->x + arg0_def1, curs->y, 1);
     when 'C':        /* CUF: Cursor right */
