aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt19
-rw-r--r--runtime/doc/eval.txt11
-rw-r--r--runtime/doc/various.txt22
-rw-r--r--src/nvim/fileio.c3
-rw-r--r--src/nvim/os/os_defs.h2
-rw-r--r--src/nvim/screen.c1
-rw-r--r--src/nvim/version.c4
-rw-r--r--third-party/cmake/BuildLibuv.cmake8
8 files changed, 37 insertions, 33 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43f283d8f7..321a919494 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,15 +51,25 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Dev" CACHE STRING "Choose the type of build." FORCE)
endif()
-# If not in a git repo (e.g., a tarball) these tokens set the version string,
-# otherwise the result of `git describe` is used.
+# If not in a git repo (e.g., a tarball) these tokens define the complete
+# version string, else it is combined with the result of `git describe`.
set(NVIM_VERSION_MAJOR 0)
set(NVIM_VERSION_MINOR 1)
-set(NVIM_VERSION_PATCH 1)
+set(NVIM_VERSION_PATCH 2)
+set(NVIM_VERSION_PRERELEASE "-dev") # for package maintainers
file(TO_CMAKE_PATH ${CMAKE_CURRENT_LIST_DIR}/.git FORCED_GIT_DIR)
include(GetGitRevisionDescription)
-git_describe(NVIM_VERSION_MEDIUM)
+get_git_head_revision(GIT_REFSPEC NVIM_VERSION_COMMIT)
+if(NVIM_VERSION_COMMIT) # is a git repo
+ git_describe(NVIM_VERSION_MEDIUM)
+ # `git describe` annotates the most recent tagged release; for pre-release
+ # builds we must replace that with the unreleased version.
+ string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.[0-9]+"
+ "v${NVIM_VERSION_MAJOR}.${NVIM_VERSION_MINOR}.${NVIM_VERSION_PATCH}"
+ NVIM_VERSION_MEDIUM
+ ${NVIM_VERSION_MEDIUM})
+endif()
set(NVIM_VERSION_BUILD_TYPE "${CMAKE_BUILD_TYPE}")
# NVIM_VERSION_CFLAGS set further below.
@@ -197,6 +207,7 @@ endif()
if(MINGW)
# Use POSIX compatible stdio in Mingw
add_definitions(-D__USE_MINGW_ANSI_STDIO)
+ add_definitions(-D_WIN32_WINNT=0x0600)
endif()
# OpenBSD's GCC (4.2.1) doesn't have -Wvla
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 49afa15601..45095d45a9 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -6939,8 +6939,8 @@ filterpipe When 'shelltemp' is off pipes are used for shell
find_in_path Compiled with support for include file searches
|+find_in_path|.
float Compiled with support for |Float|.
-fname_case Case in file names matters (for MS-DOS and Windows
- this is not present).
+fname_case Case in file names matters (for Windows this is not
+ present).
folding Compiled with |folding| support.
footer Compiled with GUI footer support. |gui-footer|
gettext Compiled with message translation |multi-lang|
@@ -7023,10 +7023,9 @@ visualextra Compiled with extra Visual mode commands.
vreplace Compiled with |gR| and |gr| commands.
wildignore Compiled with 'wildignore' option.
wildmenu Compiled with 'wildmenu' option.
-win32 Win32 version of Vim (MS-Windows 95 and later, 32 or
- 64 bits)
-win32unix Win32 version of Vim, using Unix files (Cygwin)
-win64 Win64 version of Vim (MS-Windows 64 bit).
+win32 Windows version of Vim (32 or 64 bit).
+win32unix Windows version of Vim, using Unix files (Cygwin).
+win64 Windows version of Vim (64 bit).
winaltkeys Compiled with 'winaltkeys' option.
windows Compiled with support for more than one window.
writebackup Compiled with 'writebackup' default on.
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index d810e1ab37..9e4104bf92 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -272,19 +272,15 @@ g8 Print the hex values of the bytes used in the
:!! Repeat last ":!{cmd}".
*:ve* *:version*
-:ve[rsion] Print the version number of the editor. If the
- compiler used understands "__DATE__" the compilation
- date is mentioned. Otherwise a fixed release-date is
- shown.
- The following lines contain information about which
- features were enabled when Vim was compiled. When
- there is a preceding '+', the feature is included,
- when there is a '-' it is excluded. To change this,
- you have to edit feature.h and recompile Vim.
- To check for this in an expression, see |has()|.
- Here is an overview of the features.
- The first column shows the smallest version in which
- they are included:
+:ve[rsion] Print the version number of the editor. The following
+ lines contain information about which features were
+ enabled when Vim was compiled. When there is a
+ preceding '+', the feature is included, when there is
+ a '-' it is excluded. To change this, you have to
+ edit feature.h and recompile Vim. To check for this
+ in an expression, see |has()|. Here is an overview of
+ the features. The first column shows the smallest
+ version in which they are included:
T tiny
S small
N normal
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index 23292ff4ac..05cb8f8f8c 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -1878,7 +1878,8 @@ failed:
}
if (msg_add_fileformat(fileformat))
c = TRUE;
- msg_add_lines(c, (long)linecnt, filesize);
+
+ msg_add_lines(c, (long)linecnt, filesize);
xfree(keep_msg);
keep_msg = NULL;
diff --git a/src/nvim/os/os_defs.h b/src/nvim/os/os_defs.h
index 26e479492e..79d14920eb 100644
--- a/src/nvim/os/os_defs.h
+++ b/src/nvim/os/os_defs.h
@@ -58,7 +58,7 @@
# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
#endif
#if !defined(S_ISLNK) && defined(S_IFLNK)
-# define S_IFLNK(m) (((m) & S_IFMT) == S_IFLNK)
+# define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
#endif
#if !defined(S_ISBLK) && defined(S_IFBLK)
# define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index c4264cbcee..977dd5b2d4 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -4105,7 +4105,6 @@ win_line (
* xterm/screen: write an extra character beyond the end of
* the line. This will work with all terminal types
* (regardless of the xn,am settings).
- * Only do this on a fast tty.
* Only do this if the cursor is on the current line
* (something has been written in it).
* Don't do this for the GUI.
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 0d8afc4e53..6919efe871 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -35,8 +35,6 @@
char *Version = VIM_VERSION_SHORT;
char *longVersion = NVIM_VERSION_LONG;
-char *longVersionWithDate = NVIM_VERSION_LONG \
- " (compiled " __DATE__ " " __TIME__ ")";
char *version_buildtype = "Build type: " NVIM_VERSION_BUILD_TYPE;
char *version_cflags = "Compilation: " NVIM_VERSION_CFLAGS;
@@ -1173,7 +1171,7 @@ void list_version(void)
{
// When adding features here, don't forget to update the list of
// internal variables in eval.c!
- MSG(longVersionWithDate);
+ MSG(longVersion);
MSG(version_buildtype);
MSG(version_cflags);
diff --git a/third-party/cmake/BuildLibuv.cmake b/third-party/cmake/BuildLibuv.cmake
index 5debe5c071..1d8d69e64e 100644
--- a/third-party/cmake/BuildLibuv.cmake
+++ b/third-party/cmake/BuildLibuv.cmake
@@ -41,18 +41,18 @@ set(UNIX_CFGCMD sh ${DEPS_BUILD_DIR}/src/libuv/autogen.sh &&
CC=${DEPS_C_COMPILER})
if(UNIX)
- BuildLibUv(
+ BuildLibuv(
CONFIGURE_COMMAND ${UNIX_CFGCMD}
INSTALL_COMMAND ${MAKE_PRG} V=1 install)
elseif(MINGW AND CMAKE_CROSSCOMPILING)
# Build libuv for the host
- BuildLibUv(TARGET libuv_host
+ BuildLibuv(TARGET libuv_host
CONFIGURE_COMMAND sh ${DEPS_BUILD_DIR}/src/libuv_host/autogen.sh && ${DEPS_BUILD_DIR}/src/libuv_host/configure --with-pic --disable-shared --prefix=${HOSTDEPS_INSTALL_DIR} CC=${HOST_C_COMPILER}
INSTALL_COMMAND ${MAKE_PRG} V=1 install)
# Build libuv for the target
- BuildLibUv(
+ BuildLibuv(
CONFIGURE_COMMAND ${UNIX_CFGCMD} --host=${CROSS_TARGET}
INSTALL_COMMAND ${MAKE_PRG} V=1 install)
@@ -70,7 +70,7 @@ elseif(WIN32 AND MSVC)
else()
set(VS_ARCH x64)
endif()
- BuildLibUv(
+ BuildLibuv(
# By default this creates Debug builds
BUILD_COMMAND set PYTHON=${PYTHON_EXECUTABLE} COMMAND ${DEPS_BUILD_DIR}/src/libuv/vcbuild.bat static debug ${VS_ARCH}
INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/lib
generated by cgit (git 2.34.1) at 2025-05-28 15:24:49 +0000