diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-11-01 14:09:05 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-11-01 14:09:05 -0500 |
| commit | a2b8d7cdbaa0c7490e712168ba4fb284a74f3640 (patch) | |
| tree | 890c66eaead7703d394512d6f301c07640b561ee /src | |
| parent | 2e4baa9ae475e1ea01c5e15a440933b4814f0637 (diff) | |
| parent | 90909e9362dacb5ece17c7baaffe33b16d106ce7 (diff) | |
| download | rneovim-a2b8d7cdbaa0c7490e712168ba4fb284a74f3640.tar.gz rneovim-a2b8d7cdbaa0c7490e712168ba4fb284a74f3640.tar.bz2 rneovim-a2b8d7cdbaa0c7490e712168ba4fb284a74f3640.zip | |
Merge 'CMake: Prepare for releases.'
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/log.h | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/nvim/log.h b/src/nvim/log.h index 152e90760e..32b7276f14 100644 --- a/src/nvim/log.h +++ b/src/nvim/log.h @@ -19,7 +19,7 @@ #define ELOGN(...) // Logging is disabled if NDEBUG or DISABLE_LOG is defined. -#ifdef NDEBUG +#if !defined(DISABLE_LOG) && defined(NDEBUG) # define DISABLE_LOG #endif diff --git a/src/nvim/version.c b/src/nvim/version.c index 7cc72705b6..c8cbcf2439 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -36,7 +36,9 @@ char *Version = VIM_VERSION_SHORT; char *longVersion = NVIM_VERSION_LONG; char *longVersionWithDate = NVIM_VERSION_LONG " (compiled " __DATE__ " " __TIME__ ")"; char *mediumVersion = NVIM_VERSION_MEDIUM; +#ifdef NVIM_VERSION_COMMIT char *version_commit = "Commit: " NVIM_VERSION_COMMIT; +#endif char *version_buildtype = "Build type: " NVIM_VERSION_BUILD_TYPE; char *version_cflags = "Compilation: " NVIM_VERSION_CFLAGS; @@ -1024,7 +1026,9 @@ void list_version(void) // When adding features here, don't forget to update the list of // internal variables in eval.c! MSG(longVersionWithDate); +#ifdef NVIM_VERSION_COMMIT MSG(version_commit); +#endif MSG(version_buildtype); MSG(version_cflags); |