From: Neil Brown <neilb@suse.de>
Date: Sat, 3 Jun 2006 01:36:02 +0000 (+0000)
Subject: Blank screen after end of file and before beginning.
X-Git-Tag: v0.7~33
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=88023a3450f2c29c4ceffc5f139ec2218f7f6441;p=wiggle.git

Blank screen after end of file and before beginning.

Signed-off-by: Neil Brown <neilb@suse.de>
---

diff --git a/TODO b/TODO
index d20725f..0d28b64 100644
--- a/TODO
+++ b/TODO
@@ -176,7 +176,7 @@ DONE - at same time, lines with no diff should show no diff.
  - put line/col number is status bar
  - allow cursor to move left/right an scroll-on-demand.
  - If we have selected 'before', then don't show 'after' lines..
- - blank after end and before begining
+DONE - blank after end and before begining
  - better movement:
         top
         bottom
@@ -187,7 +187,7 @@ DONE - at same time, lines with no diff should show no diff.
  - handle single .rej file
  - allow updates to be saved
  - allow editing???
-
+ - better colours?
 
 - extract.c should be able to extract half of a word-diff
 - extract.c should work on word-merges
diff --git a/vpatch.c b/vpatch.c
index f9577c3..e63ebe2 100644
--- a/vpatch.c
+++ b/vpatch.c
@@ -1394,6 +1394,8 @@ void merge_window(struct plist *p, FILE *f, int reverse)
 				else if ((tpos.side == 0 || tpos.side == -1) && (mode2 & (ORIG|BEFORE)))
 					draw_mline(i--,tpos,fm,fb,fa,ci.merger,start,cols, mode2&(ORIG|BEFORE|CHANGED|CHANGES));
 			}
+			while (i >= 1)
+				blank(i--, 0, cols, a_void);
 			tpos = pos; tpos2.p = pos.lo;
 			for (i=row; i<rows && ci.merger[tpos.p.m].type != End; ) {
 				mode2 = check_line(tpos, fm,fb,fa,ci.merger,mode);
@@ -1407,6 +1409,8 @@ void merge_window(struct plist *p, FILE *f, int reverse)
 				}
 				next_mline(&tpos, fm,fb,fa,ci.merger, mode);
 			}
+			while (i<rows)
+				blank(i++, 0, cols, a_void);
 		}
 		move(row,0);
 		c = getch();