IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

:version : show Lua[Jit] version (#7436)

Browse Source 
Also remove vestigial `extra_patches` code.
This commit is contained in:
Justin M. Keyes 2017-10-24 21:57:11 +02:00 committed by GitHub
parent e35a66d396
commit fdd9b1982b
1 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/nvim/version.c
View File

@ -22,6 +22,7 @@
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/screen.h" #include "nvim/screen.h"
#include "nvim/strings.h" #include "nvim/strings.h"
#include "nvim/lua/executor.h"
// version info generated by the build system // version info generated by the build system
#include "auto/versiondef.h" #include "auto/versiondef.h"
@ -1107,16 +1108,6 @@ static const int included_patches[] = {
}; };
// clang-format on // 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. /// Compares a version string to the current Nvim version.
/// ///
/// @param version Version string like "1.3.42" /// @param version Version string like "1.3.42"
@ -1251,27 +1242,24 @@ static void list_features(void)
MSG_PUTS("See \":help feature-compile\"\n\n"); 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) void list_version(void)
{ {
// When adding features here, don't forget to update the list of
// internal variables in eval.c!
MSG(longVersion); MSG(longVersion);
MSG(version_buildtype); MSG(version_buildtype);
list_lua_version();
MSG(version_cflags); 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 #ifdef HAVE_PATHDEF
if ((*compiled_user != NUL) || (*compiled_sys != NUL)) { if ((*compiled_user != NUL) || (*compiled_sys != NUL)) {
@ -1312,6 +1300,8 @@ void list_version(void)
version_msg("\"\n"); version_msg("\"\n");
} }
#endif // ifdef HAVE_PATHDEF #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 /// Output a string for the version message. If it's going to wrap, output a