Commit 3040dc9b authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Don't create two competing options of the same name

parent 1282aa00
...@@ -1906,7 +1906,7 @@ vlc_module_begin(); ...@@ -1906,7 +1906,7 @@ vlc_module_begin();
#endif #endif
add_bool( "color", VLC_TRUE, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE ); add_bool( "color", VLC_TRUE, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE );
add_bool( "advanced", 0, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT, add_bool( "advanced", VLC_FALSE, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT,
VLC_FALSE ); VLC_FALSE );
change_need_restart(); change_need_restart();
add_bool( "interact", VLC_TRUE, NULL, INTERACTION_TEXT, add_bool( "interact", VLC_TRUE, NULL, INTERACTION_TEXT,
...@@ -2383,8 +2383,6 @@ vlc_module_begin(); ...@@ -2383,8 +2383,6 @@ vlc_module_begin();
#define LONGHELP_TEXT \ #define LONGHELP_TEXT \
N_("print help for VLC and all its modules (can be combined with " \ N_("print help for VLC and all its modules (can be combined with " \
"--advanced and --help-verbose)") "--advanced and --help-verbose)")
#define ADVANCED_TEXT \
N_("print help for the advanced options")
#define HELP_VERBOSE_TEXT \ #define HELP_VERBOSE_TEXT \
N_("ask for extra verbosity when displaying help") N_("ask for extra verbosity when displaying help")
#define LIST_TEXT \ #define LIST_TEXT \
...@@ -2413,9 +2411,6 @@ vlc_module_begin(); ...@@ -2413,9 +2411,6 @@ vlc_module_begin();
change_short( 'H' ); change_short( 'H' );
change_internal(); change_internal();
change_unsaveable(); change_unsaveable();
add_bool( "advanced", VLC_FALSE, NULL, ADVANCED_TEXT, "", VLC_FALSE );
change_internal();
change_unsaveable();
add_bool( "help-verbose", VLC_FALSE, NULL, HELP_VERBOSE_TEXT, "", add_bool( "help-verbose", VLC_FALSE, NULL, HELP_VERBOSE_TEXT, "",
VLC_FALSE ); VLC_FALSE );
change_internal(); change_internal();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment