From fd9da07e6c07c43ef34529410aa4869390c0d8e8 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Sun, 7 Nov 2004 23:05:48 +0000 Subject: [PATCH] fix enum/#define conflict git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2086 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- src/cut.c | 6 +++--- src/nano.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cut.c b/src/cut.c index 35b2ae0b..70acc431 100644 --- a/src/cut.c +++ b/src/cut.c @@ -248,7 +248,7 @@ void do_cut_text(void) } do_delete(); - marked_cut = CUT_TO_END; + marked_cut = CUT_TO_EOL; return; } else { SET(MARK_ISSET); @@ -324,7 +324,7 @@ void do_uncut_text(void) * these. */ if (marked_cut == CUT_LINE) { if (current_x > 0) - marked_cut = CUT_TO_END; + marked_cut = CUT_TO_EOL; else placewewant = 0; } @@ -414,7 +414,7 @@ void do_uncut_text(void) /* If we're doing a cut to end, we don't want anything else on * the line, so we have to screw up all the work we just did and * separate the line. */ - if (marked_cut == CUT_TO_END) { + if (marked_cut == CUT_TO_EOL) { tmp = make_new_node(current); tmp->data = mallocstrcpy(NULL, current->data + current_x); splice_node(current, tmp, current->next); diff --git a/src/nano.h b/src/nano.h index 3b422ef1..d2d55e18 100644 --- a/src/nano.h +++ b/src/nano.h @@ -146,7 +146,7 @@ /* Enumeration types. */ typedef enum { - CUT_LINE, CUT_MARKED, CUT_TO_END + CUT_LINE, CUT_MARKED, CUT_TO_EOL } cut_type; typedef enum { -- 2.39.5