diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/gen_vimdoc.py | 8 | ||||
| -rwxr-xr-x | scripts/vim-patch.sh | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/scripts/gen_vimdoc.py b/scripts/gen_vimdoc.py index f37e4c9d37..cb80bd05c6 100755 --- a/scripts/gen_vimdoc.py +++ b/scripts/gen_vimdoc.py @@ -89,11 +89,14 @@ CONFIG = { # Section ordering. 'section_order': [ 'vim.c', + 'vimscript.c', 'buffer.c', + 'extmark.c', 'window.c', 'win_config.c', 'tabpage.c', 'ui.c', + 'extmark.c', ], # List of files/directories for doxygen to read, separated by blanks 'files': os.path.join(base_dir, 'src/nvim/api'), @@ -506,6 +509,11 @@ def render_node(n, text, prefix='', indent='', width=62): text += indent + prefix + result elif n.nodeName in ('para', 'heading'): for c in n.childNodes: + if (is_inline(c) + and '' != get_text(c).strip() + and text + and ' ' != text[-1]): + text += ' ' text += render_node(c, text, indent=indent, width=width) elif n.nodeName == 'itemizedlist': for c in n.childNodes: diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index d92480abb9..ac47f6aafd 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -183,7 +183,7 @@ assign_commit_details() { # Patch surgery preprocess_patch() { local file="$1" - local nvim="nvim -u NORC -i NONE --headless" + local nvim="nvim -u NONE -n -i NONE --headless" # Remove Filelist, README local na_files='Filelist\|README.*' @@ -683,7 +683,7 @@ review_commit() { msg_ok "Saved pull request diff to '${NVIM_SOURCE_DIR}/n${patch_file}'." CREATED_FILES+=("${NVIM_SOURCE_DIR}/n${patch_file}") - local nvim="nvim -u NORC -n -i NONE --headless" + local nvim="nvim -u NONE -n -i NONE --headless" 2>/dev/null $nvim --cmd 'set dir=/tmp' +'1,/^$/g/^ /-1join' +w +q "${NVIM_SOURCE_DIR}/n${patch_file}" local expected_commit_message |