From: Benno Schulenberg <bensberg@justemail.net>
Date: Wed, 18 Jun 2014 21:23:50 +0000 (+0000)
Subject: Removing a condition and a break that cancel each other.
X-Git-Tag: v2.3.5~76
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=a81e14132609a658bc5e796f73890f7ea624de24;p=nano.git

Removing a condition and a break that cancel each other.


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

diff --git a/ChangeLog b/ChangeLog
index ed3748ea..f7e4efa6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
 	* src/text.c: And elide a totally unused 'strdata2'.
 	* src/text.c: Rename the undo type UNSPLIT to JOIN, for clarity.
 	* src/global.c, src/rcfile.c: Rename function_type to key_type.
+	* src/text.c (break_line): Remove a condition and a break that
+	cancel each other.
 
 2014-06-18  Mark Majeres  <mark@engine12.com>
 	* src/text.c (add_undo): Don't start a new undo for CUT when the
diff --git a/src/text.c b/src/text.c
index 34d66a6e..8bff24a2 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1101,9 +1101,7 @@ void update_undo(undo_type action)
 #ifdef DEBUG
     fprintf(stderr, "Done in update_undo (type was %d)\n", action);
 #endif
-
-    }
-
+}
 #endif /* !NANO_TINY */
 
 #ifndef DISABLE_WRAPPING
@@ -1354,16 +1352,7 @@ ssize_t break_line(const char *line, ssize_t goal
     char_len = parse_mbchar(line, NULL, NULL);
     line += char_len;
 
-    while (*line != '\0' && (is_blank_mbchar(line)
-#ifndef DISABLE_HELP
-	|| (newln && *line == '\n')
-#endif
-	)) {
-#ifndef DISABLE_HELP
-	if (newln && *line == '\n')
-	    break;
-#endif
-
+    while (*line != '\0' && is_blank_mbchar(line)) {
 	char_len = parse_mbchar(line, NULL, NULL);
 
 	line += char_len;