diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | man/feh.pre | 3 | ||||
| -rw-r--r-- | src/options.c | 6 | 
3 files changed, 6 insertions, 7 deletions
| @@ -1,3 +1,7 @@ +git HEAD + +    * Add --no-fehbg option to disable ~/.fehbg creation (patch by Felix Crux) +  Wed, 02 Nov 2011 10:56:10 +0100  Daniel Friesel <derf@finalrewind.org>  * Release v2.1 diff --git a/man/feh.pre b/man/feh.pre index ad97768..56ff766 100644 --- a/man/feh.pre +++ b/man/feh.pre @@ -667,7 +667,8 @@ be printed.  .Sh BACKGROUND SETTING  .  .Nm -can also be used as a background setter.  Unless you pass the --no-fehbg +can also be used as a background setter.  Unless you pass the +.Cm --no-fehbg  option, it will store the command line necessary to set the background in  .Pa ~/.fehbg ,  so to have your background restored everytime you start X, you can add diff --git a/src/options.c b/src/options.c index 7984439..8bfe8c1 100644 --- a/src/options.c +++ b/src/options.c @@ -764,12 +764,6 @@ static void check_options(void)  		eprintf("You cannot combine --loadable with --unloadable");  	} -	if (opt.no_fehbg && !opt.bgmode) { -		weprintf("The --no-fehbg option is meaningless unless you\n" -				"are setting a background wallpaper image.\n" -				"It is being ignored."); -	} -  	return;  } | 
