mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-12-26 20:29:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Correcting the logic for adjusting the x position of the mark,

Browse Source 
and improving the comments.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5395 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Benno Schulenberg 2015-11-07 09:49:34 +00:00
parent b66e4bfa5b
commit a1c03ed5c1
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2015-11-07 Benno Schulenberg <bensberg@justemail.net>
* src/search.c (do_replace_loop): Correct the logic for adjusting the
x position of the mark -- it happened to work because 'mark_begin' is
NULL when 'old_mark_set' is FALSE. Also improve the comments.
2015-11-06 Benno Schulenberg <bensberg@justemail.net> 2015-11-06 Benno Schulenberg <bensberg@justemail.net>
* src/files.c (write_lockfile): Don't bail out when the hostname is * src/files.c (write_lockfile): Don't bail out when the hostname is
overlong, but instead truncate it properly and continue. This fixes overlong, but instead truncate it properly and continue. This fixes

15
src/search.c
View File

@ -747,14 +747,12 @@ ssize_t do_replace_loop(
length_change = strlen(copy) - strlen(openfile->current->data); length_change = strlen(copy) - strlen(openfile->current->data);
#ifndef NANO_TINY #ifndef NANO_TINY
/* If the mark was on and (mark_begin, mark_begin_x) was the /* If the mark was on and it was located after the cursor,
* top of it, don't change mark_begin_x. */ * then adjust its x position for any text length changes. */
if (!old_mark_set || !right_side_up) { if (old_mark_set && !right_side_up) {
/* Keep mark_begin_x in sync with the text changes. */
if (openfile->current == openfile->mark_begin && if (openfile->current == openfile->mark_begin &&
openfile->mark_begin_x > openfile->current_x) { openfile->mark_begin_x > openfile->current_x) {
if (openfile->mark_begin_x < openfile->current_x + if (openfile->mark_begin_x < openfile->current_x + match_len)
match_len)
openfile->mark_begin_x = openfile->current_x; openfile->mark_begin_x = openfile->current_x;
else else
openfile->mark_begin_x += length_change; openfile->mark_begin_x += length_change;
@ -762,11 +760,10 @@ ssize_t do_replace_loop(
} }
} }
/* If the mark was on and (current, current_x) was the top /* If the mark was not on or it was before the cursor, then
* of it, don't change real_current_x. */ * adjust the cursor's x position for any text length changes. */
if (!old_mark_set || right_side_up) { if (!old_mark_set || right_side_up) {
#endif #endif
/* Keep real_current_x in sync with the text changes. */
if (openfile->current == real_current && if (openfile->current == real_current &&
openfile->current_x <= *real_current_x) { openfile->current_x <= *real_current_x) {
if (*real_current_x < openfile->current_x + match_len) if (*real_current_x < openfile->current_x + match_len)