From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Tue, 26 Apr 2005 17:21:47 +0000 (+0000)
Subject: oops; in do_output(), properly allow wrapping when we insert a tab, for
X-Git-Tag: v1.3.8~309
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=6595b715d0266ef22d11211c959a62bd4955bb1b;p=nano.git

oops; in do_output(), properly allow wrapping when we insert a tab, for
consistency; this is incompatible with Pico, but Pico doesn't wrap
properly when other control characters are on a line, either, so its
behavior with regard to tabs is apparently a bug; besides, we wrap at
all other blank characters, including multibyte ones, so we shouldn't
make an exception for tabs


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

diff --git a/ChangeLog b/ChangeLog
index 5ef47822..281c288e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,8 +33,8 @@ CVS code -
 	  unnecessary update, and remove an unneeded clearok(FALSE).
 	  (DLR)
   do_output()
-	- Fix off-by-one error that allowed wrapping when we inserted a
-	  tab, for Pico compatibility. (DLR)
+	- Properly allow wrapping when we insert a tab, for consistency.
+	  (DLR)
 - utils.c:
   num_of_digits()
 	- Use a size_t instead of an int, and rename to digits(). (DLR)
diff --git a/src/nano.c b/src/nano.c
index 01c475ec..f27fbefe 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -3927,9 +3927,8 @@ void do_output(char *output, size_t output_len, bool allow_cntrls)
 	do_right(FALSE);
 
 #ifndef DISABLE_WRAPPING
-	/* If we're wrapping text and we didn't insert a tab, we need to
-	 * call edit_refresh(). */
-	if (!ISSET(NO_WRAP) && output[i - 1] != '\t') {
+	/* If we're wrapping text, we need to call edit_refresh(). */
+	if (!ISSET(NO_WRAP)) {
 	    bool do_refresh_save = do_refresh;
 
 	    do_refresh = do_wrap(current);