mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-30 15:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into expression-parser

Browse Source
This commit is contained in:
ZyX
2017-10-30 00:49:12 +03:00
parent 538af1c90a 45296b331f
commit b29a776550
119 changed files with 2655 additions and 777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/nvim/version.c
View File

@@ -22,6 +22,7 @@
#include "nvim/message.h"
#include "nvim/screen.h"
#include "nvim/strings.h"
#include "nvim/lua/executor.h"
// version info generated by the build system
#include "auto/versiondef.h"
@@ -161,7 +162,7 @@ static const int included_patches[] = {
// 947,
// 946,
// 945,
// 944,
944,
// 943,
// 942,
// 941,
@@ -899,7 +900,7 @@ static const int included_patches[] = {
209,
208,
// 207,
// 206,
206,
205,
// 204,
// 203 NA
@@ -909,20 +910,20 @@ static const int included_patches[] = {
// 199 NA
// 198,
// 197,
// 196,
196,
195,
// 194,
194,
// 193 NA
// 192 NA
// 191 NA
190,
// 189,
189,
188,
// 187 NA
186,
// 185,
// 184,
// 183,
// 183 NA
182,
181,
// 180,
@@ -965,7 +966,7 @@ static const int included_patches[] = {
143,
142,
// 141,
// 140,
140,
// 139 NA
// 138 NA
137,
@@ -987,7 +988,7 @@ static const int included_patches[] = {
121,
// 120 NA
119,
// 118,
118,
// 117 NA
116,
// 115 NA
@@ -999,12 +1000,12 @@ static const int included_patches[] = {
// 109 NA
// 108 NA
// 107 NA
// 106,
106,
// 105 NA
// 104,
104,
// 103 NA
// 102,
// 101,
102,
101,
100,
99,
// 98 NA
@@ -1109,16 +1110,6 @@ static const int included_patches[] = {
};
// clang-format on
/// Place to put a short description when adding a feature with a patch.
/// Keep it short, e.g.,: "relative numbers", "persistent undo".
/// Also add a comment marker to separate the lines.
/// See the official Vim patches for the diff format: It must use a context of
/// one line only. Create it by hand or use "diff -C2" and edit the patch.
static char *(extra_patches[]) = {
// Add your patch description below this line
NULL
};
/// Compares a version string to the current Nvim version.
///
/// @param version Version string like "1.3.42"
@@ -1253,27 +1244,24 @@ static void list_features(void)
MSG_PUTS("See \":help feature-compile\"\n\n");
}
void list_lua_version(void)
{
typval_T luaver_tv;
typval_T arg = { .v_type = VAR_UNKNOWN }; // No args.
char *luaver_expr = "((jit and jit.version) and jit.version or _VERSION)";
executor_eval_lua(cstr_as_string(luaver_expr), &arg, &luaver_tv);
assert(luaver_tv.v_type == VAR_STRING);
MSG(luaver_tv.vval.v_string);
xfree(luaver_tv.vval.v_string);
}
void list_version(void)
{
// When adding features here, don't forget to update the list of
// internal variables in eval.c!
MSG(longVersion);
MSG(version_buildtype);
list_lua_version();
MSG(version_cflags);
// Print the list of extra patch descriptions if there is at least one.
char *s = "";
if (extra_patches[0] != NULL) {
MSG_PUTS(_("\nExtra patches: "));
s = "";
for (int i = 0; extra_patches[i] != NULL; ++i) {
MSG_PUTS(s);
s = ", ";
MSG_PUTS(extra_patches[i]);
}
}
#ifdef HAVE_PATHDEF
if ((*compiled_user != NUL) || (*compiled_sys != NUL)) {
@@ -1314,6 +1302,8 @@ void list_version(void)
version_msg("\"\n");
}
#endif // ifdef HAVE_PATHDEF
version_msg("\nRun :checkhealth for more info");
}
/// Output a string for the version message. If it's going to wrap, output a
@@ -1367,7 +1357,7 @@ void intro_message(int colon)
N_("https://neovim.io/community"),
"",
N_("type :help nvim<Enter> if you are new! "),
N_("type :CheckHealth<Enter> to optimize Nvim"),
N_("type :checkhealth<Enter> to optimize Nvim"),
N_("type :q<Enter> to exit "),
N_("type :help<Enter> for help "),
"",