diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2018-11-04 21:55:03 +0100 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2018-11-04 21:55:03 +0100 |
| commit | 55cb64b21cc5d7c20f032683bd2b6d0d453ac9dc (patch) | |
| tree | e9e8b524a3273f1a1446f1e2a03456eaed186e62 /src/options.c | |
| parent | ebb130d978df17b42935fed570294df45622dea2 (diff) | |
| parent | fb1cfca824b9229e110386e35112a0ad8f552553 (diff) | |
Merge branch 'remove-collage-mode' of https://github.com/Ferada/feh into Ferada-remove-collage-mode
Diffstat (limited to 'src/options.c')
| -rw-r--r-- | src/options.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/options.c b/src/options.c index 383e663..102c186 100644 --- a/src/options.c +++ b/src/options.c @@ -354,7 +354,6 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) {"title" , 1, 0, '^'}, {"alpha" , 1, 0, 'a'}, {"bg" , 1, 0, 'b'}, - {"collage" , 0, 0, 'c'}, {"draw-filename" , 0, 0, 'd'}, {"font" , 1, 0, 'e'}, {"filelist" , 1, 0, 'f'}, @@ -578,9 +577,6 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) opt.bg = 1; opt.bg_file = estrdup(optarg); break; - case 'c': - opt.collage = 1; - break; case 'd': opt.draw_filename = 1; break; @@ -853,17 +849,11 @@ static void check_options(void) } } - if ((opt.index + opt.collage) > 1) { - weprintf("you can't use collage mode and index mode together.\n" - " I'm going with index"); - opt.collage = 0; - } - if (opt.full_screen && opt.multiwindow) { eprintf("You cannot combine --fullscreen with --multiwindow"); } - if (opt.list && (opt.multiwindow || opt.index || opt.collage)) { + if (opt.list && (opt.multiwindow || opt.index)) { eprintf("You cannot combine --list with other modes"); } |