From 3cf338aca8b0543aca230bb5a4aa17769952aa8c Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Wed, 18 Jun 2014 19:59:12 +0000 Subject: [PATCH] Eliding the in fact unneeded 'to_eof' git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4980 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 1 + src/nano.h | 2 -- src/text.c | 8 +++----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index feb745d9..f71921e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2014-06-18 Benno Schulenberg * src/text.c: Rename 'to_end' to 'to_eof', to lessen confusion with CUT_TO_END (which is about cutting to end-of-line). + * src/text.c: Upon better thought, elide the unneeded 'to_eof'. 2014-06-18 Mark Majeres * src/text.c (add_undo): Don't start a new undo for CUT when the diff --git a/src/nano.h b/src/nano.h index c73e5ffa..a616225c 100644 --- a/src/nano.h +++ b/src/nano.h @@ -344,8 +344,6 @@ typedef struct undo { /* Copy of cutbottom. */ bool mark_set; /* Was the marker set when we cut? */ - bool to_eof; - /* Was this a cut to the end-of-file? */ ssize_t mark_begin_lineno; /* copy copy copy */ size_t mark_begin_x; diff --git a/src/text.c b/src/text.c index 9304cc83..10f0e227 100644 --- a/src/text.c +++ b/src/text.c @@ -425,7 +425,7 @@ void redo_cut(undo *u) openfile->mark_set = TRUE; openfile->mark_begin_x = (u->xflags == UNcut_cutline) ? 0 : u->mark_begin_x; - do_cut_text(FALSE, u->to_eof, TRUE); + do_cut_text(FALSE, u->type == CUT_EOF, TRUE); openfile->mark_set = FALSE; openfile->mark_begin = NULL; openfile->mark_begin_x = 0; @@ -896,7 +896,6 @@ void add_undo(undo_type current_action) u->mark_begin_lineno = fs->current->lineno; u->mark_begin_x = fs->current_x; u->xflags = 0; - u->to_eof = FALSE; switch (u->type) { /* We need to start copying data into the undo buffer @@ -939,7 +938,6 @@ void add_undo(undo_type current_action) u->strdata = data; break; case CUT_EOF: - u->to_eof = TRUE; case CUT: cutbuffer_reset(); u->mark_set = openfile->mark_set; @@ -947,7 +945,7 @@ void add_undo(undo_type current_action) u->mark_begin_lineno = openfile->mark_begin->lineno; u->mark_begin_x = openfile->mark_begin_x; } - else if (!ISSET(CUT_TO_END) && !u->to_eof) { + else if (!ISSET(CUT_TO_END) && u->type != CUT_EOF) { /* The entire line is being cut regardless of the cursor position. */ u->begin = 0; u->xflags = UNcut_cutline; @@ -1076,7 +1074,7 @@ void update_undo(undo_type action) u->cutbottom = u->cutbuffer; while (u->cutbottom->next != NULL) u->cutbottom = u->cutbottom->next; - if (!u->to_eof) + if (u->type != CUT_EOF) u->lineno++; } break; -- 2.39.5