summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2010-09-05 20:37:52 +0200
committerDaniel Friesel <derf@finalrewind.org>2010-09-05 20:37:52 +0200
commitceef46e7981b5044713b689cb8c76d1d8eee518c (patch)
tree126905d95a5e66d6183614e846f8586278d47b4e
parentca1f80782d19d380fcf7c0a1a67714d87e54e06b (diff)
Update changelog, help and manpage
-rw-r--r--ChangeLog1
-rw-r--r--man/feh.pre3
-rw-r--r--src/help.raw3
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index eda2118..28b6ed0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ git HEAD
* Removed rather obscure --bg-seamless mode
* Short option -Y for --hide-pointer
* Panning via keys: Make it behave like scrolling (inverted directions)
+ * Patch by Live Smith: Add --action-hold-slide option
Tue, 24 Aug 2010 19:23:36 +0200 Daniel Friesel <derf@chaosdorf.de>
diff --git a/man/feh.pre b/man/feh.pre
index 8345683..4dccd8a 100644
--- a/man/feh.pre
+++ b/man/feh.pre
@@ -92,6 +92,9 @@ multiwindow mode, the window will be closed.
.It Cm --action1 No .. Cm --action9
Extra actions which can be set and triggered using the appropiate number key.
.
+.It Cm --action-hold-slide
+Do not change to the next image after pressing an action key.
+.
.It Cm -Z , --auto-zoom
Zoom pictures to screen size in fullscreen
.Pq affected by Cm --stretch No and Cm --ignore-aspect .
diff --git a/src/help.raw b/src/help.raw
index e87e9da..caa2232 100644
--- a/src/help.raw
+++ b/src/help.raw
@@ -49,7 +49,8 @@ OPTIONS
-n, --reverse Reverse sort order
-A, --action ACTION Specify action to perform when pressing <return>.
Executed by /bin/sh, may contain FORMAT SPECIFIERS
- --action[1-9] Extra actions triggered by pressing keys <1>to <9>.
+ --action[1-9] Extra actions triggered by pressing keys <1>to <9>
+ --action-hold-slide Do not change to next image after running an action
-G, --draw-actions Show the defined actions in the image window
-m, --montage Enable montage mode
-c, --collage Montage mode with randomly distributed thumbnails