rename: user_funcs -> userfunc

Lets stick with vim for now

14 files changed, 19 insertions, 19 deletions

diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 5c80ff4f7d..9657a37831 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -36,7 +36,7 @@
 #include "nvim/edit.h"
 #include "nvim/eval.h"
 #include "nvim/eval/typval.h"
-#include "nvim/eval/user_funcs.h"
+#include "nvim/eval/userfunc.h"
 #include "nvim/fileio.h"
 #include "nvim/ops.h"
 #include "nvim/option.h"
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index e3b82a8b89..3757dc6c04 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -18,7 +18,7 @@
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
 #include "nvim/edit.h"
-#include "nvim/eval/user_funcs.h"
+#include "nvim/eval/userfunc.h"
 #include "nvim/eval.h"
 #include "nvim/eval/encode.h"
 #include "nvim/eval/executor.h"
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index 0b849d8a4f..b7e02d2ce7 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -21,7 +21,7 @@
 #include "nvim/eval/encode.h"
 #include "nvim/eval/executor.h"
 #include "nvim/eval/funcs.h"
-#include "nvim/eval/user_funcs.h"
+#include "nvim/eval/userfunc.h"
 #include "nvim/ex_cmds2.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/ex_getln.h"
diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c
index 16b38b47dc..c8b5fc294c 100644
--- a/src/nvim/eval/typval.c
+++ b/src/nvim/eval/typval.c
@@ -15,7 +15,7 @@
 #include "nvim/eval/encode.h"
 #include "nvim/eval/typval_encode.h"
 #include "nvim/eval.h"
-#include "nvim/eval/user_funcs.h"
+#include "nvim/eval/userfunc.h"
 #include "nvim/types.h"
 #include "nvim/assert.h"
 #include "nvim/memory.h"
diff --git a/src/nvim/eval/user_funcs.c b/src/nvim/eval/userfunc.c
index a3eb3c813f..2c1cf3eedf 100644
--- a/src/nvim/eval/user_funcs.c
+++ b/src/nvim/eval/userfunc.c
@@ -8,7 +8,7 @@
 #include "nvim/edit.h"
 #include "nvim/eval.h"
 #include "nvim/eval/encode.h"
-#include "nvim/eval/user_funcs.h"
+#include "nvim/eval/userfunc.h"
 #include "nvim/ex_cmds2.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/ex_getln.h"
@@ -34,7 +34,7 @@
 #define FC_SANDBOX  0x40          // function defined in the sandbox
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
-#include "eval/user_funcs.c.generated.h"
+#include "eval/userfunc.c.generated.h"
 #endif
 
 hashtab_T func_hashtab;
@@ -3318,7 +3318,7 @@ bool set_ref_in_functions(int copyID)
   }
   return abort;
 }
- 
+
 /// Set "copyID" in all function arguments.
 bool set_ref_in_func_args(int copyID)
 {
diff --git a/src/nvim/eval/user_funcs.h b/src/nvim/eval/userfunc.h
index b325c2e976..db4e02ee98 100644
--- a/src/nvim/eval/user_funcs.h
+++ b/src/nvim/eval/userfunc.h
@@ -1,5 +1,5 @@
-#ifndef NVIM_EVAL_USER_FUNCS_H
-#define NVIM_EVAL_USER_FUNCS_H
+#ifndef NVIM_EVAL_USERFUNC_H
+#define NVIM_EVAL_USERFUNC_H
 
 #include "nvim/eval/typval.h"
 #include "nvim/ex_cmds_defs.h"
@@ -31,6 +31,6 @@ typedef int (*ArgvFunc)(int current_argcount, typval_T *argv,
 #define FUNCLINE(fp, j) ((char_u **)(fp->uf_lines.ga_data))[j]
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "eval/user_funcs.h.generated.h"
+# include "eval/userfunc.h.generated.h"
 #endif
-#endif  // NVIM_EVAL_USER_FUNCS_H
+#endif  // NVIM_EVAL_USERFUNC_H
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
index 9a21374d85..3694e909d2 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -20,7 +20,7 @@
 #include "nvim/buffer.h"
 #include "nvim/change.h"
 #include "nvim/charset.h"
-#include "nvim/eval/user_funcs.h"
+#include "nvim/eval/userfunc.h"
 #include "nvim/ex_cmds.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/ex_eval.h"
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 289811701c..fa01e06471 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -20,7 +20,7 @@
 #include "nvim/digraph.h"
 #include "nvim/edit.h"
 #include "nvim/eval.h"
-#include "nvim/eval/user_funcs.h"
+#include "nvim/eval/userfunc.h"
 #include "nvim/ex_cmds.h"
 #include "nvim/ex_cmds2.h"
 #include "nvim/ex_eval.h"
diff --git a/src/nvim/ex_eval.c b/src/nvim/ex_eval.c
index 5af4ddd010..3f1270692e 100644
--- a/src/nvim/ex_eval.c
+++ b/src/nvim/ex_eval.c
@@ -16,7 +16,7 @@
 #include "nvim/ex_eval.h"
 #include "nvim/charset.h"
 #include "nvim/eval.h"
-#include "nvim/eval/user_funcs.h"
+#include "nvim/eval/userfunc.h"
 #include "nvim/ex_cmds2.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/message.h"
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index b010dde1e3..e02443e061 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -23,7 +23,7 @@
 #include "nvim/digraph.h"
 #include "nvim/edit.h"
 #include "nvim/eval.h"
-#include "nvim/eval/user_funcs.h"
+#include "nvim/eval/userfunc.h"
 #include "nvim/ex_cmds.h"
 #include "nvim/ex_cmds2.h"
 #include "nvim/ex_docmd.h"
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index 7a8366490c..2443fa000d 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -20,7 +20,7 @@
 #include "nvim/cursor.h"
 #include "nvim/diff.h"
 #include "nvim/edit.h"
-#include "nvim/eval/user_funcs.h"
+#include "nvim/eval/userfunc.h"
 #include "nvim/ex_cmds.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/ex_eval.h"
diff --git a/src/nvim/lua/executor.c b/src/nvim/lua/executor.c
index cadff961ce..632832416b 100644
--- a/src/nvim/lua/executor.c
+++ b/src/nvim/lua/executor.c
@@ -25,7 +25,7 @@
 #include "nvim/undo.h"
 #include "nvim/ascii.h"
 #include "nvim/change.h"
-#include "nvim/eval/user_funcs.h"
+#include "nvim/eval/userfunc.h"
 
 #ifdef WIN32
 #include "nvim/os/os.h"
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 4a9186f7f6..c53348db0d 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -24,7 +24,7 @@
 #include "nvim/diff.h"
 #include "nvim/digraph.h"
 #include "nvim/edit.h"
-#include "nvim/eval/user_funcs.h"
+#include "nvim/eval/userfunc.h"
 #include "nvim/ex_cmds.h"
 #include "nvim/ex_cmds2.h"
 #include "nvim/ex_docmd.h"
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index 75b20e4ab4..42ea9a944d 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -56,7 +56,7 @@
 #include "nvim/regexp.h"
 #include "nvim/charset.h"
 #include "nvim/eval.h"
-#include "nvim/eval/user_funcs.h"
+#include "nvim/eval/userfunc.h"
 #include "nvim/ex_cmds2.h"
 #include "nvim/mark.h"
 #include "nvim/memline.h"