diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2015-03-01 16:36:10 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-03-08 21:54:57 -0400 |
| commit | 4f92178a7597f0478f306086933a163109ee894c (patch) | |
| tree | ff9663b78d4015159dbfffb39b27b4441fd225cf /src/nvim | |
| parent | d2e13d3b3dab18555fa319db4960b8acdb09d6ae (diff) | |
| download | rneovim-4f92178a7597f0478f306086933a163109ee894c.tar.gz rneovim-4f92178a7597f0478f306086933a163109ee894c.tar.bz2 rneovim-4f92178a7597f0478f306086933a163109ee894c.zip | |
config: split out versiondef.h from config.h
This avoids recompiling every c file after comitting.
Diffstat (limited to 'src/nvim')
| -rw-r--r-- | src/nvim/buffer.c | 2 | ||||
| -rw-r--r-- | src/nvim/eval.c | 1 | ||||
| -rw-r--r-- | src/nvim/ex_cmds2.c | 2 | ||||
| -rw-r--r-- | src/nvim/misc1.c | 2 | ||||
| -rw-r--r-- | src/nvim/version.h | 12 | ||||
| -rw-r--r-- | src/nvim/version_defs.h | 2 |
6 files changed, 17 insertions, 4 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index fa25b68641..5246b10dbb 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -4033,7 +4033,7 @@ void do_modelines(int flags) --entered; } -#include "nvim/version_defs.h" /* for version number */ +#include "nvim/version.h" /* for version number */ /* * chk_modeline() - check a single line for a mode string diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 9b4b4ce496..ae8e0d329f 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -351,7 +351,6 @@ typedef enum { * The reason to use this table anyway is for very quick access to the * variables with the VV_ defines. */ -#include "nvim/version_defs.h" /* values for vv_flags: */ #define VV_COMPAT 1 /* compatible, also used without "v:" */ diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index ffafe3cffb..44cb2d48a2 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -21,7 +21,7 @@ #ifdef HAVE_LOCALE_H # include <locale.h> #endif -#include "nvim/version_defs.h" +#include "nvim/version.h" #include "nvim/ex_cmds2.h" #include "nvim/buffer.h" #include "nvim/charset.h" diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c index a836ab5680..04551355ae 100644 --- a/src/nvim/misc1.c +++ b/src/nvim/misc1.c @@ -19,7 +19,7 @@ #include "nvim/vim.h" #include "nvim/ascii.h" -#include "nvim/version_defs.h" +#include "nvim/version.h" #include "nvim/misc1.h" #include "nvim/charset.h" #include "nvim/cursor.h" diff --git a/src/nvim/version.h b/src/nvim/version.h index d1b19a062f..a3234d13bc 100644 --- a/src/nvim/version.h +++ b/src/nvim/version.h @@ -1,6 +1,18 @@ #ifndef NVIM_VERSION_H #define NVIM_VERSION_H +// +// Vim version number, name, etc. Patchlevel is defined in version.c. +// +#define VIM_VERSION_MAJOR 7 +#define VIM_VERSION_MINOR 4 +#define VIM_VERSION_100 (VIM_VERSION_MAJOR * 100 + VIM_VERSION_MINOR) + +// used for the runtime directory name +#define VIM_VERSION_NODOT "vim74" +// swap file compatibility (max. length is 6 chars) +#define VIM_VERSION_SHORT "7.4" + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "version.h.generated.h" #endif diff --git a/src/nvim/version_defs.h b/src/nvim/version_defs.h index 0ba6143632..3c6504e8d7 100644 --- a/src/nvim/version_defs.h +++ b/src/nvim/version_defs.h @@ -9,6 +9,8 @@ #define STR_(x) #x #define STR(x) STR_(x) +#include "auto/versiondef.h" + // // Nvim version identifiers // |