ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix enum/#define conflict 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2086 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2004-11-07 23:05:48 +00:00
parent fdd3becc1e
commit fd9da07e6c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cut.c
View File

@ -248,7 +248,7 @@ void do_cut_text(void)
} }
do_delete(); do_delete();
marked_cut = CUT_TO_END; marked_cut = CUT_TO_EOL;
return; return;
} else { } else {
SET(MARK_ISSET); SET(MARK_ISSET);
@ -324,7 +324,7 @@ void do_uncut_text(void)
* these. */ * these. */
if (marked_cut == CUT_LINE) { if (marked_cut == CUT_LINE) {
if (current_x > 0) if (current_x > 0)
marked_cut = CUT_TO_END; marked_cut = CUT_TO_EOL;
else else
placewewant = 0; 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 /* 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 * the line, so we have to screw up all the work we just did and
* separate the line. */ * separate the line. */
if (marked_cut == CUT_TO_END) { if (marked_cut == CUT_TO_EOL) {
tmp = make_new_node(current); tmp = make_new_node(current);
tmp->data = mallocstrcpy(NULL, current->data + current_x); tmp->data = mallocstrcpy(NULL, current->data + current_x);
splice_node(current, tmp, current->next); splice_node(current, tmp, current->next);

2
src/nano.h
View File

@ -146,7 +146,7 @@
/* Enumeration types. */ /* Enumeration types. */
typedef enum { typedef enum {
CUT_LINE, CUT_MARKED, CUT_TO_END CUT_LINE, CUT_MARKED, CUT_TO_EOL
} cut_type; } cut_type;
typedef enum { typedef enum {