pythonthings
diff --git a/‎bpython/cli.py‎
Lines changed: 35 additions & 10 deletions b/‎bpython/cli.py‎
Lines changed: 35 additions & 10 deletions
diff --git a/‎bpython/repl.py‎
Lines changed: 26 additions & 10 deletions b/‎bpython/repl.py‎
Lines changed: 26 additions & 10 deletions
@@ -292,16 +292,6 @@ def atbol(self):
 
         return not self.s.lstrip()
 
-    def back(self):
-        """Replace the active line with previous line in history and
-        increment the index to keep track"""
-
-        self.cpos = 0
-        self.rl_history.enter(self.s)
-        self.clear_wrapped_lines()
-        self.s = self.rl_history.back()
-        self.print_line(self.s, clr=True)
-
     def bs(self, delete_tabs=True):
         """Process a backspace"""
 
@@ -498,6 +488,33 @@ def end(self, refresh=True):
 
         return True
 
+    def hbegin(self):
+        """Replace the active line with first line in history and
+        increment the index to keep track"""
+        self.cpos = 0
+        self.clear_wrapped_lines()
+        self.rl_history.enter(self.s)
+        self.s = self.rl_history.first()
+        self.print_line(self.s, clr=True)
+
+    def hend(self):
+        """Same as hbegin() but, well, forward"""
+        self.cpos = 0
+        self.clear_wrapped_lines()
+        self.rl_history.enter(self.s)
+        self.s = self.rl_history.last()
+        self.print_line(self.s, clr=True)
+
+    def back(self):
+        """Replace the active line with previous line in history and
+        increment the index to keep track"""
+
+        self.cpos = 0
+        self.clear_wrapped_lines()
+        self.rl_history.enter(self.s)
+        self.s = self.rl_history.back()
+        self.print_line(self.s, clr=True)
+
     def fwd(self):
         """Same as back() but, well, forward"""
 
@@ -787,6 +804,14 @@ def p_key(self, key):
             # Redraw (as there might have been highlighted parens)
             self.print_line(self.s)
 
+        elif key in ("KEY_NPAGE", '\T'): # page_down or \T
+            self.hend()
+            self.print_line(self.s)
+
+        elif key in ("KEY_PPAGE", '\S'): # page_up or \S
+            self.hbegin()
+            self.print_line(self.s)
+
         elif key in key_dispatch[config.cut_to_buffer_key]:  # cut to buffer
             self.cut_to_buffer()
             return ''
 
@@ -158,29 +158,45 @@ def append(self, line):
         if line:
             self.entries.append(line)
 
+    def first(self):
+        """Move back to the beginning of the history."""
+        if not self.is_at_end:
+            self.index = len(self.entries) - 1
+        return self.entries[-self.index]
+
     def back(self):
-        if not self.is_at_end():
+        """Move one step back in the history."""
+        if not self.is_at_end:
             self.index += 1
         return self.entries[-self.index]
 
+    def forward(self):
+        """Move one step forward in the history."""
+        if self.index > 1:
+            self.index -= 1
+            return self.entries[-self.index]
+        else:
+            self.index = 0
+            return self.saved_line
+
+    def last(self):
+        """Move forward to the end of the history."""
+        if not self.is_at_start:
+            self.index = 0
+        return self.entries[0]
+
+    @property
     def is_at_end(self):
-        return self.index >= len(self.entries)
+        return self.index >= len(self.entries) or self.index == -1
 
+    @property
     def is_at_start(self):
         return self.index == 0
 
     def enter(self, line):
         if self.index == 0:
             self.saved_line = line
 
-    def forward(self):
-        if self.index > 1:
-            self.index -= 1
-            return self.entries[-self.index]
-        else:
-            self.index = 0
-            return self.saved_line
-
     @classmethod
     def from_filename(cls, filename):
         history = cls()