From: Daniel Carl <danielcarl@gmx.de>
Date: Wed, 3 Sep 2014 22:19:17 +0000 (+0200)
Subject: Merge branch 'master' into feature/autocmd
X-Git-Url: https://git.owens.tech/assets/wrapped.html/assets/wrapped.html/git?a=commitdiff_plain;h=87fc5bca3b8cfcab1440e08135468ac67e646bd2;p=vimb.git

Merge branch 'master' into feature/autocmd

Conflicts:
	src/ex.c
---

87fc5bca3b8cfcab1440e08135468ac67e646bd2
diff --cc src/ex.c
index e965478,c42b348..88b8bf8
--- a/src/ex.c
+++ b/src/ex.c
@@@ -39,16 -39,8 +39,15 @@@
  #include "handlers.h"
  #include "map.h"
  #include "js.h"
- #include "normal.h"
 +#ifdef FEATURE_AUTOCMD
 +#include "autocmd.h"
 +#endif
  
  typedef enum {
 +#ifdef FEATURE_AUTOCMD
 +    EX_AUTOCMD,
 +    EX_AUGROUP,
 +#endif
      EX_BMA,
      EX_BMR,
      EX_EVAL,