-
-
Notifications
You must be signed in to change notification settings - Fork 2.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
44 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 0 additions & 33 deletions
33
packages/neovim/neovim-0.8.1-make-clean.patch.beforehostbuild
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,14 @@ | ||
--- a/runtime/lua/man.lua | ||
+++ b/runtime/lua/man.lua | ||
@@ -438,7 +438,7 @@ | ||
-- Force MANPAGER=cat to ensure Vim is not recursively invoked (by man-db). | ||
-- http://comments.gmane.org/gmane.editors.vim.devel/29085 | ||
-- Set MAN_KEEP_FORMATTING so Debian man doesn't discard backspaces. | ||
- local cmd = { 'env', 'MANPAGER=cat', 'MANWIDTH=' .. manwidth, 'MAN_KEEP_FORMATTING=1', 'man' } | ||
+ local cmd = { 'env', 'MANPAGER=cat', 'MANWIDTH=' .. manwidth, 'MAN_KEEP_FORMATTING=1', 'mandoc' } | ||
if localfile_arg then | ||
cmd[#cmd + 1] = '-l' | ||
@@ -271,9 +271,9 @@ | ||
-- inconsistently supported. Instead, call -w with a section and a name. | ||
local cmd | ||
if sect == '' then | ||
- cmd = { 'man', FIND_ARG, name } | ||
+ cmd = { 'mandoc', FIND_ARG, name } | ||
else | ||
- cmd = { 'man', FIND_ARG, sect, name } | ||
+ cmd = { 'mandoc', FIND_ARG, sect, name } | ||
end | ||
|
||
local lines = system(cmd, silent) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
diff --git a/src/nvim/po/CMakeLists.txt b/src/nvim/po/CMakeLists.txt | ||
index 1db21880b..791e833e1 100644 | ||
--- a/src/nvim/po/CMakeLists.txt | ||
+++ b/src/nvim/po/CMakeLists.txt | ||
@@ -48,13 +48,13 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG) | ||
list(SORT NVIM_RELATIVE_SOURCES) | ||
add_custom_command( | ||
OUTPUT ${NVIM_POT} | ||
- COMMAND $<TARGET_FILE:nvim> -u NONE -i NONE -n --headless --cmd "set cpo+=+" | ||
+ COMMAND "${PROJECT_BINARY_DIR}/../host-build/bin/nvim" -u NONE -i NONE -n --headless --cmd "set cpo+=+" | ||
-S ${CMAKE_CURRENT_SOURCE_DIR}/tojavascript.vim ${NVIM_POT} ${PROJECT_SOURCE_DIR}/runtime/optwin.vim | ||
COMMAND ${XGETTEXT_PRG} -o ${NVIM_POT} --default-domain=nvim | ||
--add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 | ||
-D ${CMAKE_CURRENT_SOURCE_DIR} -D ${CMAKE_CURRENT_BINARY_DIR} | ||
${NVIM_RELATIVE_SOURCES} optwin.js | ||
- COMMAND $<TARGET_FILE:nvim> -u NONE -i NONE -n --headless --cmd "set cpo+=+" | ||
+ COMMAND "${PROJECT_BINARY_DIR}/../host-build/bin/nvim" -u NONE -i NONE -n --headless --cmd "set cpo+=+" | ||
-S ${CMAKE_CURRENT_SOURCE_DIR}/fixfilenames.vim ${NVIM_POT} ../../../runtime/optwin.vim | ||
VERBATIM | ||
DEPENDS ${NVIM_SOURCES} nvim nvim_runtime_deps) | ||
@@ -83,7 +83,7 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG) | ||
set(poFile ${CMAKE_CURRENT_SOURCE_DIR}/${name}.po) | ||
|
||
add_custom_target(check-po-${name} | ||
- COMMAND $<TARGET_FILE:nvim> -u NONE -n -e | ||
+ COMMAND "${PROJECT_BINARY_DIR}/../host-build/bin/nvim" -u NONE -n -e | ||
-S ${CMAKE_CURRENT_SOURCE_DIR}/check.vim | ||
-c "if error == 0 | q | endif" -c cq ${poFile} || | ||
${CMAKE_COMMAND} -E echo "${name}.po failed the check." |