- No blank lines on top of pager if pager_index_lines>0.

Changed files:
    mutt-blanklines.patch -> 1.3

diff --git a/mutt-blanklines.patch b/mutt-blanklines.patch
index 6e0765d38620eb4f256121a0c10cb5f52667c48f..c77c01220c20634484a97d7a2a5222943ad69111 100644 (file)
--- a/mutt-blanklines.patch
+++ b/mutt-blanklines.patch
@@ -1,6 +1,6 @@
 diff -ur mutt-1.1.11.orig/curs_main.c mutt-1.1.11/curs_main.c
 --- mutt-1.1.11.orig/curs_main.c       Sun Apr 16 16:38:52 2000
-+++ mutt-1.1.11/curs_main.c    Sun Apr 16 16:44:36 2000
++++ mutt-1.1.11/curs_main.c    Mon Apr 17 18:54:09 2000
 @@ -399,8 +399,8 @@
    
    menu = mutt_new_menu ();
@@ -14,7 +14,7 @@ diff -ur mutt-1.1.11.orig/curs_main.c mutt-1.1.11/curs_main.c
    menu->current = ci_first_message ();
 diff -ur mutt-1.1.11.orig/globals.h mutt-1.1.11/globals.h
 --- mutt-1.1.11.orig/globals.h Fri Mar  3 11:10:08 2000
-+++ mutt-1.1.11/globals.h      Sun Apr 16 16:44:36 2000
++++ mutt-1.1.11/globals.h      Mon Apr 17 18:54:09 2000
 @@ -122,6 +122,7 @@
  
  WHERE unsigned short Counter INITVAL (0);
@@ -25,7 +25,7 @@ diff -ur mutt-1.1.11.orig/globals.h mutt-1.1.11/globals.h
  WHERE short PagerIndexLines;
 diff -ur mutt-1.1.11.orig/init.h mutt-1.1.11/init.h
 --- mutt-1.1.11.orig/init.h    Sun Apr 16 16:38:53 2000
-+++ mutt-1.1.11/init.h Sun Apr 16 16:44:36 2000
++++ mutt-1.1.11/init.h Mon Apr 17 18:54:09 2000
 @@ -254,6 +254,12 @@
    ** notifying you of new mail.  This is independent of the setting of the
    ** ``$$beep'' variable.
@@ -41,7 +41,7 @@ diff -ur mutt-1.1.11.orig/init.h mutt-1.1.11/init.h
    ** .pp
 diff -ur mutt-1.1.11.orig/menu.c mutt-1.1.11/menu.c
 --- mutt-1.1.11.orig/menu.c    Fri Mar  3 11:10:10 2000
-+++ mutt-1.1.11/menu.c Sun Apr 16 16:53:21 2000
++++ mutt-1.1.11/menu.c Mon Apr 17 18:54:09 2000
 @@ -125,13 +125,13 @@
      SETCOLOR (MT_COLOR_STATUS);
      mvprintw (option (OPTSTATUSONTOP) ? LINES-2 : 0, 0, "%-*.*s", COLS, COLS, menu->help);
@@ -62,13 +62,13 @@ diff -ur mutt-1.1.11.orig/menu.c mutt-1.1.11/menu.c
    mutt_show_error ();
 diff -ur mutt-1.1.11.orig/pager.c mutt-1.1.11/pager.c
 --- mutt-1.1.11.orig/pager.c   Fri Mar  3 11:10:11 2000
-+++ mutt-1.1.11/pager.c        Sun Apr 16 17:02:11 2000
++++ mutt-1.1.11/pager.c        Mon Apr 17 18:55:37 2000
 @@ -1510,9 +1510,9 @@
        {
        indexoffset = 0;
        statusoffset = IsHeader (extra) ? indexlen : 0;
 -      bodyoffset = statusoffset + 1;
-+      bodyoffset = statusoffset + 1 + BlankLines;
++      bodyoffset = statusoffset + 1 + (PagerIndexLines > 0 ? 0 : BlankLines);
        helpoffset = LINES - 2;
 -      bodylen = helpoffset - bodyoffset;
 +      bodylen = helpoffset - bodyoffset - BlankLines;
@@ -82,14 +82,14 @@ diff -ur mutt-1.1.11.orig/pager.c mutt-1.1.11/pager.c
 -      bodyoffset = indexoffset + (IsHeader (extra) ? indexlen : 0);
 -      bodylen = statusoffset - bodyoffset;
 +      bodyoffset = indexoffset + (IsHeader (extra) ? indexlen : 0) +
-+        BlankLines;
++        (PagerIndexLines > 0 ? 0 : BlankLines);
 +      bodylen = statusoffset - bodyoffset - BlankLines;
        }
  
        if (option (OPTHELP))
 diff -ur mutt-1.1.11.orig/patchlist.c mutt-1.1.11/patchlist.c
 --- mutt-1.1.11.orig/patchlist.c       Sun Apr 16 16:38:53 2000
-+++ mutt-1.1.11/patchlist.c    Sun Apr 16 16:44:36 2000
++++ mutt-1.1.11/patchlist.c    Mon Apr 17 18:54:09 2000
 @@ -15,7 +15,8 @@
    /* DO NOT MODIFY BEFORE THIS LINE */