Commit c35eb5a1 authored by Benno Schulenberg's avatar Benno Schulenberg
Browse files

Avoiding a compiler warning with --disable-wrapping.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4947 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
No related merge requests found
Showing with 11 additions and 2 deletions
+11 -2
2014-06-09 Benno Schulenberg <bensberg@justemail.net>
* 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 <mark@engine12.com>
* src/text.c (do_undo, do_redo, add_undo, update_undo, do-wrap):
......
......@@ -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 {
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment