ports/nano
ports/nano
1
1
Форкнуть 0
Код Релизы 1 Активность

tweaks: elide the 'mark_set' boolean -- the 'mark' pointer is enough

Просмотр исходного кода 
The pointer not being NULL is enough indication that the mark is set.

Also, rename the pointer from 'mark_begin' to simply 'mark', since
the former is kind of pleonastic.
Этот коммит содержится в:
Benno Schulenberg 2017-05-12 18:07:32 +02:00 коммит произвёл Benno Schulenberg
родитель c42489d946
Коммит c24e95e3d6
8 изменённых файлов: 170 добавлений и 193 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
src/cut.c
Просмотреть файл

@ -147,10 +147,10 @@ void do_cut_text(bool copy_text, bool cut_till_eof)
if (cut_till_eof) { if (cut_till_eof) {
/* Move all text up to the end of the file into the cutbuffer. */ /* Move all text up to the end of the file into the cutbuffer. */
cut_to_eof(); cut_to_eof();
} else if (openfile->mark_set) { } else if (openfile->mark) {
/* Move the marked text to the cutbuffer, and turn the mark off. */ /* Move the marked text to the cutbuffer, and turn the mark off. */
cut_marked(&right_side_up); cut_marked(&right_side_up);
openfile->mark_set = FALSE; openfile->mark = NULL;
} else if (ISSET(CUT_FROM_CURSOR)) } else if (ISSET(CUT_FROM_CURSOR))
/* Move all text up to the end of the line into the cutbuffer. */ /* Move all text up to the end of the line into the cutbuffer. */
cut_to_eol(); cut_to_eol();
@ -216,7 +216,7 @@ void do_cut_text_void(void)
void do_copy_text(void) void do_copy_text(void)
{ {
static struct filestruct *next_contiguous_line = NULL; static struct filestruct *next_contiguous_line = NULL;
bool mark_set = openfile->mark_set; bool mark_set = (openfile->mark != NULL);
/* Remember the current viewport and cursor position. */ /* Remember the current viewport and cursor position. */
ssize_t is_edittop_lineno = openfile->edittop->lineno; ssize_t is_edittop_lineno = openfile->edittop->lineno;
@ -232,8 +232,8 @@ void do_copy_text(void)
/* If the mark was set, blow away the cutbuffer on the next copy. */ /* If the mark was set, blow away the cutbuffer on the next copy. */
next_contiguous_line = (mark_set ? NULL : openfile->current); next_contiguous_line = (mark_set ? NULL : openfile->current);
/* If the mark was set, restore the viewport and cursor position. */
if (mark_set) { if (mark_set) {
/* Restore the viewport and cursor position. */
openfile->edittop = fsfromline(is_edittop_lineno); openfile->edittop = fsfromline(is_edittop_lineno);
openfile->firstcolumn = is_firstcolumn; openfile->firstcolumn = is_firstcolumn;
openfile->current = fsfromline(is_current_lineno); openfile->current = fsfromline(is_current_lineno);

17
src/files.c
Просмотреть файл

@ -93,10 +93,7 @@ void make_new_buffer(void)
openfile->modified = FALSE; openfile->modified = FALSE;
#ifndef NANO_TINY #ifndef NANO_TINY
openfile->mark_set = FALSE; openfile->mark = NULL;
openfile->mark_begin = NULL;
openfile->mark_begin_x = 0;
openfile->kind_of_mark = SOFTMARK;
openfile->fmt = NIX_FILE; openfile->fmt = NIX_FILE;
@ -1594,7 +1591,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
* only if the file has not been modified by someone else since nano * only if the file has not been modified by someone else since nano
* opened it. */ * opened it. */
if (ISSET(BACKUP_FILE) && !tmp && realexists && openfile->current_stat && if (ISSET(BACKUP_FILE) && !tmp && realexists && openfile->current_stat &&
(method != OVERWRITE || openfile->mark_set || (method != OVERWRITE || openfile->mark ||
openfile->current_stat->st_mtime == st.st_mtime)) { openfile->current_stat->st_mtime == st.st_mtime)) {
static struct timespec filetime[2]; static struct timespec filetime[2];
char *backupname; char *backupname;
@ -1952,7 +1949,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
} }
#ifndef NANO_TINY #ifndef NANO_TINY
if (!openfile->mark_set) if (!openfile->mark)
/* Get or update the stat info to reflect the current state. */ /* Get or update the stat info to reflect the current state. */
stat_with_alloc(realname, &openfile->current_stat); stat_with_alloc(realname, &openfile->current_stat);
#endif #endif
@ -2039,7 +2036,7 @@ int do_writeout(bool exiting, bool withprompt)
given = mallocstrcpy(NULL, given = mallocstrcpy(NULL,
#ifndef NANO_TINY #ifndef NANO_TINY
(openfile->mark_set && !exiting) ? "" : (openfile->mark && !exiting) ? "" :
#endif #endif
openfile->filename); openfile->filename);
@ -2057,7 +2054,7 @@ int do_writeout(bool exiting, bool withprompt)
* Selection to File" prompt. This function is disabled, since * Selection to File" prompt. This function is disabled, since
* it allows reading from or writing to files not specified on * it allows reading from or writing to files not specified on
* the command line. */ * the command line. */
if (openfile->mark_set && !exiting && !ISSET(RESTRICTED)) if (openfile->mark && !exiting && !ISSET(RESTRICTED))
/* TRANSLATORS: The next six strings are prompts. */ /* TRANSLATORS: The next six strings are prompts. */
msg = (method == PREPEND) ? _("Prepend Selection to File") : msg = (method == PREPEND) ? _("Prepend Selection to File") :
(method == APPEND) ? _("Append Selection to File") : (method == APPEND) ? _("Append Selection to File") :
@ -2186,7 +2183,7 @@ int do_writeout(bool exiting, bool withprompt)
if (!maychange) { if (!maychange) {
#ifndef NANO_TINY #ifndef NANO_TINY
if (exiting || !openfile->mark_set) if (exiting || !openfile->mark)
#endif #endif
{ {
if (do_yesno_prompt(FALSE, _("Save file under " if (do_yesno_prompt(FALSE, _("Save file under "
@ -2249,7 +2246,7 @@ int do_writeout(bool exiting, bool withprompt)
* function is disabled, since it allows reading from or * function is disabled, since it allows reading from or
* writing to files not specified on the command line. */ * writing to files not specified on the command line. */
#ifndef NANO_TINY #ifndef NANO_TINY
if (openfile->mark_set && !exiting && !ISSET(RESTRICTED)) if (openfile->mark && !exiting && !ISSET(RESTRICTED))
result = write_marked_file(answer, NULL, FALSE, method); result = write_marked_file(answer, NULL, FALSE, method);
else else
#endif #endif

60
src/nano.c
Просмотреть файл

@ -306,16 +306,16 @@ void extract_buffer(filestruct **file_top, filestruct **file_bot,
edittop_inside = (openfile->edittop->lineno >= openfile->fileage->lineno && edittop_inside = (openfile->edittop->lineno >= openfile->fileage->lineno &&
openfile->edittop->lineno <= openfile->filebot->lineno); openfile->edittop->lineno <= openfile->filebot->lineno);
#ifndef NANO_TINY #ifndef NANO_TINY
if (openfile->mark_set) { if (openfile->mark) {
mark_inside = (openfile->mark_begin->lineno >= mark_inside = (openfile->mark->lineno >=
openfile->fileage->lineno && openfile->fileage->lineno &&
openfile->mark_begin->lineno <= openfile->mark->lineno <=
openfile->filebot->lineno && openfile->filebot->lineno &&
(openfile->mark_begin != openfile->fileage || (openfile->mark != openfile->fileage ||
openfile->mark_begin_x >= top_x) && openfile->mark_x >= top_x) &&
(openfile->mark_begin != openfile->filebot || (openfile->mark != openfile->filebot ||
openfile->mark_begin_x <= bot_x)); openfile->mark_x <= bot_x));
same_line = (openfile->mark_begin == openfile->fileage); same_line = (openfile->mark == openfile->fileage);
} }
#endif #endif
@ -368,11 +368,11 @@ void extract_buffer(filestruct **file_top, filestruct **file_bot,
openfile->current_x = top_x; openfile->current_x = top_x;
#ifndef NANO_TINY #ifndef NANO_TINY
if (mark_inside) { if (mark_inside) {
openfile->mark_begin = openfile->current; openfile->mark = openfile->current;
openfile->mark_begin_x = openfile->current_x; openfile->mark_x = openfile->current_x;
} else if (same_line) } else if (same_line)
/* Update the pointer to this partially cut line. */ /* Update the pointer to this partially cut line. */
openfile->mark_begin = openfile->current; openfile->mark = openfile->current;
#endif #endif
top_save = openfile->fileage; top_save = openfile->fileage;
@ -412,7 +412,7 @@ void ingraft_buffer(filestruct *somebuffer)
#ifndef NANO_TINY #ifndef NANO_TINY
/* Keep track of whether the mark begins inside the partition and /* Keep track of whether the mark begins inside the partition and
* will need adjustment. */ * will need adjustment. */
if (openfile->mark_set) { if (openfile->mark) {
filestruct *top, *bot; filestruct *top, *bot;
size_t top_x, bot_x; size_t top_x, bot_x;
@ -445,10 +445,10 @@ void ingraft_buffer(filestruct *somebuffer)
* x coordinate for the change in the current line. */ * x coordinate for the change in the current line. */
if (openfile->fileage == openfile->filebot) { if (openfile->fileage == openfile->filebot) {
#ifndef NANO_TINY #ifndef NANO_TINY
if (openfile->mark_set && single_line) { if (openfile->mark && single_line) {
openfile->mark_begin = openfile->current; openfile->mark = openfile->current;
if (!right_side_up) if (!right_side_up)
openfile->mark_begin_x += openfile->current_x; openfile->mark_x += openfile->current_x;
} }
#endif #endif
/* When the pasted stuff contains no newline, adjust the cursor's /* When the pasted stuff contains no newline, adjust the cursor's
@ -456,12 +456,12 @@ void ingraft_buffer(filestruct *somebuffer)
openfile->current_x += current_x_save; openfile->current_x += current_x_save;
} }
#ifndef NANO_TINY #ifndef NANO_TINY
else if (openfile->mark_set && single_line) { else if (openfile->mark && single_line) {
if (right_side_up) if (right_side_up)
openfile->mark_begin = openfile->fileage; openfile->mark = openfile->fileage;
else { else {
openfile->mark_begin = openfile->current; openfile->mark = openfile->current;
openfile->mark_begin_x += openfile->current_x - current_x_save; openfile->mark_x += openfile->current_x - current_x_save;
} }
} }
#endif #endif
@ -1625,8 +1625,8 @@ int do_input(bool allow_funcs)
puddle[depth++] = (char)input; puddle[depth++] = (char)input;
} }
#ifndef NANO_TINY #ifndef NANO_TINY
if (openfile->mark_set && openfile->kind_of_mark == SOFTMARK) { if (openfile->mark && openfile->kind_of_mark == SOFTMARK) {
openfile->mark_set = FALSE; openfile->mark = NULL;
refresh_needed = TRUE; refresh_needed = TRUE;
} }
#endif #endif
@ -1690,10 +1690,9 @@ int do_input(bool allow_funcs)
{ {
#ifndef NANO_TINY #ifndef NANO_TINY
/* If Shifted movement occurs, set the mark. */ /* If Shifted movement occurs, set the mark. */
if (shift_held && !openfile->mark_set) { if (shift_held && !openfile->mark) {
openfile->mark_set = TRUE; openfile->mark = openfile->current;
openfile->mark_begin = openfile->current; openfile->mark_x = openfile->current_x;
openfile->mark_begin_x = openfile->current_x;
openfile->kind_of_mark = SOFTMARK; openfile->kind_of_mark = SOFTMARK;
} }
#endif #endif
@ -1701,10 +1700,9 @@ int do_input(bool allow_funcs)
s->scfunc(); s->scfunc();
#ifndef NANO_TINY #ifndef NANO_TINY
/* If Shiftless movement occurred, discard a soft mark. */ /* If Shiftless movement occurred, discard a soft mark. */
if (openfile->mark_set && !shift_held && if (!shift_held && openfile->mark &&
openfile->kind_of_mark == SOFTMARK) { openfile->kind_of_mark == SOFTMARK) {
openfile->mark_set = FALSE; openfile->mark = NULL;
openfile->mark_begin = NULL;
refresh_needed = TRUE; refresh_needed = TRUE;
} }
#endif #endif
@ -1835,9 +1833,9 @@ void do_output(char *output, size_t output_len, bool allow_cntrls)
add_undo(ADD); add_undo(ADD);
/* Note that current_x has not yet been incremented. */ /* Note that current_x has not yet been incremented. */
if (openfile->mark_set && openfile->current == openfile->mark_begin && if (openfile->current == openfile->mark &&
openfile->current_x < openfile->mark_begin_x) openfile->current_x < openfile->mark_x)
openfile->mark_begin_x += char_len; openfile->mark_x += char_len;
/* When the cursor is on the top row and not on the first chunk /* When the cursor is on the top row and not on the first chunk
* of a line, adding text there might change the preceding chunk * of a line, adding text there might change the preceding chunk

6
src/nano.h
Просмотреть файл

@ -382,11 +382,9 @@ typedef struct openfilestruct {
struct stat *current_stat; struct stat *current_stat;
/* The file's current stat information. */ /* The file's current stat information. */
#ifndef NANO_TINY #ifndef NANO_TINY
bool mark_set; filestruct *mark;
/* Whether the mark is on in this file. */
filestruct *mark_begin;
/* The file's line where the mark is, if any. */ /* The file's line where the mark is, if any. */
size_t mark_begin_x; size_t mark_x;
/* The file's mark's x-coordinate position, if any. */ /* The file's mark's x-coordinate position, if any. */
mark_type kind_of_mark; mark_type kind_of_mark;
/* Whether this is a soft or a hard mark. */ /* Whether this is a soft or a hard mark. */

32
src/search.c
Просмотреть файл

@ -83,7 +83,7 @@ void not_found_msg(const char *str)
void search_replace_abort(void) void search_replace_abort(void)
{ {
#ifndef NANO_TINY #ifndef NANO_TINY
if (openfile->mark_set) if (openfile->mark)
refresh_needed = TRUE; refresh_needed = TRUE;
#endif #endif
regexp_cleanup(); regexp_cleanup();
@ -140,7 +140,7 @@ int search_init(bool replacing, bool use_answer)
ISSET(BACKWARDS_SEARCH) ? _(" [Backwards]") : "", replacing ? ISSET(BACKWARDS_SEARCH) ? _(" [Backwards]") : "", replacing ?
#ifndef NANO_TINY #ifndef NANO_TINY
/* TRANSLATORS: The next two modify the search prompt. */ /* TRANSLATORS: The next two modify the search prompt. */
openfile->mark_set ? _(" (to replace) in selection") : openfile->mark ? _(" (to replace) in selection") :
#endif #endif
_(" (to replace)") : "", buf); _(" (to replace)") : "", buf);
@ -550,18 +550,18 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
bool skipone = FALSE; bool skipone = FALSE;
int modus = REPLACING; int modus = REPLACING;
#ifndef NANO_TINY #ifndef NANO_TINY
filestruct *was_mark = openfile->mark;
filestruct *top, *bot; filestruct *top, *bot;
size_t top_x, bot_x; size_t top_x, bot_x;
bool mark_was_set = openfile->mark_set;
bool right_side_up = FALSE; bool right_side_up = FALSE;
/* TRUE if (mark_begin, mark_begin_x) is the top of the mark, /* TRUE if (mark_begin, mark_begin_x) is the top of the mark,
* FALSE if (current, current_x) is. */ * FALSE if (current, current_x) is. */
/* If the mark is on, frame the region, and turn the mark off. */ /* If the mark is on, frame the region, and turn the mark off. */
if (mark_was_set) { if (openfile->mark) {
mark_order((const filestruct **)&top, &top_x, mark_order((const filestruct **)&top, &top_x,
(const filestruct **)&bot, &bot_x, &right_side_up); (const filestruct **)&bot, &bot_x, &right_side_up);
openfile->mark_set = FALSE; openfile->mark = NULL;
modus = INREGION; modus = INREGION;
/* Start either at the top or the bottom of the marked region. */ /* Start either at the top or the bottom of the marked region. */
@ -591,7 +591,7 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
#ifndef NANO_TINY #ifndef NANO_TINY
/* An occurrence outside of the marked region means we're done. */ /* An occurrence outside of the marked region means we're done. */
if (mark_was_set && (openfile->current->lineno > bot->lineno || if (was_mark && (openfile->current->lineno > bot->lineno ||
openfile->current->lineno < top->lineno || openfile->current->lineno < top->lineno ||
(openfile->current == bot && (openfile->current == bot &&
openfile->current_x + match_len > bot_x) || openfile->current_x + match_len > bot_x) ||
@ -643,20 +643,20 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
#ifndef NANO_TINY #ifndef NANO_TINY
/* If the mark was on and it was located after the cursor, /* If the mark was on and it was located after the cursor,
* then adjust its x position for any text length changes. */ * then adjust its x position for any text length changes. */
if (mark_was_set && !right_side_up) { if (was_mark && !right_side_up) {
if (openfile->current == openfile->mark_begin && if (openfile->current == was_mark &&
openfile->mark_begin_x > openfile->current_x) { openfile->mark_x > openfile->current_x) {
if (openfile->mark_begin_x < openfile->current_x + match_len) if (openfile->mark_x < openfile->current_x + match_len)
openfile->mark_begin_x = openfile->current_x; openfile->mark_x = openfile->current_x;
else else
openfile->mark_begin_x += length_change; openfile->mark_x += length_change;
bot_x = openfile->mark_begin_x; bot_x = openfile->mark_x;
} }
} }
/* If the mark was not on or it was before the cursor, then /* If the mark was not on or it was before the cursor, then
* adjust the cursor's x position for any text length changes. */ * adjust the cursor's x position for any text length changes. */
if (!mark_was_set || right_side_up) { if (!was_mark || right_side_up) {
#endif #endif
if (openfile->current == real_current && if (openfile->current == real_current &&
openfile->current_x < *real_current_x) { openfile->current_x < *real_current_x) {
@ -706,10 +706,8 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
else if (numreplaced > 0) else if (numreplaced > 0)
refresh_needed = TRUE; refresh_needed = TRUE;
#endif #endif
#ifndef NANO_TINY #ifndef NANO_TINY
if (mark_was_set) openfile->mark = was_mark;
openfile->mark_set = TRUE;
#endif #endif
/* If the NO_NEWLINES flag isn't set, and text has been added to the /* If the NO_NEWLINES flag isn't set, and text has been added to the

216
src/text.c
Просмотреть файл

@ -57,17 +57,14 @@ static completion_word *list_of_completions;
/* Toggle the mark. */ /* Toggle the mark. */
void do_mark(void) void do_mark(void)
{ {
openfile->mark_set = !openfile->mark_set; if (openfile->mark == NULL) {
if (openfile->mark_set) {
statusbar(_("Mark Set")); statusbar(_("Mark Set"));
openfile->mark_begin = openfile->current; openfile->mark = openfile->current;
openfile->mark_begin_x = openfile->current_x; openfile->mark_x = openfile->current_x;
openfile->kind_of_mark = HARDMARK; openfile->kind_of_mark = HARDMARK;
} else { } else {
statusbar(_("Mark Unset")); statusbar(_("Mark Unset"));
openfile->mark_begin = NULL; openfile->mark = NULL;
openfile->mark_begin_x = 0;
refresh_needed = TRUE; refresh_needed = TRUE;
} }
} }
@ -117,9 +114,9 @@ void do_deletion(undo_type action)
#ifndef NANO_TINY #ifndef NANO_TINY
/* Adjust the mark if it is after the cursor on the current line. */ /* Adjust the mark if it is after the cursor on the current line. */
if (openfile->mark_set && openfile->mark_begin == openfile->current && if (openfile->mark == openfile->current &&
openfile->mark_begin_x > openfile->current_x) openfile->mark_x > openfile->current_x)
openfile->mark_begin_x -= char_len; openfile->mark_x -= char_len;
#endif #endif
/* Adjust the file size. */ /* Adjust the file size. */
openfile->totsize--; openfile->totsize--;
@ -154,9 +151,9 @@ void do_deletion(undo_type action)
openfile->current_undo->newsize = openfile->totsize; openfile->current_undo->newsize = openfile->totsize;
/* Adjust the mark if it was on the line that was "eaten". */ /* Adjust the mark if it was on the line that was "eaten". */
if (openfile->mark_set && openfile->mark_begin == joining) { if (openfile->mark == joining) {
openfile->mark_begin = openfile->current; openfile->mark = openfile->current;
openfile->mark_begin_x += openfile->current_x; openfile->mark_x += openfile->current_x;
} }
#endif #endif
unlink_node(joining); unlink_node(joining);
@ -217,9 +214,8 @@ void do_cutword(bool backward)
do_next_word(ISSET(WORD_BOUNDS), FALSE); do_next_word(ISSET(WORD_BOUNDS), FALSE);
/* Set the mark at the start of that word. */ /* Set the mark at the start of that word. */
openfile->mark_begin = openfile->current; openfile->mark = openfile->current;
openfile->mark_begin_x = openfile->current_x; openfile->mark_x = openfile->current_x;
openfile->mark_set = TRUE;
/* Put the cursor back where it was, so an undo will put it there too. */ /* Put the cursor back where it was, so an undo will put it there too. */
openfile->current = is_current; openfile->current = is_current;
@ -286,8 +282,8 @@ void indent_a_line(filestruct *line, char *indentation)
openfile->totsize += indent_len; openfile->totsize += indent_len;
/* Compensate for the change in the current line. */ /* Compensate for the change in the current line. */
if (openfile->mark_set && line == openfile->mark_begin) if (line == openfile->mark)
openfile->mark_begin_x += indent_len; openfile->mark_x += indent_len;
if (line == openfile->current) { if (line == openfile->current) {
openfile->current_x += indent_len; openfile->current_x += indent_len;
openfile->placewewant = xplustabs(); openfile->placewewant = xplustabs();
@ -305,7 +301,7 @@ void do_indent(void)
size_t top_x, bot_x; size_t top_x, bot_x;
/* Use either all the marked lines or just the current line. */ /* Use either all the marked lines or just the current line. */
if (openfile->mark_set) if (openfile->mark)
mark_order((const filestruct **)&top, &top_x, mark_order((const filestruct **)&top, &top_x,
(const filestruct **)&bot, &bot_x, NULL); (const filestruct **)&bot, &bot_x, NULL);
else { else {
@ -387,11 +383,11 @@ void unindent_a_line(filestruct *line, size_t indent_len)
openfile->totsize -= indent_len; openfile->totsize -= indent_len;
/* Compensate for the change in the current line. */ /* Compensate for the change in the current line. */
if (openfile->mark_set && line == openfile->mark_begin) { if (line == openfile->mark) {
if (openfile->mark_begin_x < indent_len) if (openfile->mark_x < indent_len)
openfile->mark_begin_x = 0; openfile->mark_x = 0;
else else
openfile->mark_begin_x -= indent_len; openfile->mark_x -= indent_len;
} }
if (line == openfile->current) { if (line == openfile->current) {
if (openfile->current_x < indent_len) if (openfile->current_x < indent_len)
@ -410,7 +406,7 @@ void do_unindent(void)
size_t top_x, bot_x; size_t top_x, bot_x;
/* Use either all the marked lines or just the current line. */ /* Use either all the marked lines or just the current line. */
if (openfile->mark_set) if (openfile->mark)
mark_order((const filestruct **)&top, &top_x, mark_order((const filestruct **)&top, &top_x,
(const filestruct **)&bot, &bot_x, NULL); (const filestruct **)&bot, &bot_x, NULL);
else { else {
@ -512,7 +508,7 @@ void do_comment(void)
#endif #endif
/* Determine which lines to work on. */ /* Determine which lines to work on. */
if (openfile->mark_set) if (openfile->mark)
mark_order((const filestruct **)&top, &top_x, mark_order((const filestruct **)&top, &top_x,
(const filestruct **)&bot, &bot_x, NULL); (const filestruct **)&bot, &bot_x, NULL);
else { else {
@ -588,8 +584,8 @@ bool comment_line(undo_type action, filestruct *line, const char *comment_seq)
openfile->totsize += pre_len + post_len; openfile->totsize += pre_len + post_len;
/* If needed, adjust the position of the mark and of the cursor. */ /* If needed, adjust the position of the mark and of the cursor. */
if (openfile->mark_set && line == openfile->mark_begin) if (line == openfile->mark)
openfile->mark_begin_x += pre_len; openfile->mark_x += pre_len;
if (line == openfile->current) { if (line == openfile->current) {
openfile->current_x += pre_len; openfile->current_x += pre_len;
openfile->placewewant = xplustabs(); openfile->placewewant = xplustabs();
@ -613,11 +609,11 @@ bool comment_line(undo_type action, filestruct *line, const char *comment_seq)
openfile->totsize -= pre_len + post_len; openfile->totsize -= pre_len + post_len;
/* If needed, adjust the position of the mark and then the cursor. */ /* If needed, adjust the position of the mark and then the cursor. */
if (openfile->mark_set && line == openfile->mark_begin) { if (line == openfile->mark) {
if (openfile->mark_begin_x < pre_len) if (openfile->mark_x < pre_len)
openfile->mark_begin_x = 0; openfile->mark_x = 0;
else else
openfile->mark_begin_x -= pre_len; openfile->mark_x -= pre_len;
} }
if (line == openfile->current) { if (line == openfile->current) {
if (openfile->current_x < pre_len) if (openfile->current_x < pre_len)
@ -699,9 +695,8 @@ void redo_cut(undo *u)
goto_line_posx(u->lineno, u->begin); goto_line_posx(u->lineno, u->begin);
openfile->mark_set = TRUE; openfile->mark = fsfromline(u->mark_begin_lineno);
openfile->mark_begin = fsfromline(u->mark_begin_lineno); openfile->mark_x = (u->xflags == WAS_WHOLE_LINE) ? 0 : u->mark_begin_x;
openfile->mark_begin_x = (u->xflags == WAS_WHOLE_LINE) ? 0 : u->mark_begin_x;
do_cut_text(FALSE, FALSE); do_cut_text(FALSE, FALSE);
@ -837,9 +832,8 @@ void do_undo(void)
oldcutbottom = cutbottom; oldcutbottom = cutbottom;
cutbuffer = NULL; cutbuffer = NULL;
cutbottom = NULL; cutbottom = NULL;
openfile->mark_begin = fsfromline(u->mark_begin_lineno); openfile->mark = fsfromline(u->mark_begin_lineno);
openfile->mark_begin_x = u->mark_begin_x; openfile->mark_x = u->mark_begin_x;
openfile->mark_set = TRUE;
goto_line_posx(u->lineno, u->begin); goto_line_posx(u->lineno, u->begin);
cut_marked(NULL); cut_marked(NULL);
free_filestruct(u->cutbuffer); free_filestruct(u->cutbuffer);
@ -847,7 +841,6 @@ void do_undo(void)
u->cutbottom = cutbottom; u->cutbottom = cutbottom;
cutbuffer = oldcutbuffer; cutbuffer = oldcutbuffer;
cutbottom = oldcutbottom; cutbottom = oldcutbottom;
openfile->mark_set = FALSE;
break; break;
case REPLACE: case REPLACE:
undidmsg = _("text replace"); undidmsg = _("text replace");
@ -868,7 +861,7 @@ void do_undo(void)
openfile->current_undo = openfile->current_undo->next; openfile->current_undo = openfile->current_undo->next;
openfile->last_action = OTHER; openfile->last_action = OTHER;
openfile->mark_set = FALSE; openfile->mark = NULL;
openfile->placewewant = xplustabs(); openfile->placewewant = xplustabs();
openfile->totsize = u->wassize; openfile->totsize = u->wassize;
@ -1021,7 +1014,7 @@ void do_redo(void)
openfile->current_undo = u; openfile->current_undo = u;
openfile->last_action = OTHER; openfile->last_action = OTHER;
openfile->mark_set = FALSE; openfile->mark = NULL;
openfile->placewewant = xplustabs(); openfile->placewewant = xplustabs();
openfile->totsize = u->newsize; openfile->totsize = u->newsize;
@ -1070,10 +1063,10 @@ void do_enter(void)
add_undo(ENTER); add_undo(ENTER);
/* Adjust the mark if it was on the current line after the cursor. */ /* Adjust the mark if it was on the current line after the cursor. */
if (openfile->mark_set && openfile->current == openfile->mark_begin && if (openfile->current == openfile->mark &&
openfile->current_x < openfile->mark_begin_x) { openfile->current_x < openfile->mark_x) {
openfile->mark_begin = newnode; openfile->mark = newnode;
openfile->mark_begin_x += extra - openfile->current_x; openfile->mark_x += extra - openfile->current_x;
} }
#endif #endif
@ -1315,9 +1308,9 @@ void add_undo(undo_type action)
break; break;
case CUT: case CUT:
cutbuffer_reset(); cutbuffer_reset();
if (openfile->mark_set) { if (openfile->mark) {
u->mark_begin_lineno = openfile->mark_begin->lineno; u->mark_begin_lineno = openfile->mark->lineno;
u->mark_begin_x = openfile->mark_begin_x; u->mark_begin_x = openfile->mark_x;
u->xflags = MARK_WAS_SET; u->xflags = MARK_WAS_SET;
} else if (!ISSET(CUT_FROM_CURSOR)) { } else if (!ISSET(CUT_FROM_CURSOR)) {
/* The entire line is being cut regardless of the cursor position. */ /* The entire line is being cut regardless of the cursor position. */
@ -1802,9 +1795,8 @@ void justify_format(filestruct *paragraph, size_t skip)
#ifndef NANO_TINY #ifndef NANO_TINY
/* Keep track of the change in the current line. */ /* Keep track of the change in the current line. */
if (openfile->mark_set && openfile->mark_begin == if (openfile->mark == paragraph &&
paragraph && openfile->mark_begin_x >= end - openfile->mark_x >= end - paragraph->data)
paragraph->data)
mark_shift += end_len; mark_shift += end_len;
#endif #endif
} }
@ -1857,9 +1849,8 @@ void justify_format(filestruct *paragraph, size_t skip)
#ifndef NANO_TINY #ifndef NANO_TINY
/* Keep track of the change in the current line. */ /* Keep track of the change in the current line. */
if (openfile->mark_set && openfile->mark_begin == if (openfile->mark == paragraph &&
paragraph && openfile->mark_begin_x >= end - openfile->mark_x >= end - paragraph->data)
paragraph->data)
mark_shift += end_len; mark_shift += end_len;
#endif #endif
} }
@ -1895,10 +1886,10 @@ void justify_format(filestruct *paragraph, size_t skip)
#ifndef NANO_TINY #ifndef NANO_TINY
/* Adjust the mark coordinates to compensate for the change in /* Adjust the mark coordinates to compensate for the change in
* the current line. */ * the current line. */
if (openfile->mark_set && openfile->mark_begin == paragraph) { if (openfile->mark == paragraph) {
openfile->mark_begin_x -= mark_shift; openfile->mark_x -= mark_shift;
if (openfile->mark_begin_x > new_end - new_paragraph_data) if (openfile->mark_x > new_end - new_paragraph_data)
openfile->mark_begin_x = new_end - new_paragraph_data; openfile->mark_x = new_end - new_paragraph_data;
} }
#endif #endif
} else } else
@ -2027,13 +2018,13 @@ void backup_lines(filestruct *first_line, size_t par_len)
ssize_t edittop_lineno_save = openfile->edittop->lineno; ssize_t edittop_lineno_save = openfile->edittop->lineno;
ssize_t current_lineno_save = openfile->current->lineno; ssize_t current_lineno_save = openfile->current->lineno;
#ifndef NANO_TINY #ifndef NANO_TINY
bool old_mark_set = openfile->mark_set; bool mark_is_set = (openfile->mark != NULL);
ssize_t mb_lineno_save = 0; ssize_t mb_lineno_save = 0;
size_t mark_begin_x_save = 0; size_t mark_begin_x_save = 0;
if (old_mark_set) { if (mark_is_set) {
mb_lineno_save = openfile->mark_begin->lineno; mb_lineno_save = openfile->mark->lineno;
mark_begin_x_save = openfile->mark_begin_x; mark_begin_x_save = openfile->mark_x;
} }
#endif #endif
@ -2056,10 +2047,9 @@ void backup_lines(filestruct *first_line, size_t par_len)
if (openfile->current != openfile->fileage) { if (openfile->current != openfile->fileage) {
top = openfile->current->prev; top = openfile->current->prev;
#ifndef NANO_TINY #ifndef NANO_TINY
if (old_mark_set && if (mark_is_set && openfile->current->lineno == mb_lineno_save) {
openfile->current->lineno == mb_lineno_save) { openfile->mark = openfile->current;
openfile->mark_begin = openfile->current; openfile->mark_x = mark_begin_x_save;
openfile->mark_begin_x = mark_begin_x_save;
} }
#endif #endif
} else } else
@ -2072,9 +2062,9 @@ void backup_lines(filestruct *first_line, size_t par_len)
if (top->lineno == current_lineno_save) if (top->lineno == current_lineno_save)
openfile->current = top; openfile->current = top;
#ifndef NANO_TINY #ifndef NANO_TINY
if (old_mark_set && top->lineno == mb_lineno_save) { if (mark_is_set && top->lineno == mb_lineno_save) {
openfile->mark_begin = top; openfile->mark = top;
openfile->mark_begin_x = mark_begin_x_save; openfile->mark_x = mark_begin_x_save;
} }
#endif #endif
top = top->prev; top = top->prev;
@ -2191,8 +2181,8 @@ void do_justify(bool full_justify)
filestruct *current_save = openfile->current; filestruct *current_save = openfile->current;
size_t current_x_save = openfile->current_x; size_t current_x_save = openfile->current_x;
#ifndef NANO_TINY #ifndef NANO_TINY
filestruct *mark_begin_save = openfile->mark_begin; filestruct *was_mark = openfile->mark;
size_t mark_begin_x_save = openfile->mark_begin_x; size_t was_mark_x = openfile->mark_x;
#endif #endif
bool modified_save = openfile->modified; bool modified_save = openfile->modified;
@ -2335,9 +2325,9 @@ void do_justify(bool full_justify)
#ifndef NANO_TINY #ifndef NANO_TINY
/* If needed, adjust the coordinates of the mark. */ /* If needed, adjust the coordinates of the mark. */
if (openfile->mark_set && openfile->mark_begin == next_line) { if (openfile->mark == next_line) {
openfile->mark_begin = openfile->current; openfile->mark = openfile->current;
openfile->mark_begin_x += line_len - indent_len; openfile->mark_x += line_len - indent_len;
} }
#endif #endif
/* Don't destroy edittop! */ /* Don't destroy edittop! */
@ -2402,11 +2392,10 @@ void do_justify(bool full_justify)
#ifndef NANO_TINY #ifndef NANO_TINY
/* Adjust the mark coordinates to compensate for the change /* Adjust the mark coordinates to compensate for the change
* in the current line. */ * in the current line. */
if (openfile->mark_set && if (openfile->mark == openfile->current &&
openfile->mark_begin == openfile->current && openfile->mark_x > break_pos) {
openfile->mark_begin_x > break_pos) { openfile->mark = openfile->current->next;
openfile->mark_begin = openfile->current->next; openfile->mark_x -= break_pos - indent_len;
openfile->mark_begin_x -= break_pos - indent_len;
} }
#endif #endif
@ -2500,9 +2489,9 @@ void do_justify(bool full_justify)
openfile->current = current_save; openfile->current = current_save;
openfile->current_x = current_x_save; openfile->current_x = current_x_save;
#ifndef NANO_TINY #ifndef NANO_TINY
if (openfile->mark_set) { if (openfile->mark) {
openfile->mark_begin = mark_begin_save; openfile->mark = was_mark;
openfile->mark_begin_x = mark_begin_x_save; openfile->mark_x = was_mark_x;
} }
#endif #endif
openfile->modified = modified_save; openfile->modified = modified_save;
@ -2569,7 +2558,6 @@ bool do_int_spell_fix(const char *word)
unsigned stash[sizeof(flags) / sizeof(flags[0])]; unsigned stash[sizeof(flags) / sizeof(flags[0])];
/* A storage place for the current flag settings. */ /* A storage place for the current flag settings. */
#ifndef NANO_TINY #ifndef NANO_TINY
bool old_mark_set = openfile->mark_set;
bool right_side_up = FALSE; bool right_side_up = FALSE;
/* TRUE if (mark_begin, mark_begin_x) is the top of the mark, /* TRUE if (mark_begin, mark_begin_x) is the top of the mark,
* FALSE if (current, current_x) is. */ * FALSE if (current, current_x) is. */
@ -2591,7 +2579,7 @@ bool do_int_spell_fix(const char *word)
#ifndef NANO_TINY #ifndef NANO_TINY
/* If the mark is on, start at the beginning of the marked region. */ /* If the mark is on, start at the beginning of the marked region. */
if (old_mark_set) { if (openfile->mark) {
mark_order((const filestruct **)&top, &top_x, mark_order((const filestruct **)&top, &top_x,
(const filestruct **)&bot, &bot_x, &right_side_up); (const filestruct **)&bot, &bot_x, &right_side_up);
/* If the region is marked normally, swap the end points, so that /* If the region is marked normally, swap the end points, so that
@ -2599,10 +2587,9 @@ bool do_int_spell_fix(const char *word)
if (right_side_up) { if (right_side_up) {
openfile->current = top; openfile->current = top;
openfile->current_x = top_x; openfile->current_x = top_x;
openfile->mark_begin = bot; openfile->mark = bot;
openfile->mark_begin_x = bot_x; openfile->mark_x = bot_x;
} }
openfile->mark_set = FALSE;
} else } else
#endif #endif
/* Otherwise, start from the top of the file. */ /* Otherwise, start from the top of the file. */
@ -2623,9 +2610,14 @@ bool do_int_spell_fix(const char *word)
} else if (result == 1) { } else if (result == 1) {
size_t from_col = xplustabs(); size_t from_col = xplustabs();
size_t to_col = from_col + strlenpt(word); size_t to_col = from_col + strlenpt(word);
#ifndef NANO_TINY
filestruct *saved_mark = openfile->mark;
openfile->mark = NULL;
#endif
edit_refresh(); edit_refresh();
#ifndef NANO_TINY
openfile->mark = saved_mark;
#endif
spotlight(TRUE, from_col, to_col); spotlight(TRUE, from_col, to_col);
/* Let the user supply a correctly spelled alternative. */ /* Let the user supply a correctly spelled alternative. */
@ -2636,10 +2628,6 @@ bool do_int_spell_fix(const char *word)
/* If a replacement was given, go through all occurrences. */ /* If a replacement was given, go through all occurrences. */
if (proceed && strcmp(word, answer) != 0) { if (proceed && strcmp(word, answer) != 0) {
#ifndef NANO_TINY
/* Replacements should happen only in the marked region. */
openfile->mark_set = old_mark_set;
#endif
do_replace_loop(word, TRUE, current_save, &current_x_save); do_replace_loop(word, TRUE, current_save, &current_x_save);
/* TRANSLATORS: Shown after fixing misspellings in one word. */ /* TRANSLATORS: Shown after fixing misspellings in one word. */
@ -2649,18 +2637,17 @@ bool do_int_spell_fix(const char *word)
} }
#ifndef NANO_TINY #ifndef NANO_TINY
if (old_mark_set) { if (openfile->mark) {
/* Restore the (compensated) end points of the marked region. */ /* Restore the (compensated) end points of the marked region. */
if (right_side_up) { if (right_side_up) {
openfile->current = openfile->mark_begin; openfile->current = openfile->mark;
openfile->current_x = openfile->mark_begin_x; openfile->current_x = openfile->mark_x;
openfile->mark_begin = top; openfile->mark = top;
openfile->mark_begin_x = top_x; openfile->mark_x = top_x;
} else { } else {
openfile->current = top; openfile->current = top;
openfile->current_x = top_x; openfile->current_x = top_x;
} }
openfile->mark_set = TRUE;
} else } else
#endif #endif
{ {
@ -2932,17 +2919,17 @@ const char *do_alt_speller(char *tempfile_name)
#ifndef NANO_TINY #ifndef NANO_TINY
/* Replace the marked text (or the entire text) of the current buffer /* Replace the marked text (or the entire text) of the current buffer
* with the spell-checked text. */ * with the spell-checked text. */
if (openfile->mark_set) { if (openfile->mark) {
filestruct *top, *bot; filestruct *top, *bot;
size_t top_x, bot_x; size_t top_x, bot_x;
bool right_side_up; bool right_side_up;
ssize_t was_mark_lineno = openfile->mark_begin->lineno; ssize_t was_mark_lineno = openfile->mark->lineno;
openfile->mark_set = FALSE;
mark_order((const filestruct **)&top, &top_x, mark_order((const filestruct **)&top, &top_x,
(const filestruct **)&bot, &bot_x, &right_side_up); (const filestruct **)&bot, &bot_x, &right_side_up);
openfile->mark = NULL;
replace_marked_buffer(tempfile_name, top, top_x, bot, bot_x); replace_marked_buffer(tempfile_name, top, top_x, bot, bot_x);
/* Adjust the end point of the marked region for any change in /* Adjust the end point of the marked region for any change in
@ -2950,11 +2937,10 @@ const char *do_alt_speller(char *tempfile_name)
if (right_side_up) if (right_side_up)
current_x_save = openfile->current_x; current_x_save = openfile->current_x;
else else
openfile->mark_begin_x = openfile->current_x; openfile->mark_x = openfile->current_x;
/* Restore the mark's position and turn it back on. */ /* Restore the mark. */
openfile->mark_begin = fsfromline(was_mark_lineno); openfile->mark = fsfromline(was_mark_lineno);
openfile->mark_set = TRUE;
} else } else
#endif #endif
replace_buffer(tempfile_name); replace_buffer(tempfile_name);
@ -3008,7 +2994,7 @@ void do_spell(void)
} }
#ifndef NANO_TINY #ifndef NANO_TINY
if (openfile->mark_set) if (openfile->mark)
status = write_marked_file(temp, temp_file, TRUE, OVERWRITE); status = write_marked_file(temp, temp_file, TRUE, OVERWRITE);
else else
#endif #endif
@ -3068,7 +3054,7 @@ void do_linter(void)
return; return;
} }
openfile->mark_set = FALSE; openfile->mark = NULL;
edit_refresh(); edit_refresh();
if (openfile->modified) { if (openfile->modified) {
@ -3401,7 +3387,7 @@ void do_formatter(void)
#ifndef NANO_TINY #ifndef NANO_TINY
/* We're not supporting partial formatting, oi vey. */ /* We're not supporting partial formatting, oi vey. */
openfile->mark_set = FALSE; openfile->mark = NULL;
#endif #endif
status = write_file(temp, temp_file, TRUE, OVERWRITE, FALSE); status = write_file(temp, temp_file, TRUE, OVERWRITE, FALSE);
@ -3506,17 +3492,17 @@ void do_wordlinechar_count(void)
size_t current_x_save = openfile->current_x; size_t current_x_save = openfile->current_x;
size_t pww_save = openfile->placewewant; size_t pww_save = openfile->placewewant;
filestruct *current_save = openfile->current; filestruct *current_save = openfile->current;
bool old_mark_set = openfile->mark_set; filestruct *was_mark = openfile->mark;
filestruct *top, *bot; filestruct *top, *bot;
size_t top_x, bot_x; size_t top_x, bot_x;
/* If the mark is on, partition the buffer so that it /* If the mark is on, partition the buffer so that it
* contains only the marked text, and turn the mark off. */ * contains only the marked text, and turn the mark off. */
if (old_mark_set) { if (was_mark) {
mark_order((const filestruct **)&top, &top_x, mark_order((const filestruct **)&top, &top_x,
(const filestruct **)&bot, &bot_x, NULL); (const filestruct **)&bot, &bot_x, NULL);
filepart = partition_filestruct(top, top_x, bot, bot_x); filepart = partition_filestruct(top, top_x, bot, bot_x);
openfile->mark_set = FALSE; openfile->mark = NULL;
} }
/* Start at the top of the file. */ /* Start at the top of the file. */
@ -3536,14 +3522,14 @@ void do_wordlinechar_count(void)
/* Get the total line and character counts, as "wc -l" and "wc -c" /* Get the total line and character counts, as "wc -l" and "wc -c"
* do, but get the latter in multibyte characters. */ * do, but get the latter in multibyte characters. */
if (old_mark_set) { if (was_mark) {
nlines = openfile->filebot->lineno - openfile->fileage->lineno + 1; nlines = openfile->filebot->lineno - openfile->fileage->lineno + 1;
chars = get_totsize(openfile->fileage, openfile->filebot); chars = get_totsize(openfile->fileage, openfile->filebot);
/* Unpartition the buffer so that it contains all the text /* Unpartition the buffer so that it contains all the text
* again, and turn the mark back on. */ * again, and turn the mark back on. */
unpartition_filestruct(&filepart); unpartition_filestruct(&filepart);
openfile->mark_set = TRUE; openfile->mark = was_mark;
} else { } else {
nlines = openfile->filebot->lineno; nlines = openfile->filebot->lineno;
chars = openfile->totsize; chars = openfile->totsize;
@ -3555,7 +3541,7 @@ void do_wordlinechar_count(void)
openfile->placewewant = pww_save; openfile->placewewant = pww_save;
/* Display the total word, line, and character counts on the statusbar. */ /* Display the total word, line, and character counts on the statusbar. */
statusline(HUSH, _("%sWords: %lu Lines: %ld Chars: %lu"), old_mark_set ? statusline(HUSH, _("%sWords: %lu Lines: %ld Chars: %lu"), was_mark ?
_("In Selection: ") : "", (unsigned long)words, (long)nlines, _("In Selection: ") : "", (unsigned long)words, (long)nlines,
(unsigned long)chars); (unsigned long)chars);
} }

14
src/utils.c
Просмотреть файл

@ -513,18 +513,18 @@ void remove_magicline(void)
void mark_order(const filestruct **top, size_t *top_x, const filestruct void mark_order(const filestruct **top, size_t *top_x, const filestruct
**bot, size_t *bot_x, bool *right_side_up) **bot, size_t *bot_x, bool *right_side_up)
{ {
if ((openfile->current->lineno == openfile->mark_begin->lineno && if ((openfile->current->lineno == openfile->mark->lineno &&
openfile->current_x > openfile->mark_begin_x) || openfile->current_x > openfile->mark_x) ||
openfile->current->lineno > openfile->mark_begin->lineno) { openfile->current->lineno > openfile->mark->lineno) {
*top = openfile->mark_begin; *top = openfile->mark;
*top_x = openfile->mark_begin_x; *top_x = openfile->mark_x;
*bot = openfile->current; *bot = openfile->current;
*bot_x = openfile->current_x; *bot_x = openfile->current_x;
if (right_side_up != NULL) if (right_side_up != NULL)
*right_side_up = TRUE; *right_side_up = TRUE;
} else { } else {
*bot = openfile->mark_begin; *bot = openfile->mark;
*bot_x = openfile->mark_begin_x; *bot_x = openfile->mark_x;
*top = openfile->current; *top = openfile->current;
*top_x = openfile->current_x; *top_x = openfile->current_x;
if (right_side_up != NULL) if (right_side_up != NULL)

10
src/winio.c
Просмотреть файл

@ -2704,10 +2704,10 @@ void edit_draw(filestruct *fileptr, const char *converted,
#ifndef NANO_TINY #ifndef NANO_TINY
/* If the mark is on, and fileptr is at least partially selected, we /* If the mark is on, and fileptr is at least partially selected, we
* need to paint it. */ * need to paint it. */
if (openfile->mark_set && if (openfile->mark &&
(fileptr->lineno <= openfile->mark_begin->lineno || (fileptr->lineno <= openfile->mark->lineno ||
fileptr->lineno <= openfile->current->lineno) && fileptr->lineno <= openfile->current->lineno) &&
(fileptr->lineno >= openfile->mark_begin->lineno || (fileptr->lineno >= openfile->mark->lineno ||
fileptr->lineno >= openfile->current->lineno)) { fileptr->lineno >= openfile->current->lineno)) {
const filestruct *top, *bot; const filestruct *top, *bot;
/* The lines where the marked region begins and ends. */ /* The lines where the marked region begins and ends. */
@ -2878,7 +2878,7 @@ int update_softwrapped_line(filestruct *fileptr)
bool line_needs_update(const size_t old_column, const size_t new_column) bool line_needs_update(const size_t old_column, const size_t new_column)
{ {
#ifndef NANO_TINY #ifndef NANO_TINY
if (openfile->mark_set) if (openfile->mark)
return TRUE; return TRUE;
else else
#endif #endif
@ -3268,7 +3268,7 @@ void edit_redraw(filestruct *old_current, update_type manner)
#ifndef NANO_TINY #ifndef NANO_TINY
/* If the mark is on, update all lines between old_current and current. */ /* If the mark is on, update all lines between old_current and current. */
if (openfile->mark_set) { if (openfile->mark) {
filestruct *line = old_current; filestruct *line = old_current;
while (line != openfile->current) { while (line != openfile->current) {