Merge branch 'master' of https://github.com/neovim/neovim into rahmtmp

1 files changed, 7 insertions, 5 deletions

diff --git a/src/nvim/if_cscope.c b/src/nvim/if_cscope.c
index 8d08c2fc19..689d1fce0d 100644
--- a/src/nvim/if_cscope.c
+++ b/src/nvim/if_cscope.c
@@ -18,9 +18,12 @@
 #include <sys/types.h>
 
 #include "nvim/ascii.h"
+#include "nvim/autocmd.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
+#include "nvim/eval.h"
 #include "nvim/event/stream.h"
+#include "nvim/ex_eval.h"
 #include "nvim/fileio.h"
 #include "nvim/if_cscope.h"
 #include "nvim/memory.h"
@@ -415,16 +418,15 @@ static int cs_add_common(char *arg1, char *arg2, char *flags)
   char *fname2 = NULL;
   char *ppath = NULL;
   size_t usedlen = 0;
-  char_u *fbuf = NULL;
+  char *fbuf = NULL;
 
   // get the filename (arg1), expand it, and try to stat it
   fname = xmalloc(MAXPATHL + 1);
 
   expand_env((char_u *)arg1, (char_u *)fname, MAXPATHL);
   size_t len = STRLEN(fname);
-  fbuf = (char_u *)fname;
-  (void)modify_fname(":p", false, &usedlen,
-                     &fname, (char **)&fbuf, &len);
+  fbuf = fname;
+  (void)modify_fname(":p", false, &usedlen, &fname, &fbuf, &len);
   if (fname == NULL) {
     goto add_err;
   }
@@ -661,7 +663,7 @@ static char *cs_create_cmd(char *csoption, char *pattern)
   pat = pattern;
   if (search != 4 && search != 6) {
     while (ascii_iswhite(*pat)) {
-      ++pat;
+      pat++;
     }
   }