* debug.c (help): Help text updated.

(debug): Fix conflicting command assignment.
Show form is now 'o'.

2 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 7a0735aa..938c82e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-10  Kaz Kylheku  <kaz@kylheku.com>
+
+	* debug.c (help): Help text updated.
+	(debug): Fix conflicting command assignment.
+	Show form is now 'o'.
+
 2012-10-31  Kaz Kylheku  <kaz@kylheku.com>
 
 	* lib.c (int_str): Fix gaping bug introduced by previous commit,
diff --git a/debug.c b/debug.c
index 980b8eb3..fa7c439e 100644
--- a/debug.c
+++ b/debug.c
@@ -58,7 +58,7 @@ static void help(val stream)
                  "? - help                               s - step into form\n"
                  "h - help                               n - step over form\n"
                  "c - continue                           f - finish form\n"
-                 "v - show variable binding environment  s - show current form\n"
+                 "v - show variable binding environment  o - show current form\n"
                  "b - set breakpoint by line number      i - show current data\n"
                  "d - delete breakpoint                  w - backtrace\n"
                  "l - list breakpoints                   g - set loglevel\n"),
@@ -169,7 +169,7 @@ val debug(val form, val bindings, val data, val line, val pos, val base)
         return nil;
       } else if (equal(command, lit("v"))) {
         show_bindings(bindings, std_debug);
-      } else if (equal(command, lit("s"))) {
+      } else if (equal(command, lit("o"))) {
         print_form = t;
       } else if (equal(command, lit("i"))) {
         print_data = t;