Merge remote-tracking branch 'origin/master' into themer

2017-01-07 11:22:39 +01:00 · 2017-01-07 11:22:39 +01:00 · 6318e5024b
parent 8124cfb023 f4d8230dd5
commit 6318e5024b
1 changed files with 1 additions and 0 deletions
--- a/doc/help-output.txt
+++ b/doc/help-output.txt
@ -14,6 +14,7 @@ Command line only options:
 	-markup                                Enable pango markup where possible.
 	-normal-window                         In dmenu mode, behave as a normal window. (experimental)
 	-show [mode]                           Show the mode 'mode' and exit. The mode has to be enabled.
+	-lazy-grab                             When fail to grab keyboard, don't block but retry later.
 DMENU command line options:
 	-mesg [string]                         Print a small user message under the prompt (uses pango markup)
 	-p [string]                            Prompt to display left of entry field