summaryrefslogtreecommitdiff
path: root/src/options.c
diff options
context:
space:
mode:
authorDennis Real <github@tildepipe.org>2013-02-02 20:53:23 +0100
committerDennis Real <github@tildepipe.org>2013-02-02 20:53:23 +0100
commit353578ebc130f53547996ab87f5b3795c1360f3f (patch)
tree8a19969f7eb377f692892e24c24ba116940ba942 /src/options.c
parent38c3c37b5c45691211ed62e40a6c5f503b054335 (diff)
parent6ea43a3213bb264525e04c729c67204f82c7a2c8 (diff)
Merge branch 'master' of git://github.com/derf/feh
Diffstat (limited to 'src/options.c')
-rw-r--r--src/options.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/options.c b/src/options.c
index 240b0d6..469115e 100644
--- a/src/options.c
+++ b/src/options.c
@@ -397,6 +397,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
{"info" , 1, 0, 234},
{"force-aliasing", 0, 0, 235},
{"no-fehbg" , 0, 0, 236},
+ {"keep-zoom-vp" , 0, 0, 237},
{0, 0, 0, 0}
};
@@ -500,6 +501,8 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
opt.sort = SORT_NAME;
else if (!strcasecmp(optarg, "filename"))
opt.sort = SORT_FILENAME;
+ else if (!strcasecmp(optarg, "mtime"))
+ opt.sort = SORT_MTIME;
else if (!strcasecmp(optarg, "width"))
opt.sort = SORT_WIDTH;
else if (!strcasecmp(optarg, "height"))
@@ -722,6 +725,9 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
case 236:
opt.no_fehbg = 1;
break;
+ case 237:
+ opt.keep_zoom_vp = 1;
+ break;
default:
break;
}