(edit_draw_this_line): use different variable for char attributes.

aborodin · aborodin · commit a573592347d1 · 2025-06-19T21:03:28.000+03:00
Signed-off-by: Andrew Borodin &lt;aborodin@vmail.ru&gt;
diff --git a/src/editor/editdraw.c b/src/editor/editdraw.c
@@ -628,40 +628,42 @@ edit_draw_this_line (WEdit *edit, off_t b, long row, long start_col, long end_co
                     if ((edit_options.visible_tabs || (edit_options.visible_tws && q >= tws))
                         && enable_show_tabs_tws && tty_use_colors ())
                     {
+                        int style;
+
                         if ((p->style & MOD_MARKED) != 0)
-                            c = p->style;
+                            style = p->style;
                         else if (book_mark != 0)
-                            c |= book_mark << 16;
+                            style = c | (book_mark << 16);
                         else
-                            c = p->style | MOD_WHITESPACE;
+                            style = p->style | MOD_WHITESPACE;
                         if (i > 2)
                         {
                             p->ch = '<';
-                            p->style = c;
+                            p->style = style;
                             p++;
                             while (--i > 1)
                             {
                                 p->ch = '-';
-                                p->style = c;
+                                p->style = style;
                                 p++;
                             }
                             p->ch = '>';
-                            p->style = c;
+                            p->style = style;
                             p++;
                         }
                         else if (i > 1)
                         {
                             p->ch = '<';
-                            p->style = c;
+                            p->style = style;
                             p++;
                             p->ch = '>';
-                            p->style = c;
+                            p->style = style;
                             p++;
                         }
                         else
                         {
                             p->ch = '>';
-                            p->style = c;
+                            p->style = style;
                             p++;
                         }
                     }
@@ -670,24 +672,28 @@ edit_draw_this_line (WEdit *edit, off_t b, long row, long start_col, long end_co
                     {
                         p->ch = '.';
                         p->style |= MOD_WHITESPACE;
-                        c = p->style & ~MOD_CURSOR;
+
+                        const int style = p->style & ~MOD_CURSOR;
+
                         p++;
                         while (--i != 0)
                         {
                             p->ch = ' ';
-                            p->style = c;
+                            p->style = style;
                             p++;
                         }
                     }
                     else
                     {
                         p->ch |= ' ';
-                        c = p->style & ~MOD_CURSOR;
+
+                        const int style = p->style & ~MOD_CURSOR;
+
                         p++;
                         while (--i != 0)
                         {
                             p->ch = ' ';
-                            p->style = c;
+                            p->style = style;
                             p++;
                         }
                     }

Original file line number	Diff line number	Diff line change
`@@ -628,40 +628,42 @@ edit_draw_this_line (WEdit *edit, off_t b, long row, long start_col, long end_co`
`628`	`628`	`if ((edit_options.visible_tabs \|\| (edit_options.visible_tws && q >= tws))`
`629`	`629`	`&& enable_show_tabs_tws && tty_use_colors ())`
`630`	`630`	`{`
	`631`	`+ int style;`
	`632`	`+`
`631`	`633`	`if ((p->style & MOD_MARKED) != 0)`
`632`		`- c = p->style;`
	`634`	`+ style = p->style;`
`633`	`635`	`else if (book_mark != 0)`
`634`		`- c \|= book_mark << 16;`
	`636`	`+ style = c \| (book_mark << 16);`
`635`	`637`	`else`
`636`		`- c = p->style \| MOD_WHITESPACE;`
	`638`	`+ style = p->style \| MOD_WHITESPACE;`
`637`	`639`	`if (i > 2)`
`638`	`640`	`{`
`639`	`641`	`p->ch = '<';`
`640`		`- p->style = c;`
	`642`	`+ p->style = style;`
`641`	`643`	`p++;`
`642`	`644`	`while (--i > 1)`
`643`	`645`	`{`
`644`	`646`	`p->ch = '-';`
`645`		`- p->style = c;`
	`647`	`+ p->style = style;`
`646`	`648`	`p++;`
`647`	`649`	`}`
`648`	`650`	`p->ch = '>';`
`649`		`- p->style = c;`
	`651`	`+ p->style = style;`
`650`	`652`	`p++;`
`651`	`653`	`}`
`652`	`654`	`else if (i > 1)`
`653`	`655`	`{`
`654`	`656`	`p->ch = '<';`
`655`		`- p->style = c;`
	`657`	`+ p->style = style;`
`656`	`658`	`p++;`
`657`	`659`	`p->ch = '>';`
`658`		`- p->style = c;`
	`660`	`+ p->style = style;`
`659`	`661`	`p++;`
`660`	`662`	`}`
`661`	`663`	`else`
`662`	`664`	`{`
`663`	`665`	`p->ch = '>';`
`664`		`- p->style = c;`
	`666`	`+ p->style = style;`
`665`	`667`	`p++;`
`666`	`668`	`}`
`667`	`669`	`}`
`@@ -670,24 +672,28 @@ edit_draw_this_line (WEdit *edit, off_t b, long row, long start_col, long end_co`
`670`	`672`	`{`
`671`	`673`	`p->ch = '.';`
`672`	`674`	`p->style \|= MOD_WHITESPACE;`
`673`		`- c = p->style & ~MOD_CURSOR;`
	`675`	`+`
	`676`	`+ const int style = p->style & ~MOD_CURSOR;`
	`677`	`+`
`674`	`678`	`p++;`
`675`	`679`	`while (--i != 0)`
`676`	`680`	`{`
`677`	`681`	`p->ch = ' ';`
`678`		`- p->style = c;`
	`682`	`+ p->style = style;`
`679`	`683`	`p++;`
`680`	`684`	`}`
`681`	`685`	`}`
`682`	`686`	`else`
`683`	`687`	`{`
`684`	`688`	`p->ch \|= ' ';`
`685`		`- c = p->style & ~MOD_CURSOR;`
	`689`	`+`
	`690`	`+ const int style = p->style & ~MOD_CURSOR;`
	`691`	`+`
`686`	`692`	`p++;`
`687`	`693`	`while (--i != 0)`
`688`	`694`	`{`
`689`	`695`	`p->ch = ' ';`
`690`		`- p->style = c;`
	`696`	`+ p->style = style;`
`691`	`697`	`p++;`
`692`	`698`	`}`
`693`	`699`	`}`