revert the simplification of the display_string() call in
do_replace_loop(), as it breaks display in some ways git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2645 35c25a1d-7b9e-4130-9fde-d3aeb78583b8master
parent
7291daabe3
commit
5ed8819f35
|
@ -191,8 +191,6 @@ CVS code -
|
||||||
work properly when we've replaced one or more instances of a
|
work properly when we've replaced one or more instances of a
|
||||||
string in copy and haven't yet updated current->data to match
|
string in copy and haven't yet updated current->data to match
|
||||||
copy. (DLR)
|
copy. (DLR)
|
||||||
- Simplify the display_string() call that we use to get the word
|
|
||||||
that we're going to highlight. (DLR)
|
|
||||||
- utils.c:
|
- utils.c:
|
||||||
num_of_digits()
|
num_of_digits()
|
||||||
- Use a size_t instead of an int, and rename to digits(). (DLR)
|
- Use a size_t instead of an int, and rename to digits(). (DLR)
|
||||||
|
|
|
@ -751,10 +751,9 @@ ssize_t do_replace_loop(const char *needle, const filestruct
|
||||||
numreplaced = 0;
|
numreplaced = 0;
|
||||||
|
|
||||||
if (!replaceall) {
|
if (!replaceall) {
|
||||||
char *exp_word;
|
|
||||||
size_t xpt = xplustabs();
|
size_t xpt = xplustabs();
|
||||||
|
char *exp_word = display_string(current->data, xpt,
|
||||||
exp_word = display_string(current->data, xpt, match_len,
|
strnlenpt(current->data, current_x + match_len) - xpt,
|
||||||
FALSE);
|
FALSE);
|
||||||
|
|
||||||
curs_set(0);
|
curs_set(0);
|
||||||
|
|
Loading…
Reference in New Issue