From f0ff2f4ea7e77a5706331286203b5b659046534a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 12 Sep 2018 20:31:09 +0530
Subject: [PATCH] Fix a bug causing incorrect line ordering when viewing the
 scrollback buffer if the scrollback buffer is full

Fixes #960
---
 docs/changelog.rst | 3 +++
 kitty/history.c    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index c98ebe2e2..59bee1d7c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -30,6 +30,9 @@ Changelog
   hopefully workaround a bug in glfw that causes crashes when unplugging
   monitors with full screen windows. (:iss:`898`)
 
+- Fix a bug causing incorrect line ordering when viewing the scrollback buffer
+  if the scrollback buffer is full (:iss:`960`)
+
 - Fix drag-scrolling not working when the mouse leaves the window confines
   (:iss:`917`)
 
diff --git a/kitty/history.c b/kitty/history.c
index 09c7c0d60..b8d80bfd2 100644
--- a/kitty/history.c
+++ b/kitty/history.c
@@ -207,7 +207,7 @@ as_ansi(HistoryBuf *self, PyObject *callback) {
 }
 
 static inline Line*
-get_line(HistoryBuf *self, index_type y, Line *l) { init_line(self, y, l); return l; }
+get_line(HistoryBuf *self, index_type y, Line *l) { init_line(self, index_of(self, self->count - y - 1), l); return l; }
 
 static PyObject*
 as_text(HistoryBuf *self, PyObject *args) {