From b2b0d3310529dff99917f538f9d6ae953cc2d221 Mon Sep 17 00:00:00 2001
From: Roland Illig <roland.illig@gmx.de>
Date: Tue, 7 Jun 2005 07:37:00 +0000
Subject: [PATCH] 	* view.c (view_move_up): In text wrap mode, don't
 display parts 	of lines that only consist of the (invisible) newline
 character. 	* view.c (view_move_down): Likewise.

---
 src/ChangeLog |  3 +++
 src/view.c    | 25 ++++++++++++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index f6541d73d..867b6e543 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,9 @@
 	* view.c (view_ccache_lookup): Replaced the min_nroff_column
 	variable with a state chart, which makes the code clearer and
 	fixes a bug in translating line/column pairs into offsets.
+	* view.c (view_move_up): In text wrap mode, don't display parts
+	of lines that only consist of the (invisible) newline character.
+	* view.c (view_move_down): Likewise.
 
 2005-05-31  David Martin  <dmartina@excite.com>
 
diff --git a/src/view.c b/src/view.c
index 72020291c..6b85cc97b 100644
--- a/src/view.c
+++ b/src/view.c
@@ -1120,7 +1120,14 @@ view_move_up (WView *view, offset_type lines)
 	    } else if (line >= 1) {
 		view_coord_to_offset (view, &linestart, line, 0);
 		view_offset_to_coord (view, &line, &col, linestart - 1);
-		col -= col % width;
+
+		/* if the only thing that would be displayed were a
+		 * single newline character, advance to the previous
+		 * part of the line. */
+		if (col > 0 && col % width == 0)
+		    col -= width;
+		else
+		    col -= col % width;
 	    } else {
 		/* nothing to do */
 	    }
@@ -1157,12 +1164,20 @@ view_move_down (WView *view, offset_type lines)
 
 	if (view->text_wrap_mode) {
 	    for (i = 0; i < lines; i++) {
+		offset_type new_offset, chk_line, chk_col;
+
 		view_offset_to_coord (view, &line, &col, view->dpy_topleft);
 		col += view_get_datacolumns (view);
-		/* if col is too big here, view_coord_to_offset()
-		 * automatically sets dpy_topleft to the beginning
-		 * of the next line. */
-		view_coord_to_offset (view, &(view->dpy_topleft), line, col);
+		view_coord_to_offset (view, &new_offset, line, col);
+
+		/* skip to the next line if the only thing that would be
+		 * displayed is the newline character. */
+		view_offset_to_coord (view, &chk_line, &chk_col, new_offset);
+		if (chk_line == line && chk_col == col
+		    && get_byte (view, new_offset) == '\n')
+		    new_offset++;
+
+		view->dpy_topleft = new_offset;
 	    }
 	} else {
 	    view_offset_to_coord (view, &line, &col, view->dpy_topleft);