diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2011-04-27 07:55:56 +0200 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2011-04-27 07:55:56 +0200 |
| commit | 62d0331156461884fdf8d5fdcaedc96ba6de774e (patch) | |
| tree | e485628a1251936b41f5f6a9ba9be4bdf7bdfafd | |
| parent | 0f92ef265ddf0c98c263a099466043ae2c762255 (diff) | |
| download | feh-62d0331156461884fdf8d5fdcaedc96ba6de774e.zip | |
Deprecate --menu-bg option (closes #27)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | man/feh.pre | 6 | ||||
| -rw-r--r-- | src/help.raw | 1 | ||||
| -rw-r--r-- | src/options.c | 3 |
4 files changed, 6 insertions, 9 deletions
@@ -1,7 +1,10 @@ git HEAD - * Only create caption directory when actually writing out a caption + * Only create caption directory when actually writing out a caption. <http://github.com/derf/feh/issues/42> + * The --menu-bg option has been deprecated. It will be removed along with + --menu-style by the end of 2012. + <http://github.com/derf/feh/issues/27> Sat, 23 Apr 2011 22:00:27 +0200 Daniel Friesel <derf@finalrewind.org> diff --git a/man/feh.pre b/man/feh.pre index 813be8e..e2fda9f 100644 --- a/man/feh.pre +++ b/man/feh.pre @@ -311,12 +311,6 @@ size/resolution/type etc. Don't display images. Just print out their names if imlib2 can successfully load them. . -.It Cm -) , --menu-bg Ar file -. -Use -.Ar file -as background image in menus. -. .It Cm -M , --menu-font Ar font . Use diff --git a/src/help.raw b/src/help.raw index 93d636f..bbe5e37 100644 --- a/src/help.raw +++ b/src/help.raw @@ -77,7 +77,6 @@ OPTIONS -C, --fontpath PATH Specify an extra directory to look in for fonts, can be used multiple times to add multiple paths. -M, --menu-font FONT Use FONT for the font in menus. - -), --menu-bg BG Use BG for the background image in menus. -B, --image-bg STYLE Set background for transparent images and the like. Accepted values: white, black, default -N, --no-menus Don't load or show any menus. diff --git a/src/options.c b/src/options.c index e7be48e..de72429 100644 --- a/src/options.c +++ b/src/options.c @@ -607,6 +607,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) case ')': free(opt.menu_bg); opt.menu_bg = estrdup(optarg); + weprintf("The --menu-bg option is deprecated and will be removed by 2012"); break; case 'B': free(opt.image_bg); @@ -688,7 +689,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) case 204: free(opt.menu_style); opt.menu_style = estrdup(optarg); - weprintf("--menu-style is deprecated and will be removed soon"); + weprintf("The --menu-style option is deprecated and will be removed by 2012"); break; case 205: if (!strcmp("fill", optarg)) |