Mercurial > vim

diff src/libvterm/t/harness.c @ 30884:ac9464a32606 v9.0.0776

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.0776: MSVC can't have field name "small" Commit: https://github.com/vim/vim/commit/9d8620b519a84983bc8c24cb6c302f4d6b55a6c0 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Oct 16 20:24:16 2022 +0100 patch 9.0.0776: MSVC can't have field name "small" Problem: MSVC can't have field name "small". Solution: Rename small to smallfont.
author Bram Moolenaar <Bram@vim.org>
date Sun, 16 Oct 2022 21:30:06 +0200
parents 82336c3b679d
children bf4f25d50fdd
line wrap: on
line diff
--- a/src/libvterm/t/harness.c
+++ b/src/libvterm/t/harness.c
@@ -410,7 +410,7 @@ static struct {
   int conceal;
   int strike;
   int font;
-  int small;
+  int smallfont;
   int baseline;
   VTermColor foreground;
   VTermColor background;
@@ -443,7 +443,7 @@ static int state_setpenattr(VTermAttr at
     state_pen.font = val->number;
     break;
   case VTERM_ATTR_SMALL:
-    state_pen.small = val->boolean;
+    state_pen.smallfont = val->boolean;
     break;
   case VTERM_ATTR_BASELINE:
     state_pen.baseline = val->number;
@@ -1015,11 +1015,11 @@ int main(int argc UNUSED, char **argv UN
         }
         else if(streq(linep, "small")) {
           vterm_state_get_penattr(state, VTERM_ATTR_SMALL, &val);
-          if(val.boolean != state_pen.small)
+          if(val.boolean != state_pen.smallfont)
             printf("! pen small mismatch; state=%s, event=%s\n",
-                BOOLSTR(val.boolean), BOOLSTR(state_pen.small));
+                BOOLSTR(val.boolean), BOOLSTR(state_pen.smallfont));
           else
-            printf("%s\n", BOOLSTR(state_pen.small));
+            printf("%s\n", BOOLSTR(state_pen.smallfont));
         }
         else if(streq(linep, "baseline")) {
           vterm_state_get_penattr(state, VTERM_ATTR_BASELINE, &val);
@@ -1160,7 +1160,7 @@ int main(int argc UNUSED, char **argv UN
         if(cell.attrs.blink)     printf("K");
         if(cell.attrs.reverse)   printf("R");
         if(cell.attrs.font)      printf("F%d", cell.attrs.font);
-        if(cell.attrs.small)     printf("S");
+        if(cell.attrs.smallfont) printf("S");
         if(cell.attrs.baseline)  printf(
             cell.attrs.baseline == VTERM_BASELINE_RAISE ? "^" :
                                                           "_");