ChangeLog.pre-2.1 in EXTRA_DIST, so that "make dist" works
again.
* files.c (do_insertfile): Make sure the mark is always properly
- positioned after inserting a one-line file with the mark on.
+ positioned after inserting a file with the mark on.
+ * nano.c (copy_from_file): Make sure the mark is always properly
+ positioned after uncutting multiple lines with the mark on.
2007-08-11 David Lawrence Ramsey <pooka109@gmail.com>
#ifndef NANO_TINY
if (openfile->mark_set)
do_mark_shift = (openfile->current_x <=
- openfile->mark_begin_x);
+ openfile->mark_begin_x ||
+ openfile->current->lineno <=
+ openfile->mark_begin->lineno);
+
#endif
#ifdef ENABLE_MULTIBUFFER
}
openfile->current_x;
}
#endif
- openfile->current_x += strlen(filepart->top_data);
+ openfile->current_x += current_x_save;
}
+#ifndef NANO_TINY
+ else if (openfile->mark_set && do_mark_shift)
+ openfile->mark_begin_x -= current_x_save;
+#endif
/* Update the current y-coordinate to account for the
* number of lines inserted. */
void copy_from_filestruct(filestruct *file_top, filestruct *file_bot)
{
filestruct *top_save;
+ size_t current_x_save = openfile->current_x;
bool edittop_inside;
#ifndef NANO_TINY
bool do_mark_shift = FALSE;
edittop_inside = (openfile->edittop == openfile->fileage);
#ifndef NANO_TINY
if (openfile->mark_set)
- do_mark_shift = (openfile->current_x <= openfile->mark_begin_x);
+ do_mark_shift = (openfile->current_x <=
+ openfile->mark_begin_x || openfile->current->lineno <=
+ openfile->mark_begin->lineno);
#endif
/* Put the top and bottom of the filestruct at copies of file_top
openfile->mark_begin_x += openfile->current_x;
}
#endif
- openfile->current_x += strlen(filepart->top_data);
+ openfile->current_x += current_x_save;
}
+#ifndef NANO_TINY
+ else if (openfile->mark_set && do_mark_shift)
+ openfile->mark_begin_x -= current_x_save;
+#endif
/* Get the number of characters in the copied text, and add it to
* totsize. */