--- new-vte.c	2004-12-10 15:46:36.000000000 +0000
+++ ori-vte.c	2004-12-10 16:33:15.000000000 +0000
@@ -1924,20 +1924,20 @@
 	}
 }
 
-/* Scroll a fixed number of lines up or down, in the current screen. */
+/* Scroll up or down in the current screen. */
 static void
-vte_terminal_scroll_lines(VteTerminal *terminal, gint lines)
+vte_terminal_scroll_pages(VteTerminal *terminal, gint pages)
 {
 	glong destination;
 	g_return_if_fail(VTE_IS_TERMINAL(terminal));
 #ifdef VTE_DEBUG
 	if (_vte_debug_on(VTE_DEBUG_IO)) {
-		fprintf(stderr, "Scrolling %d lines.\n", lines);
+		fprintf(stderr, "Scrolling %d pages.\n", pages);
 	}
 #endif
 	/* Calculate the ideal position where we want to be before clamping. */
 	destination = floor(gtk_adjustment_get_value(terminal->adjustment));
-	destination += lines;
+	destination += (pages * terminal->row_count);
 	/* Can't scroll past data we have. */
 	destination = CLAMP(destination,
 			    terminal->adjustment->lower,
@@ -1950,13 +1950,6 @@
 	vte_terminal_emit_contents_changed(terminal);
 }
 
-/* Scroll a fixed number of pages up or down, in the current screen. */
-static void
-vte_terminal_scroll_pages(VteTerminal *terminal, gint pages)
-{
-	vte_terminal_scroll_lines(terminal, pages * terminal->row_count);
-}
-
 /* Scroll so that the scroll delta is the minimum value. */
 static void
 vte_terminal_maybe_scroll_to_top(VteTerminal *terminal)
@@ -8558,24 +8551,6 @@
 			}
 			break;
 		/* Keypad/motion keys. */
-		case GDK_KP_Up:
-		case GDK_Up:
-           if (terminal->pvt->modifiers & GDK_SHIFT_MASK) {
-			   vte_terminal_scroll_lines(terminal, -1);
-	 		   scrolled = TRUE;
-	 		   handled = TRUE;
-	 		   suppress_meta_esc = TRUE;
-		   }
-		   break;
-		case GDK_KP_Down:
-		case GDK_Down:
-			if (terminal->pvt->modifiers & GDK_SHIFT_MASK) {
-				vte_terminal_scroll_lines(terminal, 1);
-				scrolled = TRUE;
-				handled = TRUE;
-				suppress_meta_esc = TRUE;
-			}
-			break;
 		case GDK_KP_Page_Up:
 		case GDK_Page_Up:
 			if (terminal->pvt->modifiers & GDK_SHIFT_MASK) {
