2009-06-19 Samuel Bronson <naesten@gmail.com>

PR cli/9930:
	* cli/cli-decode.c (apropos_cmd): Skip traversing abbreviations
	for prefix commands to avoid duplicates in the output.
This commit is contained in:
Tom Tromey 2009-06-19 15:49:35 +00:00
parent 4a98be19cd
commit 5d2c29b8d1
2 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2009-06-19 Samuel Bronson <naesten@gmail.com>
PR cli/9930:
* cli/cli-decode.c (apropos_cmd): Skip traversing abbreviations
for prefix commands to avoid duplicates in the output.
2009-06-19 Samuel Bronson <naesten@gmail.com>
PR cli/9930:

View File

@ -779,8 +779,11 @@ apropos_cmd (struct ui_file *stream, struct cmd_list_element *commandlist,
0 /* don't recurse */, stream);
}
}
/* Check if this command has subcommands */
if (c->prefixlist != NULL)
/* Check if this command has subcommands and is not an abbreviation.
We skip listing subcommands of abbreviations in order to avoid
duplicates in the output.
*/
if (c->prefixlist != NULL && !c->abbrev_flag)
{
/* Recursively call ourselves on the subcommand list,
passing the right prefix in.