3 files changed, 36 insertions, 10 deletions
diff --git a/scripts/gen_vimdoc.py b/scripts/gen_vimdoc.py
index 0507e4b7b6..b4d896fecc 100755
--- a/scripts/gen_vimdoc.py
+++ b/scripts/gen_vimdoc.py
@@ -48,6 +48,7 @@ import textwrap
 import subprocess
 import collections
 import msgpack
+import logging
 
 from xml.dom import minidom
 
@@ -57,10 +58,18 @@ if sys.version_info < MIN_PYTHON_VERSION:
     print("requires Python {}.{}+".format(*MIN_PYTHON_VERSION))
     sys.exit(1)
 
-DEBUG = ('DEBUG' in os.environ)
+# DEBUG = ('DEBUG' in os.environ)
 INCLUDE_C_DECL = ('INCLUDE_C_DECL' in os.environ)
 INCLUDE_DEPRECATED = ('INCLUDE_DEPRECATED' in os.environ)
 
+log = logging.getLogger(__name__)
+
+LOG_LEVELS = {
+    logging.getLevelName(level): level for level in [
+        logging.DEBUG, logging.INFO, logging.ERROR
+    ]
+}
+
 fmt_vimhelp = False  # HACK
 text_width = 78
 script_path = os.path.abspath(__file__)
@@ -157,7 +166,7 @@ CONFIG = {
         ]),
         'file_patterns': '*.lua',
         'fn_name_prefix': '',
-        'section_name': {},
+        'section_name': {'lsp.lua': 'lsp'},
         'section_fmt': lambda name: (
             'Lua module: vim.lsp'
             if name.lower() == 'lsp'
@@ -726,8 +735,8 @@ def extract_from_xml(filename, target, width):
         if desc:
             for child in desc.childNodes:
                 paras.append(para_as_map(child))
-            if DEBUG:
-                print(textwrap.indent(
+            log.debug(
+                textwrap.indent(
                     re.sub(r'\n\s*\n+', '\n',
                            desc.toprettyxml(indent='  ', newl='\n')), ' ' * 16))
 
@@ -885,12 +894,13 @@ def main(config, args):
             os.remove(mpack_file)
 
         output_dir = out_dir.format(target=target)
+        debug = args.log_level >= logging.DEBUG
         p = subprocess.Popen(
                 ['doxygen', '-'],
                 stdin=subprocess.PIPE,
                 # silence warnings
                 # runtime/lua/vim/lsp.lua:209: warning: argument 'foo' not found
-                stderr=(subprocess.STDOUT if DEBUG else subprocess.DEVNULL))
+                stderr=(subprocess.STDOUT if debug else subprocess.DEVNULL))
         p.communicate(
             config.format(
                 input=CONFIG[target]['files'],
@@ -1039,6 +1049,10 @@ def filter_source(filename):
 def parse_args():
     targets = ', '.join(CONFIG.keys())
     ap = argparse.ArgumentParser()
+    ap.add_argument(
+        "--log-level", "-l", choices=LOG_LEVELS.keys(),
+        default=logging.getLevelName(logging.ERROR), help="Set log verbosity"
+    )
     ap.add_argument('source_filter', nargs='*',
                     help="Filter source file(s)")
     ap.add_argument('-k', '--keep-tmpfiles', action='store_true',
@@ -1085,6 +1099,10 @@ Doxyfile = textwrap.dedent('''
 
 if __name__ == "__main__":
     args = parse_args()
+    print("Setting log level to %s" % args.log_level)
+    args.log_level = LOG_LEVELS[args.log_level]
+    log.setLevel(args.log_level)
+
     if len(args.source_filter) > 0:
         filter_source(args.source_filter[0])
     else:
diff --git a/scripts/lua2dox_filter b/scripts/lua2dox_filter
index 61577527c4..8760f12176 100755
--- a/scripts/lua2dox_filter
+++ b/scripts/lua2dox_filter
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ###########################################################################
 #   Copyright (C) 2012 by Simon Dales   #
diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index 551b8fb691..f583b2fdea 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -180,8 +180,12 @@ preprocess_patch() {
   local file="$1"
   local nvim="nvim -u NORC -i NONE --headless"
 
-  # Remove *.proto, Make*, gui_*, some if_*
-  local na_src='proto\|Make*\|gui_*\|if_lua\|if_mzsch\|if_olepp\|if_ole\|if_perl\|if_py\|if_ruby\|if_tcl\|if_xcmdsrv'
+  # Remove Filelist, README
+  local na_files='Filelist\|README.*'
+  2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/\<\%('"${na_files}"'\)\>@norm! d/\v(^diff)|%$
+' +w +q "$file"
+
+  # Remove *.proto, Make*, INSTALL*, gui_*, beval.*, some if_*, gvim, libvterm, tee, VisVim, xpm, xxd
+  local na_src='auto\|configure.*\|GvimExt\|libvterm\|proto\|tee\|VisVim\|xpm\|xxd\|Make*\|INSTALL*\|beval.*\|gui_*\|if_lua\|if_mzsch\|if_olepp\|if_ole\|if_perl\|if_py\|if_ruby\|if_tcl\|if_xcmdsrv'
   2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/src/\S*\<\%(testdir/\)\@<!\%('"${na_src}"'\)@norm! d/\v(^diff)|%$
 ' +w +q "$file"
 
   # Remove unwanted Vim doc files.
@@ -191,10 +195,14 @@ preprocess_patch() {
   # Remove "Last change ..." changes in doc files.
   2>/dev/null $nvim --cmd 'set dir=/tmp' +'%s/^@@.*\n.*For Vim version.*Last change.*\n.*For Vim version.*Last change.*//' +w +q "$file"
 
-  # Remove screen dumps, testdir/Make_*.mak files
-  local na_src_testdir='Make_amiga.mak\|Make_dos.mak\|Make_ming.mak\|Make_vms.mms\|dumps/.*.dump'
+  # Remove gui, option, setup, screen dumps, testdir/Make_*.mak files
+  local na_src_testdir='gen_opt_test.vim\|gui_.*\|Make_amiga.mak\|Make_dos.mak\|Make_ming.mak\|Make_vms.mms\|dumps/.*.dump\|setup_gui.vim'
   2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/src/testdir/\<\%('"${na_src_testdir}"'\)\>@norm! d/\v(^diff)|%$
 ' +w +q "$file"
 
+  # Remove testdir/test_*.vim files
+  local na_src_testdir='balloon.*\|channel.*\|crypt.vim\|gui.*\|job_fails.vim\|json.vim\|mzscheme.vim\|netbeans.*\|paste.vim\|popupwin.*\|restricted.vim\|shortpathname.vim\|tcl.vim\|terminal.*\|xxd.vim'
+  2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/src/testdir/\<test_\%('"${na_src_testdir}"'\)\>@norm! d/\v(^diff)|%$
+' +w +q "$file"
+
   # Remove version.c #7555
   local na_po='version.c'
   2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/src/\<\%('${na_po}'\)\>@norm! d/\v(^diff)|%$
 ' +w +q "$file"