# HG changeset patch
# User corey
# Date 1256941109 0
# Node ID 752432ff33601eb349e88c2ffe563211b7bf5ade
# Parent  bb26e1db5c90012db1f065319af5e5e186d546c7
Slightly change behavior of "none" if fstype specification.

In a list of enabled fstypes, "none" now clears the list rather than
disabling all fstypes and interrupting the parser. To enable only one
(or more) fstypes, list the types to enable after "none".

For example:
"-fstype none" is the same as before: all disabled
"-fstype none,fullscreen" enables only the fullscreen type

diff -r bb26e1db5c90 -r 752432ff3360 DOCS/man/en/mplayer.1
--- a/DOCS/man/en/mplayer.1	Fri Oct 30 14:13:25 2009 +0000
+++ b/DOCS/man/en/mplayer.1	Fri Oct 30 22:18:29 2009 +0000
@@ -3101,7 +3101,7 @@
 .IPs netwm
 Force NETWM style.
 .IPs "none\ "
-Do not set fullscreen window layer.
+Clear the list of modes; you can add modes to enable afterward.
 .IPs stays_on_top
 Use _NETWM_STATE_STAYS_ON_TOP hint if available.
 .REss
diff -r bb26e1db5c90 -r 752432ff3360 libvo/x11_common.c
--- a/libvo/x11_common.c	Fri Oct 30 14:13:25 2009 +0000
+++ b/libvo/x11_common.c	Fri Oct 30 22:18:29 2009 +0000
@@ -1316,7 +1316,7 @@
                 else
                     type |= vo_wm_NETWM;
             } else if (!strcmp(arg, "none"))
-                return 0;
+                type = 0; // clear; keep parsing
         }
     }