diff options
| author | wm4 <wm4@nowhere> | 2013-02-08 23:52:06 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-02-09 00:21:18 +0100 |
| commit | a1be0e1aecdd88bbc56b940e00d3bf51b96c0e4c (patch) | |
| tree | aa472dd8f39cafcd0b3e38030ee8a945f4b3103d /core/parser-mpcmd.c | |
| parent | c1ddfb59076e9b568484b97f10b4eadeb48384e3 (diff) | |
| download | mpv-a1be0e1aecdd88bbc56b940e00d3bf51b96c0e4c.tar.bz2 mpv-a1be0e1aecdd88bbc56b940e00d3bf51b96c0e4c.tar.xz | |
options: change --no-config option, make it apply to input.conf as well
Simplify --no-config and make it a normal flag option, and doesn't take
an argument anymore. You can get the same behavior by using --no-config
and then --include to explicitly load a certain config file.
Make --no-config work for input.conf as well. Make it so that
--input:conf=file still works in this case. As a technically unrelated
change, the file argument now works as one would expect, instead of
making it relatively to "~/.mpv/". This makes for simpler code and
easier to understand option semantics. We can also print better error
messages.
Diffstat (limited to 'core/parser-mpcmd.c')
| -rw-r--r-- | core/parser-mpcmd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/parser-mpcmd.c b/core/parser-mpcmd.c index 9914e7a614..1a7a4dcbc9 100644 --- a/core/parser-mpcmd.c +++ b/core/parser-mpcmd.c @@ -289,7 +289,7 @@ err_out: extern int mp_msg_levels[]; /* Parse some command line options early before main parsing. - * --noconfig prevents reading configuration files (otherwise done before + * --no-config prevents reading configuration files (otherwise done before * command line parsing), and --really-quiet suppresses messages printed * during normal options parsing. */ |