vim-patch:8.2.0005: duplication in version info (#13502)

Problem:    Duplication in version info.
Solution:   Use preprocessor string concatenation. (Ken Takata, closes vim/vim#5357)
5021225656
This commit is contained in:
Jan Edmund Lazo 2020-12-10 21:07:20 -05:00 committed by GitHub
parent a92dbf49bf
commit faa47eafff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions

View File

@ -16,7 +16,6 @@
#include "nvim/iconv.h"
#include "nvim/version.h"
#include "nvim/charset.h"
#include "nvim/macros.h"
#include "nvim/memline.h"
#include "nvim/memory.h"
#include "nvim/message.h"

View File

@ -2,6 +2,7 @@
#define NVIM_VERSION_H
#include "nvim/ex_cmds_defs.h"
#include "nvim/macros.h"
// defined in version.c
extern char* Version;
@ -10,14 +11,20 @@ extern char* longVersion;
//
// Vim version number, name, etc. Patchlevel is defined in version.c.
//
// Values that change for a new release
#define VIM_VERSION_MAJOR 8
#define VIM_VERSION_MINOR 0
// Values based on the above
#define VIM_VERSION_MAJOR_STR STR(VIM_VERSION_MAJOR)
#define VIM_VERSION_MINOR_STR STR(VIM_VERSION_MINOR)
#define VIM_VERSION_100 (VIM_VERSION_MAJOR * 100 + VIM_VERSION_MINOR)
// used for the runtime directory name
#define VIM_VERSION_NODOT "vim80"
#define VIM_VERSION_NODOT "vim" VIM_VERSION_MAJOR_STR VIM_VERSION_MINOR_STR
// swap file compatibility (max. length is 6 chars)
#define VIM_VERSION_SHORT "8.0"
#define VIM_VERSION_SHORT VIM_VERSION_MAJOR_STR "." VIM_VERSION_MINOR_STR
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "version.h.generated.h"