From c35eb5a16ec84b2ce11f53583313b3d73b9eb796 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Mon, 9 Jun 2014 10:35:44 +0000 Subject: [PATCH] Avoiding a compiler warning with --disable-wrapping. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4947 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 2 ++ src/nano.h | 6 +++++- src/text.c | 5 ++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2eaee2fa..2e5b2efd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-06-09 Benno Schulenberg * src/nano.c (do_input): Remove two superfluous false conditions. + * src/nano.h, src/text.c (add_undo): Avoid a compiler warning with + --disable-wrapping. 2014-06-09 Mark Majeres * src/text.c (do_undo, do_redo, add_undo, update_undo, do-wrap): diff --git a/src/nano.h b/src/nano.h index e5ecb008..18f5b68b 100644 --- a/src/nano.h +++ b/src/nano.h @@ -187,7 +187,11 @@ typedef enum { } function_type; typedef enum { - ADD, DEL, BACK, REPLACE, SPLIT_BEGIN, SPLIT_END, UNSPLIT, CUT, CUT_EOF, PASTE, ENTER, INSERT, OTHER + ADD, DEL, BACK, CUT, CUT_EOF, REPLACE, +#ifndef DISABLE_WRAPPING + SPLIT_BEGIN, SPLIT_END, +#endif + UNSPLIT, PASTE, INSERT, ENTER, OTHER } undo_type; typedef struct color_pair { diff --git a/src/text.c b/src/text.c index 458bd7b1..7325709b 100644 --- a/src/text.c +++ b/src/text.c @@ -876,13 +876,16 @@ void add_undo(undo_type current_action) u->type = current_action; u->lineno = fs->current->lineno; u->begin = fs->current_x; +#ifndef DISABLE_WRAPPING if (u->type == SPLIT_BEGIN) { /* Some action, most likely an ADD, was performed that invoked * do_wrap(). Rearrange the undo order so that this previous * action is after the SPLIT_BEGIN undo. */ u->next = fs->undotop->next ; fs->undotop->next = u; - } else { + } else +#endif + { u->next = fs->undotop; fs->undotop = u; fs->current_undo = u; -- 2.39.5