From 9e2934fd27ce577ca01d27482af4bbd8fc706111 Mon Sep 17 00:00:00 2001
From: Chris Allegretta <chrisa@asty.org>
Date: Fri, 1 Dec 2000 23:49:48 +0000
Subject: [PATCH] Fix for do_next_word and screen updates

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@357 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
 ChangeLog   |  4 ++++
 nano.c      | 14 +++++++++++++-
 po/nano.pot | 56 ++++++++++++++++++++++++++---------------------------
 3 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a365d78b..2f53d152 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,10 @@ CVS code -
   nano_small_msg(), nano_disabled_msg()
 	- Added checks for disabled functions to see whether or not to
 	  declare them.
+  do_next_word()
+	- Update the previous line as well as the current one in case we
+	  have moved beyond COLS or back from COLS, patch submitted
+	  by Ryan Krebs.
 - search.c:
   do_replace_hilight()
 	- New function, displays the currently selected word as hilighted
diff --git a/nano.c b/nano.c
index 027c96d8..62272140 100644
--- a/nano.c
+++ b/nano.c
@@ -610,12 +610,13 @@ int do_enter_void(void)
 
 void do_next_word(void)
 {
-    filestruct *fileptr;
+    filestruct *fileptr, *old;
     int i;
 
     if (current == NULL)
 	return;
 
+    old = current;
     i = current_x;
     for (fileptr = current; fileptr != NULL; fileptr = fileptr->next) {
 	if (fileptr == current) {
@@ -643,8 +644,19 @@ void do_next_word(void)
 
     current_x = i;
     placewewant = xplustabs();
+
     if (current->lineno >= editbot->lineno)
 	edit_update(current, CENTER);
+    else {
+	/* If we've jumped lines, refresh the old line.  We can't just use
+	 * current->prev here, because we may have skipped over some blank
+	 * lines, in which case the previous line is the wrong one.
+	 */
+	if (current != old)
+	    update_line(old, 0);
+
+	update_line(current, current_x);
+    }
 
 }
 
diff --git a/po/nano.pot b/po/nano.pot
index c54c24e0..c56928bc 100644
--- a/po/nano.pot
+++ b/po/nano.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-12-01 13:55-0500\n"
+"POT-Creation-Date: 2000-12-01 18:47-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,7 +55,7 @@ msgstr ""
 msgid "File to insert [from ./] "
 msgstr ""
 
-#: files.c:284 files.c:309 files.c:517 nano.c:1397
+#: files.c:284 files.c:309 files.c:517 nano.c:1409
 msgid "Cancelled"
 msgstr ""
 
@@ -627,116 +627,116 @@ msgstr ""
 msgid "Mark UNset"
 msgstr ""
 
-#: nano.c:918
+#: nano.c:930
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr ""
 
-#: nano.c:969
+#: nano.c:981
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr ""
 
-#: nano.c:1022
+#: nano.c:1034
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr ""
 
-#: nano.c:1122
+#: nano.c:1134
 msgid "Edit a replacement"
 msgstr ""
 
-#: nano.c:1346
+#: nano.c:1358
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr ""
 
-#: nano.c:1362
+#: nano.c:1374
 msgid "Finished checking spelling"
 msgstr ""
 
-#: nano.c:1364
+#: nano.c:1376
 msgid "Spell checking failed"
 msgstr ""
 
-#: nano.c:1384
+#: nano.c:1396
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 
-#: nano.c:1547
+#: nano.c:1559
 msgid "Cannot resize top win"
 msgstr ""
 
-#: nano.c:1549
+#: nano.c:1561
 msgid "Cannot move top win"
 msgstr ""
 
-#: nano.c:1551
+#: nano.c:1563
 msgid "Cannot resize edit win"
 msgstr ""
 
-#: nano.c:1553
+#: nano.c:1565
 msgid "Cannot move edit win"
 msgstr ""
 
-#: nano.c:1555
+#: nano.c:1567
 msgid "Cannot resize bottom win"
 msgstr ""
 
-#: nano.c:1557
+#: nano.c:1569
 msgid "Cannot move bottom win"
 msgstr ""
 
-#: nano.c:1845
+#: nano.c:1857
 msgid "Can now UnJustify!"
 msgstr ""
 
-#: nano.c:1940
+#: nano.c:1952
 #, c-format
 msgid "%s enable/disable"
 msgstr ""
 
-#: nano.c:1952
+#: nano.c:1964
 msgid "enabled"
 msgstr ""
 
-#: nano.c:1953
+#: nano.c:1965
 msgid "disabled"
 msgstr ""
 
-#: nano.c:2183
+#: nano.c:2195
 msgid "Main: set up windows\n"
 msgstr ""
 
-#: nano.c:2196
+#: nano.c:2208
 msgid "Main: bottom win\n"
 msgstr ""
 
-#: nano.c:2202
+#: nano.c:2214
 msgid "Main: open file\n"
 msgstr ""
 
-#: nano.c:2239
+#: nano.c:2251
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr ""
 
-#: nano.c:2261
+#: nano.c:2273
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr ""
 
-#: nano.c:2294
+#: nano.c:2306
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr ""
 
-#: nano.c:2342
+#: nano.c:2354
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr ""
 
-#: nano.c:2368
+#: nano.c:2380
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr ""
-- 
2.39.5