Allow nop command without argument

fixes #1318

diff --git a/docs/userguide b/docs/userguide
index 45b05a062fcbaf020521fee55a0362cca997bc5f..8528d684a89bd2515dde9e5b9f1ce7af07a614a9 100644 (file)
--- a/docs/userguide
+++ b/docs/userguide
@@ -2011,6 +2011,27 @@ bindsym $mod+minus scratchpad show
 bindsym mod4+s [title="^Sup ::"] scratchpad show
 ------------------------------------------------
 
+=== Nop
+
+There is a no operation command +nop+ which allows you to override default
+behavior. This can be useful for, e.g., disabling a focus change on clicks with
+the middle mouse button.
+
+The optional +comment+ argument is ignored, but will be printed to the log file
+for debugging purposes.
+
+*Syntax*:
+---------------
+nop [<comment>]
+---------------
+
+*Example*:
+----------------------------------------------
+# Disable focus change for clicks on titlebars
+# with the middle mouse button
+bindsym button2 nop
+----------------------------------------------
+
 === i3bar control
 
 There are two options in the configuration of each i3bar instance that can be

diff --git a/parser-specs/commands.spec b/parser-specs/commands.spec
index 82348df79c9c47d6b5dc9f352eceaaabb4b5100f..315a9218dd5930695e540506ce11e0cd30cabbf4 100644 (file)
--- a/parser-specs/commands.spec
+++ b/parser-specs/commands.spec
@@ -353,6 +353,8 @@ state MODE:
 state NOP:
   comment = string
       -> call cmd_nop($comment)
+  end
+      -> call cmd_nop(NULL)
 
 state SCRATCHPAD:
   'show'