summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--man/feh.pre5
-rw-r--r--src/help.raw1
-rw-r--r--src/options.c1
-rw-r--r--test/status5
5 files changed, 2 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 0b6dc85..9be5ee2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ git HEAD
* Add --zoom fill as equivalent for --auto-zoom
* Add --zoom max (zooming like in --bg-max)
+ * --menu-style is now deprecated
Wed, 26 Jan 2011 21:07:19 +0100
diff --git a/man/feh.pre b/man/feh.pre
index 0b4a6c7..b1dc359 100644
--- a/man/feh.pre
+++ b/man/feh.pre
@@ -267,11 +267,6 @@ Use
.Pq truetype, with size, like Qq yudit/12
as menu font.
.
-.It Cm --menu-style Ar file
-Read
-.Ar file
-to determine menu style.
-.
.It Cm -m , --montage
Enable montage mode. Montage mode creates a new image consisting of a grid of
thumbnails of the images in the filelist. When montage mode is selected,
diff --git a/src/help.raw b/src/help.raw
index 4f5eef1..956516e 100644
--- a/src/help.raw
+++ b/src/help.raw
@@ -78,7 +78,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-style FILE Use FILE as the style descriptor for menu text.
-), --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
diff --git a/src/options.c b/src/options.c
index 6427597..caa9aa4 100644
--- a/src/options.c
+++ b/src/options.c
@@ -692,6 +692,7 @@ static void feh_parse_option_array(int argc, char **argv)
case 204:
free(opt.menu_style);
opt.menu_style = estrdup(optarg);
+ weprintf("--menu-style is deprecated and will be removed soon");
break;
case 205:
if (!strcmp("fill", optarg))
diff --git a/test/status b/test/status
index 5ae80da..aa66672 100644
--- a/test/status
+++ b/test/status
@@ -208,11 +208,6 @@ Overall test status, what's covered / missing
[ ] changes menu font
---menu-style
-
- to be deprecated
-
-
--montage
--multiwindow