aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt4
-rw-r--r--contrib/luarc.json1
-rw-r--r--src/man/Makefile (renamed from man/Makefile)0
-rw-r--r--src/man/nvim.1 (renamed from man/nvim.1)0
4 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 097ef041ea..8434a8824c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -444,7 +444,7 @@ if(TS_HAS_SET_ALLOCATOR)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNVIM_TS_HAS_SET_ALLOCATOR")
endif()
-# Note: The test lib requires LuaJIT; it will be skipped if LuaJIT is missing.
+# The unit test lib requires LuaJIT; it will be skipped if LuaJIT is missing.
option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF)
if(PREFER_LUA)
@@ -641,7 +641,7 @@ endif()
include(InstallHelpers)
install_helper(
- FILES ${CMAKE_SOURCE_DIR}/man/nvim.1
+ FILES ${CMAKE_SOURCE_DIR}/src/man/nvim.1
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
#
diff --git a/contrib/luarc.json b/contrib/luarc.json
index 770b023ac6..8d76d1261d 100644
--- a/contrib/luarc.json
+++ b/contrib/luarc.json
@@ -5,6 +5,7 @@
"globals": [
"vim",
"describe",
+ "pending",
"it",
"before_each",
"after_each",
diff --git a/man/Makefile b/src/man/Makefile
index 3c0457e2ab..3c0457e2ab 100644
--- a/man/Makefile
+++ b/src/man/Makefile
diff --git a/man/nvim.1 b/src/man/nvim.1
index 9f35014ee8..9f35014ee8 100644
--- a/man/nvim.1
+++ b/src/man/nvim.1