simplify
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4142 35c25a1d-7b9e-4130-9fde-d3aeb78583b8master
parent
d1ab89a929
commit
f03171917f
13
src/nano.c
13
src/nano.c
|
@ -395,19 +395,14 @@ void copy_from_filestruct(filestruct *file_top, filestruct *file_bot)
|
||||||
filestruct *top_save;
|
filestruct *top_save;
|
||||||
bool edittop_inside;
|
bool edittop_inside;
|
||||||
#ifndef NANO_TINY
|
#ifndef NANO_TINY
|
||||||
bool right_side_up = FALSE;
|
bool do_mark_shift = FALSE;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
assert(file_top != NULL && file_bot != NULL);
|
assert(file_top != NULL && file_bot != NULL);
|
||||||
|
|
||||||
#ifndef NANO_TINY
|
#ifndef NANO_TINY
|
||||||
if (openfile->mark_set) {
|
if (openfile->mark_set)
|
||||||
filestruct *top, *bot;
|
do_mark_shift = (openfile->current_x <= openfile->mark_begin_x);
|
||||||
size_t top_x, bot_x;
|
|
||||||
|
|
||||||
mark_order((const filestruct **)&top, &top_x,
|
|
||||||
(const filestruct **)&bot, &bot_x, &right_side_up);
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Partition the filestruct so that it contains no text, and keep
|
/* Partition the filestruct so that it contains no text, and keep
|
||||||
|
@ -433,7 +428,7 @@ void copy_from_filestruct(filestruct *file_top, filestruct *file_bot)
|
||||||
#ifndef NANO_TINY
|
#ifndef NANO_TINY
|
||||||
if (openfile->mark_set) {
|
if (openfile->mark_set) {
|
||||||
openfile->mark_begin = openfile->current;
|
openfile->mark_begin = openfile->current;
|
||||||
if (!right_side_up)
|
if (do_mark_shift)
|
||||||
openfile->mark_begin_x += openfile->current_x;
|
openfile->mark_begin_x += openfile->current_x;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue