mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '342_tabs_spaces_mark'

Browse Source 
* 342_tabs_spaces_mark:
  fix mark tab and spaces
  fix highlight tab and spaces in mark procces.
This commit is contained in:
Ilia Maslakov 2009-05-12 18:53:44 +00:00
commit d839793b75
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
edit/editdraw.c
View File

@ -398,38 +398,41 @@ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
i = TAB_SIZE - ((int) col % TAB_SIZE);
col += i;
if (use_colors && visible_tabs) {
c = 0;
if (p->style & MOD_MARKED)
c = (p->style);
else
c = p->style | MOD_WHITESPACE;
if (i > 2) {
p->ch |= '<';
p->style = MOD_WHITESPACE;
p->ch = '<';
p->style = c;
p++;
while (--i > 1) {
p->ch = c | '-';
p->style = MOD_WHITESPACE;
p->ch = '-';
p->style = c;
p++;
}
p->ch = c | '>';
p->style = MOD_WHITESPACE;
p->ch = '>';
p->style = c;
p++;
} else if (i > 1) {
p->ch |= '<';
p->style = MOD_WHITESPACE;
p->ch = '<';
p->style = c;
p++;
p->ch = c | '>';
p->style = MOD_WHITESPACE;
p->ch = '>';
p->style = c;
p++;
} else {
p->ch |= '>';
p->style = MOD_WHITESPACE;
p->ch = '>';
p->style = c;
p++;
}
} else if (use_colors && visible_tws && q >= tws) {
p->ch |= '.';
p->style = MOD_WHITESPACE;
p->ch = '.';
p->style |= MOD_WHITESPACE;
c = p->style & ~MOD_CURSOR;
p++;
while (--i) {
p->ch = ' ';
p->ch = ' ';
p->style = c;
p++;
}
@ -438,7 +441,7 @@ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
c = p->style & ~MOD_CURSOR;
p++;
while (--i) {
p->ch = ' ';
p->ch = ' ';
p->style = c;
p++;
}
@ -446,8 +449,8 @@ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
break;
case ' ':
if (use_colors && visible_tws && q >= tws) {
p->ch |= '.';
p->style = MOD_WHITESPACE;
p->ch = '.';
p->style |= MOD_WHITESPACE;
p++;
col++;
break;