diff options
author | Olof-Joachim Frahm <olof@macrolet.net> | 2018-10-02 23:36:29 +0200 |
---|---|---|
committer | Olof-Joachim Frahm <olof@macrolet.net> | 2018-10-02 23:36:29 +0200 |
commit | fb1cfca824b9229e110386e35112a0ad8f552553 (patch) | |
tree | 0b3f8d9dea96e6d4e15ea298b975d2a08051834b /src/options.c | |
parent | a9d46da64d02561bf2f545b3271575b304eda913 (diff) |
Actually remove collage mode after ~7 years.
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 38d2568..afbfafa 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"); } |