ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Setting each multiline-color value instead of OR-ing it. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5335 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2015-08-01 08:35:14 +00:00
parent b3e4051ded
commit e919c22793
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2015-08-01 Benno Schulenberg <bensberg@justemail.net>
* src/nano.c (precalc_multicolorinfo): Set each multiline-color
value instead of OR-ing it. This fixes Savannah bug #45640.
2015-07-31 Benno Schulenberg <bensberg@justemail.net> 2015-07-31 Benno Schulenberg <bensberg@justemail.net>
* src/text.c (do_cutword, do_cut_prev_word, do_cut_next_word), * src/text.c (do_cutword, do_cut_prev_word, do_cut_next_word),
src/global.c (shortcut_init, strtosc), doc/texinfo/nano.texi, src/global.c (shortcut_init, strtosc), doc/texinfo/nano.texi,

6
src/nano.c
View File

@ -1919,7 +1919,7 @@ void precalc_multicolorinfo(void)
if (regexec(tmpcolor->end, &fileptr->data[startx], 1, &endmatch, if (regexec(tmpcolor->end, &fileptr->data[startx], 1, &endmatch,
(startx == 0) ? 0 : REG_NOTBOL) == 0) { (startx == 0) ? 0 : REG_NOTBOL) == 0) {
startx += endmatch.rm_eo; startx += endmatch.rm_eo;
fileptr->multidata[tmpcolor->id] |= CSTARTENDHERE; fileptr->multidata[tmpcolor->id] = CSTARTENDHERE;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "end found on this line\n"); fprintf(stderr, "end found on this line\n");
#endif #endif
@ -1953,7 +1953,7 @@ void precalc_multicolorinfo(void)
#endif #endif
/* We found it, we found it, la la la la la. Mark all /* We found it, we found it, la la la la la. Mark all
* the lines in between and the end properly. */ * the lines in between and the end properly. */
fileptr->multidata[tmpcolor->id] |= CENDAFTER; fileptr->multidata[tmpcolor->id] = CENDAFTER;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "marking line %ld as CENDAFTER\n", (long)fileptr->lineno); fprintf(stderr, "marking line %ld as CENDAFTER\n", (long)fileptr->lineno);
#endif #endif
@ -1965,7 +1965,7 @@ void precalc_multicolorinfo(void)
#endif #endif
} }
alloc_multidata_if_needed(endptr); alloc_multidata_if_needed(endptr);
fileptr->multidata[tmpcolor->id] |= CBEGINBEFORE; fileptr->multidata[tmpcolor->id] = CBEGINBEFORE;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "marking line %ld as CBEGINBEFORE\n", (long)fileptr->lineno); fprintf(stderr, "marking line %ld as CBEGINBEFORE\n", (long)fileptr->lineno);
#endif #endif