From: Felipe Pena Date: Mon, 18 Nov 2013 00:56:07 +0000 (-0200) Subject: Merge branch 'master' of github.com:krakjoe/phpdbg X-Git-Tag: php-5.6.0alpha1~110^2~248^2~5 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44168c36a8ee81d4b8df374c2e569a862e4609e6;p=php Merge branch 'master' of github.com:krakjoe/phpdbg --- 44168c36a8ee81d4b8df374c2e569a862e4609e6 diff --cc phpdbg_prompt.c index 583549c4a5,96645f54f6..058f3de6ab --- a/phpdbg_prompt.c +++ b/phpdbg_prompt.c @@@ -64,10 -64,10 +64,10 @@@ static const phpdbg_command_t phpdbg_pr PHPDBG_COMMAND_D(next, "continue execution", 'n', NULL, 0), PHPDBG_COMMAND_D(run, "attempt execution", 'r', NULL, 0), PHPDBG_COMMAND_D(eval, "evaluate some code", 'E', NULL, 1), - PHPDBG_COMMAND_D(until, "continue until reaches next line", 'u', NULL, 0), + PHPDBG_COMMAND_D(until, "continue past the current line", 'u', NULL, 0), PHPDBG_COMMAND_D(finish, "continue past the end of the stack", 'f', NULL, 0), PHPDBG_COMMAND_D(leave, "continue until the end of the stack", 'L', NULL, 0), - PHPDBG_COMMAND_D(print, "print something", 'p', phpdbg_print_commands, 1), + PHPDBG_COMMAND_D(print, "print something", 'p', phpdbg_print_commands, 2), PHPDBG_COMMAND_D(break, "set breakpoint", 'b', phpdbg_break_commands, 1), PHPDBG_COMMAND_D(back, "show trace", 't', NULL, 0), PHPDBG_COMMAND_D(list, "lists some code", 'l', phpdbg_list_commands, 2),