From: Benno Schulenberg <bensberg@justemail.net>
Date: Mon, 2 Nov 2015 11:24:22 +0000 (+0000)
Subject: Eliding two variables.
X-Git-Tag: v2.5.0~73
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=d0e8887e3b24bf5daea74ddc51142671216b3f94;p=nano.git

Eliding two variables.


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

diff --git a/ChangeLog b/ChangeLog
index 1eff2b41..b17987da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2015-11-02  Benno Schulenberg  <bensberg@justemail.net>
 	* src/nano.h: Delete an unused type definition.
 	* src/nano.h: Improve several comments.
+	* src_text.c(do_wrap): Elide two variables.
 
 2015-10-31  Benno Schulenberg  <bensberg@justemail.net>
 	* src/nano.c (copy_from_filestruct): When pasting while the mark is
diff --git a/src/text.c b/src/text.c
index 5c1c8518..4d1a3266 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1190,12 +1190,6 @@ bool do_wrap(filestruct *line)
 	/* The length of the line we wrap. */
     ssize_t wrap_loc;
 	/* The index of line->data where we wrap. */
-#ifndef NANO_TINY
-    const char *indent_string = NULL;
-	/* Indentation to prepend to the new line. */
-    size_t indent_len = 0;
-	/* The length of indent_string. */
-#endif
     const char *after_break;
 	/* The text after the wrap point. */
     size_t after_break_len;
@@ -1245,14 +1239,8 @@ bool do_wrap(filestruct *line)
 #ifndef NANO_TINY
     /* If autoindent is turned on, and we're on the character just after
      * the indentation, we don't wrap. */
-    if (ISSET(AUTOINDENT)) {
-	/* Get the indentation of this line. */
-	indent_string = line->data;
-	indent_len = indent_length(indent_string);
-
-	if (wrap_loc == indent_len)
-	    return FALSE;
-    }
+    if (ISSET(AUTOINDENT) && wrap_loc == indent_length(line->data))
+	return FALSE;
 
     add_undo(SPLIT_BEGIN);
 #endif