Blank screen after end of file and before beginning.

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

diff --git a/TODO b/TODO
index d20725f668baadda4593d0c9f92ff0c7fa2dd1d1..0d28b641618f4371bee37960b0558949ee578846 100644 (file)
--- 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 f9577c305777b843467e1871422b2ee2ace93a08..e63ebe2f4076392abb4da8ce79b6292c52c4b907 100644 (file)
--- 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();