summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Real <github@tildepipe.org>2012-05-09 22:06:35 +0200
committerDennis Real <github@tildepipe.org>2012-05-09 22:06:35 +0200
commit040d30225cd25a3853ba5947bd9198fcec86529c (patch)
tree6878d388e96787a33c00e1290419920f4d8fa29b
parentfcc9aeb58e55837638bff253cf19ca006d9f6d27 (diff)
parent9ed58f2c8ca3dd2dc67808676ec437838c4207e6 (diff)
Merge branch 'master' of git://github.com/derf/feh
-rw-r--r--ChangeLog2
-rw-r--r--man/feh.pre27
2 files changed, 29 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 27c347b..d1a769f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
git HEAD
* Dennis Real: EXIF mode fixes, support for more camera models
+ * feh(1): Document behaviour for duplicate key bindings
+ <https://github.com/derf/feh/issues/91>
Sun, 25 Mar 2012 13:13:26 +0200 Daniel Friesel <derf@finalrewind.org>
diff --git a/man/feh.pre b/man/feh.pre
index 8460b64..fcf3ad6 100644
--- a/man/feh.pre
+++ b/man/feh.pre
@@ -962,6 +962,11 @@ Available modifiers are
.Ar C No for Control ,
.Ar S No for Shift and
.Ar 1 , 4 No for Mod1 and Mod4 .
+To match an uppercase letter like
+.Qq S
+instead of
+.Qq s ,
+the Shift modifier is not required.
.
.Pp
.
@@ -971,6 +976,17 @@ without any keys unbinds it (i.e. the default bindings are removed).
.
.Pp
.
+.Em Note :
+Do not use the same keybinding for multiple actions.
+.Nm
+does not check for conflicting bindings, so their behaviour is undefined.
+.
+Either unbind the unwanted action, or bind it to another unused key.
+.
+The order in which you bind / unbind does not matter, though.
+.
+.Pp
+.
For a list of the
.Ar action
names, see
@@ -1247,6 +1263,17 @@ looks like
.
.Pp
.
+.Em Note :
+Do not use the same button for multiple actions.
+.Nm
+does not check for conflicting bindings, so their behaviour is undefined.
+.
+Either unbind the unwanted action, or bind it to another unused button.
+.
+The order in which you bind / unbind does not matter, though.
+.
+.Pp
+.
For the available modifiers, see
.Sx KEYS CONFIGURATION SYNTAX .
.