Merge remote branch 'upstream/master'

3 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 9ea7774..b347b94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 git HEAD
 
     * Add R, * and / aliases for <keypad begin>, <keypad *> and <keypad />
-    * Try to convert unloadable files with imagemagick for up to 6 seconds
+    * Try to convert unloadable files with imagemagick for up to 5 seconds
     * Add --magick-timeout option to set imagemagick conversion timeout or
       disable it altogether
     * Clean up temporary / to-delete files when receiveng SIG{INT,TERM,QUIT}
diff --git a/man/feh.pre b/man/feh.pre
index ecd35ec..f97434d 100644
--- a/man/feh.pre
+++ b/man/feh.pre
@@ -385,6 +385,15 @@ Don't display images.  Just print out their names if imlib2 can successfully
 load them.
 Returns false if at least one image failed to load.
 .
+.It Cm --magick-timeout Ar timeout
+.
+Stop trying to convert unloadable files after
+.Ar timeout
+seconds. A negative value disables covert / magick support altogether, a value
+of zero causes
+.Nm
+to try indefinitely. Default timeout is 5 seconds.
+.
 .It Cm -M , --menu-font Ar font
 .
 Use
diff --git a/src/options.c b/src/options.c
index a277003..0d4d745 100644
--- a/src/options.c
+++ b/src/options.c
@@ -53,7 +53,7 @@ void init_parse_options(int argc, char **argv)
 	opt.display = 1;
 	opt.aspect = 1;
 	opt.slideshow_delay = 0.0;
-	opt.magick_timeout = 10;
+	opt.magick_timeout = 5;
 	opt.thumb_w = 60;
 	opt.thumb_h = 60;
 	opt.thumb_redraw = 10;