From b605913b1d3c1092a6ff8382c162b0a0b9559b81 Mon Sep 17 00:00:00 2001
From: Boris Faure <billiob@gmail.com>
Date: Wed, 20 Mar 2013 22:50:16 +0100
Subject: [PATCH] reflow: fix backscroll expansion when full

---
 src/bin/termpty.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/bin/termpty.c b/src/bin/termpty.c
index be4a3798..f36b7d37 100644
--- a/src/bin/termpty.c
+++ b/src/bin/termpty.c
@@ -512,7 +512,7 @@ _termpty_horizontally_expand(Termpty *ty, int old_w, int old_h,
         Termsave *ts;
 
         if (ty->backscroll_num == ty->backmax - 1)
-          ts = ty->back[(ty->backpos + i) % ty->backscroll_num];
+          ts = ty->back[(ty->backpos + i) % ty->backmax];
         else
           ts = ty->back[i];
         if (!ts)
@@ -592,8 +592,16 @@ _termpty_horizontally_expand(Termpty *ty, int old_w, int old_h,
           }
      }
 
-   ty->backscroll_num = new_back_pos;
-   ty->backpos = new_back_pos;
+   if (new_back_pos >= ty->backmax)
+     {
+        ty->backscroll_num = ty->backmax - 1;
+        ty->backpos = 0;
+     }
+   else
+     {
+        ty->backscroll_num = new_back_pos;
+        ty->backpos = new_back_pos;
+     }
 
    free(ty->back);
    ty->back = new_back;