Resolved conflict, indulging new file layout

1 files changed, 0 insertions, 55 deletions

diff --git a/oldresources/st/patch/scrollback.c b/oldresources/st/patch/scrollback.c
deleted file mode 100644
index 2644cfe..0000000
--- a/oldresources/st/patch/scrollback.c
+++ /dev/null
@@ -1,55 +0,0 @@
-void
-kscrolldown(const Arg* a)
-{
-	int n = a->i;
-
-	if (n < 0)
-		n = term.row + n;
-
-	if (n > term.scr)
-		n = term.scr;
-
-	if (term.scr > 0) {
-		term.scr -= n;
-		selscroll(0, -n);
-		tfulldirt();
-	}
-
-	#if SIXEL_PATCH
-	scroll_images(-1*n);
-	#endif // SIXEL_PATCH
-
-	#if OPENURLONCLICK_PATCH
-	if (n > 0)
-		restoremousecursor();
-	#endif // OPENURLONCLICK_PATCH
-}
-
-void
-kscrollup(const Arg* a)
-{
-	int n = a->i;
-	if (n < 0)
-		n = term.row + n;
-
-	if (term.scr + n > term.histn)
-		n = term.histn - term.scr;
-
-	if (!n)
-		return;
-
-	if (term.scr <= HISTSIZE-n) {
-		term.scr += n;
-		selscroll(0, n);
-		tfulldirt();
-	}
-
-	#if SIXEL_PATCH
-	scroll_images(n);
-	#endif // SIXEL_PATCH
-
-	#if OPENURLONCLICK_PATCH
-	if (n > 0)
-		restoremousecursor();
-	#endif // OPENURLONCLICK_PATCH
-}