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

build: fix compilation when configured with --enable-tiny

master
Benno Schulenberg 2018-07-10 15:31:04 +02:00
parent ce0ecf67a6
commit 3ac821ee0c
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/cut.c
View File

@ -111,7 +111,7 @@ void cut_to_eof(void)
* copy_text is TRUE, copy the text back into the buffer afterward. * copy_text is TRUE, copy the text back into the buffer afterward.
* If cut_till_eof is TRUE, move all text from the current cursor * If cut_till_eof is TRUE, move all text from the current cursor
* position to the end of the file into the cutbuffer. */ * position to the end of the file into the cutbuffer. */
void do_cut_text(bool copy_text, bool cut_till_eof) void do_cut_text(bool copy_text, bool marked, bool cut_till_eof)
{ {
#ifndef NANO_TINY #ifndef NANO_TINY
filestruct *cb_save = NULL; filestruct *cb_save = NULL;
@ -126,11 +126,11 @@ void do_cut_text(bool copy_text, bool cut_till_eof)
size_t was_totsize = openfile->totsize; size_t was_totsize = openfile->totsize;
/* If cuts were not continuous, or when cutting a region, clear the slate. */ /* If cuts were not continuous, or when cutting a region, clear the slate. */
if (!keep_cutbuffer || openfile->mark || cut_till_eof) { if (!keep_cutbuffer || marked || cut_till_eof) {
free_filestruct(cutbuffer); free_filestruct(cutbuffer);
cutbuffer = NULL; cutbuffer = NULL;
/* After a line cut, future line cuts should add to the cutbuffer. */ /* After a line cut, future line cuts should add to the cutbuffer. */
keep_cutbuffer = !openfile->mark && !cut_till_eof; keep_cutbuffer = !marked && !cut_till_eof;
} }
#ifndef NANO_TINY #ifndef NANO_TINY
@ -198,10 +198,10 @@ void do_cut_text_void(void)
{ {
#ifndef NANO_TINY #ifndef NANO_TINY
add_undo(CUT); add_undo(CUT);
#endif do_cut_text(FALSE, openfile->mark, FALSE);
do_cut_text(FALSE, FALSE);
#ifndef NANO_TINY
update_undo(CUT); update_undo(CUT);
#else
do_cut_text(FALSE, FALSE, FALSE);
#endif #endif
} }
@ -223,7 +223,7 @@ void do_copy_text(void)
if (mark_is_set || openfile->current != next_contiguous_line) if (mark_is_set || openfile->current != next_contiguous_line)
cutbuffer_reset(); cutbuffer_reset();
do_cut_text(TRUE, FALSE); do_cut_text(TRUE, mark_is_set, FALSE);
/* 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_is_set ? NULL : openfile->current); next_contiguous_line = (mark_is_set ? NULL : openfile->current);
@ -241,7 +241,7 @@ void do_copy_text(void)
void do_cut_till_eof(void) void do_cut_till_eof(void)
{ {
add_undo(CUT_TO_EOF); add_undo(CUT_TO_EOF);
do_cut_text(FALSE, TRUE); do_cut_text(FALSE, FALSE, TRUE);
update_undo(CUT_TO_EOF); update_undo(CUT_TO_EOF);
} }
#endif /* !NANO_TINY */ #endif /* !NANO_TINY */

2
src/proto.h
View File

@ -253,7 +253,7 @@ bool keeping_cutbuffer(void);
#ifndef NANO_TINY #ifndef NANO_TINY
void cut_marked(bool *right_side_up); void cut_marked(bool *right_side_up);
#endif #endif
void do_cut_text(bool copy_text, bool cut_till_eof); void do_cut_text(bool copy_text, bool marked, bool cut_till_eof);
void do_cut_text_void(void); void do_cut_text_void(void);
#ifndef NANO_TINY #ifndef NANO_TINY
void do_copy_text(void); void do_copy_text(void);

6
src/text.c
View File

@ -666,7 +666,7 @@ void redo_cut(undo *u)
openfile->mark = fsfromline(u->mark_begin_lineno); openfile->mark = fsfromline(u->mark_begin_lineno);
openfile->mark_x = (u->xflags == WAS_WHOLE_LINE) ? 0 : u->mark_begin_x; openfile->mark_x = (u->xflags == WAS_WHOLE_LINE) ? 0 : u->mark_begin_x;
do_cut_text(FALSE, FALSE); do_cut_text(FALSE, TRUE, FALSE);
free_filestruct(cutbuffer); free_filestruct(cutbuffer);
cutbuffer = oldcutbuffer; cutbuffer = oldcutbuffer;
@ -1180,7 +1180,7 @@ bool execute_command(const char *command)
if (ISSET(MULTIBUFFER)) { if (ISSET(MULTIBUFFER)) {
switch_to_prev_buffer(); switch_to_prev_buffer();
if (openfile->mark) if (openfile->mark)
do_cut_text(TRUE, FALSE); do_cut_text(TRUE, TRUE, FALSE);
} else } else
#endif #endif
{ {
@ -1190,7 +1190,7 @@ bool execute_command(const char *command)
openfile->current_x = 0; openfile->current_x = 0;
} }
add_undo(CUT); add_undo(CUT);
do_cut_text(FALSE, openfile->mark == NULL); do_cut_text(FALSE, openfile->mark, openfile->mark == NULL);
update_undo(CUT); update_undo(CUT);
} }