fix enum/#define conflict

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2086 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/src/cut.c b/src/cut.c
index 35b2ae0b2149ab2f7fa7c33feb2b042999b96367..70acc4317f791f032342409f6740c41db84b7596 100644 (file)
--- 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 3b422ef1068b6305c64824426c57dded33919ce5..d2d55e18d35abff4843cb6e8508b6e9ce0386395 100644 (file)
--- 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 {