summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorDennis Real <github@tildepipe.org>2012-03-16 22:22:28 +0100
committerDennis Real <github@tildepipe.org>2012-03-16 22:22:28 +0100
commit39cbd1ed2b6693beea5e974a6ae83207c6e9a826 (patch)
tree933d66905ce488512c1b7eabeab56fe4b712e84c /man
parent9e1bbf874500e99506baffec3c6b54ed04e60a2f (diff)
parenta1001232297445566a68519129f177d6ffeee479 (diff)
Merge remote branch 'upstream/master'
Diffstat (limited to 'man')
-rw-r--r--man/feh.pre9
1 files changed, 9 insertions, 0 deletions
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