Merge branch 'master' into feature/autocmd

Conflicts:
	src/ex.c

diff --cc src/ex.c
index e965478,c42b348..88b8bf8
--- 1/src/ex.c
--- 2/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,