From c70c8b607f84611373969d3add2f6ef25e61078f Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 11 Jan 2019 01:20:15 +0100 Subject: doc [ci skip] #9478 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Lua - developer guidelines - MAINTAIN.md - TUI: cleanup - TUI: mention Windows terminfo builtins - cleanup if_pyth, redirect python-bindeval tag Helped-by: Björn Linse Helped-by: erw7 --- scripts/release.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/release.sh b/scripts/release.sh index fb266ad154..a51a6666f5 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -93,7 +93,7 @@ Next steps: - Double-check NVIM_VERSION_* in CMakeLists.txt - Push the tag: git push --follow-tags - - Empty-merge (if this is a maintenance release): - git checkout upstream/master - git merge -s ours upstream/release-x.y + - Update the 'stable' tag: + git push --force upstream HEAD^:refs/tags/stable + git fetch --tags - Update website: index.html" -- cgit From cd64f5abd46e24509b8650f7ecfa30d3f0152b0e Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sat, 26 Jan 2019 20:10:59 +0100 Subject: gen_api_vimdoc.py: Do not wrap on hyphens, long words - Any long symbol is intentional and should never be hardwrapped. - Vim help tags are often hyphenated, and hardwrapping on hyphens breaks the Vim help syntax parser. --- scripts/gen_api_vimdoc.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/gen_api_vimdoc.py b/scripts/gen_api_vimdoc.py index 4e86f15b37..515964bfe8 100755 --- a/scripts/gen_api_vimdoc.py +++ b/scripts/gen_api_vimdoc.py @@ -158,9 +158,12 @@ def doc_wrap(text, prefix='', width=70, func=False): lines[-1] += part return '\n'.join(x.rstrip() for x in lines).rstrip() - return '\n'.join(textwrap.wrap(text.strip(), width=width, - initial_indent=prefix, - subsequent_indent=indent_space)) + tw = textwrap.TextWrapper(break_long_words = False, + break_on_hyphens = False, + width=width, + initial_indent=prefix, + subsequent_indent=indent_space) + return '\n'.join(tw.wrap(text.strip())) def parse_params(parent, width=62): -- cgit