bugfix for ticket #3280 - mcview: search off-by-one between plain and hex modes
Signed-off-by: Andreas Mohr <and@gmx.li>
diff -ruN mc-4.8.13/src/viewer/nroff.c mc-4.8.13.patch/src/viewer/nroff.c
old
|
new
|
|
202 | 202 | continue; |
203 | 203 | } |
204 | 204 | |
205 | | if (view->search_start <= from && from < view->search_end) |
| 205 | if (view->search_start < from && from <= view->search_end) |
206 | 206 | { |
207 | 207 | tty_setcolor (SELECTED_COLOR); |
208 | 208 | } |
diff -ruN mc-4.8.13/src/viewer/plain.c mc-4.8.13.patch/src/viewer/plain.c
old
|
new
|
|
140 | 140 | continue; |
141 | 141 | } |
142 | 142 | |
143 | | if (view->search_start <= from && from < view->search_end) |
| 143 | if (view->search_start < from && from <= view->search_end) |
144 | 144 | tty_setcolor (SELECTED_COLOR); |
145 | 145 | else |
146 | 146 | tty_setcolor (VIEW_NORMAL_COLOR); |
diff -ruN mc-4.8.13/src/viewer/search.c mc-4.8.13.patch/src/viewer/search.c
old
|
new
|
|
168 | 168 | view->search->normal_offset - view->search->start_buffer) : 0; |
169 | 169 | view->search_start = view->search->normal_offset + nroff_len; |
170 | 170 | |
171 | | if (!view->hex_mode) |
172 | | view->search_start++; |
173 | | |
174 | 171 | nroff_len = |
175 | 172 | view->text_nroff_mode ? mcview__get_nroff_real_len (view, view->search_start - 1, |
176 | 173 | match_len) : 0; |