diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | man/feh.pre | 12 | ||||
| -rw-r--r-- | src/options.c | 3 |
3 files changed, 29 insertions, 3 deletions
@@ -1,3 +1,20 @@ +* Release v2.15 + * Patch by William Woodruff: Add --insecure option to disable HTTPS + certificate checks + * Patch by guraga: Add --no-recursive option to disable recursive directory + expansion. Note that --no-recursive is the default behaviour of feh. + This option is mostly useful to override a --recursive set in a theme or + shell alias + * Patch by Richard Molitor: Improve --scale-down in tiling environments. + This fixes flickering when changing images at the cost of slightly + less apaptive scale-down behaviour: Window size changes are now only + processed when the active image is changed + * --action and --action[1..9] now support action titles + (e.g. --action '[some title]some-command %F'), which are displayed + instead of the specified shell command. Note that the title must not + start with a space. Titles starting with a space are treated as part of + of the command so that actions like '[ -L %F ] && foo' still work + Thu, 18 Feb 2016 20:40:19 +0100 * Release v2.14.2 diff --git a/man/feh.pre b/man/feh.pre index 0b13881..258ff21 100644 --- a/man/feh.pre +++ b/man/feh.pre @@ -160,13 +160,21 @@ executing the action. . If .No [ Ar title ] -is specified, +is specified +.Pq note the literal Qo \&[ Qc and Qo ] Qc , .Cm --draw-actions will display .Ar title instead of .Ar action -in the action list. +in the action list. Note that +.Ar title +must not start with a space. If it does, the action is handled as if it did +not have a title. This special case exists for backwards compatibility reasons +and makes sure that actions like +.Qq \&[ -L %F \&] && foo +still work. +. . .Pp . diff --git a/src/options.c b/src/options.c index f5f1242..b43db91 100644 --- a/src/options.c +++ b/src/options.c @@ -799,7 +799,8 @@ static void check_options(void) } opt.action_titles[i] = opt.actions[i]; if (opt.actions[i] && (opt.actions[i][0] == '[')) { - if ((endptr = strchr(opt.actions[i], ']')) != NULL) { + if (((endptr = strchr(opt.actions[i], ']')) != NULL) + && (opt.actions[i][1] != ' ')) { opt.action_titles[i] = opt.actions[i] + 1; opt.actions[i] = endptr + 1; *endptr = 0; |