On Sat, Apr 12, 2008 at 08:17:41PM +0400, Andrew Savchenko wrote:
--- mplayer_old/mpcommon.c 2008-04-12 19:25:17.000000000 +0400 +++ mplayer/mpcommon.c 2008-04-12 19:39:52.000000000 +0400 @@ -213,11 +213,45 @@
+int disable_system_conf=0; +int disable_user_conf=0; +#ifdef HAVE_NEW_GUI + extern int disable_gui_conf; +#endif /* HAVE_NEW_GUI */
Useless #ifdef around extern declaration.
--- mplayer_base/DOCS/man/en/mplayer.1 2008-04-03 12:37:36.000000000 +0400 +++ mplayer/DOCS/man/en/mplayer.1 2008-04-12 18:05:52.000000000 +0400 @@ -632,6 +632,18 @@ . .TP +.B \-disable-gui-conf (GUI only)
GUI
@@ -692,6 +704,12 @@ . .TP +.B \-noconfig +Do not parse system, user, and gui (if enabled) configuration files
GUI
+at all. But if \-include or \-use\-filedir\-conf options are
New sentences on new lines in the manual page. Diego