1 files changed, 9 insertions, 5 deletions
diff --git a/src/nvim/autocmd.c b/src/nvim/autocmd.c
index 42224d0a4f..140a9c6bcb 100644
--- a/src/nvim/autocmd.c
+++ b/src/nvim/autocmd.c
@@ -700,11 +700,15 @@ void do_autocmd(char_u *arg_in, int forceit)
   last_event = (event_T)-1;    // for listing the event name
   last_group = AUGROUP_ERROR;  // for listing the group name
   if (*arg == '*' || *arg == NUL || *arg == '|') {
-    for (event_T event = (event_T)0; event < (int)NUM_EVENTS;
-         event = (event_T)(event + 1)) {
-      if (do_autocmd_event(event, pat, once, nested, cmd, forceit, group)
-          == FAIL) {
-        break;
+    if (!forceit && *cmd != NUL) {
+      EMSG(_(e_cannot_define_autocommands_for_all_events));
+    } else {
+      for (event_T event = (event_T)0; event < (int)NUM_EVENTS;
+           event = (event_T)(event + 1)) {
+        if (do_autocmd_event(event, pat, once, nested, cmd, forceit, group)
+            == FAIL) {
+          break;
+        }
       }
     }
   } else {