Chopping the now unused parameter 'undoing'.

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

diff --git a/ChangeLog b/ChangeLog
index 430ca8e150f51682228c63e6816997523935c036..1bd21b3af8041b704d7289fab1f5fca230f21adf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
        undo data, instead of running do_enter() again, because the latter
        will behave differently depending on the setting of autoindent.
        This addresses Debian bug #793053 reported by Clancy.
+       * src/text.c (do_enter): Chop the now unused parameter 'undoing'.
 
 2015-11-10  Benno Schulenberg  <bensberg@justemail.net>
        * src/winio.c (edit_draw): Skip a zero-length match only when there

diff --git a/src/nano.c b/src/nano.c
index 8e50848a243807bff7d0a16cb3ecc3ceb777e166..0886eeeca5b2ab12a0c19ed656b83748df42ecda 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -2010,7 +2010,7 @@ void do_output(char *output, size_t output_len, bool allow_cntrls)
                output[i] = '\n';
            /* Newline to Enter, if needed. */
            else if (output[i] == '\n') {
-               do_enter(FALSE);
+               do_enter();
                i++;
                continue;
            }

diff --git a/src/proto.h b/src/proto.h
index 09fe8726d4d65ddb055451a6c960a254441be34b..1fee0e9a0418f511fdb0eacdc70f66d3722bddd7 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -658,7 +658,7 @@ void do_unindent(void);
 void do_undo(void);
 void do_redo(void);
 #endif
-void do_enter(bool undoing);
+void do_enter(void);
 void do_enter_void(void);
 #ifndef NANO_TINY
 RETSIGTYPE cancel_command(int signal);

diff --git a/src/text.c b/src/text.c
index ff9951d71ac660c2ed1a42d5036d2a5e179b033e..2e99cc64309e0595613250d1272596c5593f3069 100644 (file)
--- a/src/text.c
+++ b/src/text.c
@@ -756,7 +756,7 @@ void do_redo(void)
 #endif /* !NANO_TINY */
 
 /* Someone hits Enter *gasp!* */
-void do_enter(bool undoing)
+void do_enter()
 {
     filestruct *newnode = make_new_node(openfile->current);
     size_t extra = 0;
@@ -764,9 +764,6 @@ void do_enter(bool undoing)
     assert(openfile->current != NULL && openfile->current->data != NULL);
 
 #ifndef NANO_TINY
-    if (!undoing)
-       add_undo(ENTER);
-
     /* Do auto-indenting, like the neolithic Turbo Pascal editor. */
     if (ISSET(AUTOINDENT)) {
        /* If we are breaking the line in the indentation, the new
@@ -809,18 +806,13 @@ void do_enter(bool undoing)
 
     openfile->placewewant = xplustabs();
 
-#ifndef NANO_TINY
-    if (!undoing)
-       update_undo(ENTER);
-#endif
-
     edit_refresh_needed = TRUE;
 }
 
 /* Need this again... */
 void do_enter_void(void)
 {
-    do_enter(FALSE);
+    do_enter();
 }
 
 #ifndef NANO_TINY
@@ -1314,7 +1306,7 @@ bool do_wrap(filestruct *line)
 
     /* Go to the wrap location and split the line there. */
     openfile->current_x = wrap_loc;
-    do_enter(FALSE);
+    do_enter();
 
     if (old_x < wrap_loc) {
        openfile->current_x = old_x;