Fix merge error

chrisws · chrisws · commit d62c436021ec · 2015-07-18T09:08:14.000+10:00
diff --git a/configure.ac b/configure.ac
@@ -210,9 +210,6 @@ function buildSDL() {
      PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.2)
      AC_SUBST(FONTCONFIG_CFLAGS)
      AC_SUBST(FONTCONFIG_LIBS)
-     AC_DEFINE(OS_PREC64, 1, [64 bit variables])
-
-     PACKAGE_CFLAGS="${PACKAGE_CFLAGS} ${FONTCONFIG_CFLAGS}"
 
      PACKAGE_CFLAGS="${PACKAGE_CFLAGS} ${FONTCONFIG_CFLAGS}"
 
diff --git a/src/ui/ansiwidget.cpp b/src/ui/ansiwidget.cpp
@@ -268,14 +268,6 @@ bool AnsiWidget::scroll(bool up, bool page) {
     }
   }
 
-  if (page) {
-    if (vscroll < 0 && _front->_scrollY > 0) {
-      vscroll = 0;
-    } else if (vscroll >= maxVScroll) {
-      vscroll = maxVScroll - _front->_charHeight;
-    }
-  }
-
   if (vscroll >= 0 && vscroll < maxVScroll) {
     _front->drawInto();
     _front->_scrollY = vscroll;

Original file line number	Diff line number	Diff line change
`@@ -268,14 +268,6 @@ bool AnsiWidget::scroll(bool up, bool page) {`
`268`	`268`	`}`
`269`	`269`	`}`
`270`	`270`
`271`		`- if (page) {`
`272`		`- if (vscroll < 0 && _front->_scrollY > 0) {`
`273`		`- vscroll = 0;`
`274`		`- } else if (vscroll >= maxVScroll) {`
`275`		`- vscroll = maxVScroll - _front->_charHeight;`
`276`		`- }`
`277`		`- }`
`278`		`-`
`279`	`271`	`if (vscroll >= 0 && vscroll < maxVScroll) {`
`280`	`272`	`_front->drawInto();`
`281`	`273`	`_front->_scrollY = vscroll;`