merge (argh)

bobf · bobf · commit 0d2039dbf9eb · 2009-06-19T00:46:35.000+01:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1375,11 +1375,11 @@ def p_key(self):
             self.undo()
             return ''
 
-        elif self.c == 'KEY_UP': # Cursor Up
+        elif self.c in ('KEY_UP', ) + key_dispatch['C-p']: # Cursor Up/C-p
             self.back()
             return ''
 
-        elif self.c == 'KEY_DOWN': # Cursor Down
+        elif self.c in ('KEY_DOWN', ) + key_dispatch['C-n']: # Cursor Down/C-n
             self.fwd()
             return ''
 
