Merge.

Trundle · Trundle · commit d664538b9078 · 2009-07-28T11:23:40.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -2008,7 +2008,8 @@ def init_wins(scr, cols):
 # This should show to be configured keys from ~/.bpython/config
 # 
     statusbar = Statusbar(scr, main_win,
-        ".:: <C-d> Exit  <C-r> Rewind  <%s> Save  <%s> Pastebin ::." % (OPTS.save_key, OPTS.pastebin_key),
+        ".:: <%s> Exit  <%s> Rewind  <%s> Save  <%s> Pastebin ::." % 
+            (OPTS.exit_key, OPTS.undo_key, OPTS.save_key, OPTS.pastebin_key),
             get_colpair('main'))
 
     return main_win, statusbar

Original file line number	Diff line number	Diff line change
`@@ -2008,7 +2008,8 @@ def init_wins(scr, cols):`
`2008`	`2008`	`# This should show to be configured keys from ~/.bpython/config`
`2009`	`2009`	`#`
`2010`	`2010`	`statusbar = Statusbar(scr, main_win,`
`2011`		`- ".:: <C-d> Exit <C-r> Rewind <%s> Save <%s> Pastebin ::." % (OPTS.save_key, OPTS.pastebin_key),`
	`2011`	`+ ".:: <%s> Exit <%s> Rewind <%s> Save <%s> Pastebin ::." %`
	`2012`	`+ (OPTS.exit_key, OPTS.undo_key, OPTS.save_key, OPTS.pastebin_key),`
`2012`	`2013`	`get_colpair('main'))`
`2013`	`2014`
`2014`	`2015`	`return main_win, statusbar`