patch 9.1.1841: patch 9.1.1840 adds python build dependency

Problem:  patch 9.1.1840 adds python build dependency
          (chdizza)
Solution: Update dependencies (Hirohito Higashi)

fixes: #18523
related: #18045
closes: #18527

Signed-off-by: Hirohito Higashi <h.east.727@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index 52d07b10bead8b77aabba3f4c011ff94168ad865..8e06df2d3b8a8bac83dc7d0b58fb8a8a499042d2 100644 (file)
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 9.1.  Last change: 2025 Sep 29
+*develop.txt*   For Vim version 9.1.  Last change: 2025 Oct 09
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -365,28 +365,17 @@ We follow POSIX.1-2001 (SUSv3) for type sizes, which in practice means:
 
 FUNCTION PROTOTYPES                            *assumptions-prototypes*
 
-Vim currently does not use conventional header files (`.h`) for most internal
-function prototypes.  Instead, the current architecture uses individual `.pro`
-files in the `src/proto/` directory, with one `.pro` file per `.c` file.
+Vim does not use conventional header files (`.h`) for most internal function
+prototypes.  Instead, the current architecture uses individual `.pro` files in
+the `src/proto/` directory, with one `.pro` file per `.c` file.
 
 Unlike traditional self-contained header files, these `.pro` files do not
-contain API documentation, struct and enum definitions, or other declaration;
+contain API documentation, struct and enum definitions, or other declarations;
 only function prototypes.
 
-The bundling of these files is not automated.  The `src/proto.h` header is
-composed of a list of manual `#include` directives, one for each individual
-`.pro` file.
-
-Due to this design, integrating a new source file within this architecture
-involves creating a corresponding `.pro` file, manually adding a new `#include`
-directive to `proto.h` and manually adding this file to both `src/Makefile` and
-`src/Make_mvc.mak`.
-
-A `make proto` target exists in `src/Makefile` with the original goal of
-automating the process of updating the `.pro` files.  However, this target is
-unreliable, fails on major platforms (e.g., macOS), and is only part of the
-new release workflow.  In practice, contributors edit the relevant `.pro` files
-by hand when adding, removing, or modifying a function signatures.
+The `make proto` target in `src/Makefile` automates updating most of the .pro
+files using the Python script proto/gen_prototypes.py, which relies on the
+python3-clangd module.  Note that a few proto files are hand edited.
 
 This system has been in place since at least v1.24, when Vim's functions were
 still written in K&R style.

diff --git a/src/Make_vms.mms b/src/Make_vms.mms
index 8ab68e5c0f5bef41ca08a64080f589b86c182a6d..16f145d996eb407e3a9102cffe103762b6f964fd 100644 (file)
--- a/src/Make_vms.mms
+++ b/src/Make_vms.mms
@@ -1008,7 +1008,7 @@ lua_env :
 
 [.$(DEST)]alloc.obj : alloc.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]arabic.obj : arabic.c vim.h
 [.$(DEST)]arglist.obj : arglist.c vim.h [.$(DEST)]config.h feature.h os_unix.h
 [.$(DEST)]autocmd.obj : autocmd.c vim.h [.$(DEST)]config.h feature.h os_unix.h
@@ -1016,463 +1016,463 @@ lua_env :
 [.$(DEST)]blob.obj : blob.c vim.h [.$(DEST)]config.h feature.h os_unix.h
 [.$(DEST)]buffer.obj : buffer.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h version.h
 [.$(DEST)]bufwrite.obj : bufwrite.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]change.obj : change.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]charset.obj : charset.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]channel.obj : channel.c vim.h [.$(DEST)]config.h feature.h
 [.$(DEST)]cindent.obj : cindent.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]clientserver.obj : clientserver.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]clipboard.obj : clipboard.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]cmdexpand.obj : cmdexpand.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]cmdhist.obj : cmdhist.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]crypt.obj : crypt.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h option.h structs.h regexp.h gui.h \
- beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \
+ beval.h alloc.h ex_cmds.h spell.h proto.h \
  errors.h globals.h
 [.$(DEST)]crypt_zip.obj : crypt_zip.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h option.h structs.h \
- regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \
+ regexp.h gui.h beval.h alloc.h ex_cmds.h spell.h \
  proto.h errors.h globals.h
 [.$(DEST)]debugger.obj : debugger.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]dict.obj : dict.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h option.h structs.h regexp.h gui.h \
- beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \
+ beval.h alloc.h ex_cmds.h spell.h proto.h \
  errors.h globals.h
 [.$(DEST)]diff.obj : diff.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]digraph.obj : digraph.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]drawline.obj : drawline.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]drawscreen.obj : drawscreen.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]edit.obj : edit.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]eval.obj : eval.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]evalbuffer.obj : evalbuffer.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h option.h structs.h \
- regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \
+ regexp.h gui.h beval.h alloc.h ex_cmds.h spell.h \
  proto.h errors.h globals.h
 [.$(DEST)]evalfunc.obj : evalfunc.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h option.h structs.h \
- regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \
+ regexp.h gui.h beval.h alloc.h ex_cmds.h spell.h \
  proto.h errors.h globals.h version.h
 [.$(DEST)]evalvars.obj : evalvars.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h option.h structs.h \
- regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \
+ regexp.h gui.h beval.h alloc.h ex_cmds.h spell.h \
  proto.h errors.h globals.h version.h
 [.$(DEST)]evalwindow.obj : evalwindow.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h option.h structs.h \
- regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \
+ regexp.h gui.h beval.h alloc.h ex_cmds.h spell.h \
  proto.h errors.h globals.h
 [.$(DEST)]ex_cmds.obj : ex_cmds.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h version.h
 [.$(DEST)]ex_cmds2.obj : ex_cmds2.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h version.h
 [.$(DEST)]ex_docmd.obj : ex_docmd.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h ex_cmdidxs.h
 [.$(DEST)]ex_eval.obj : ex_eval.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]ex_getln.obj : ex_getln.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]fileio.obj : fileio.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]filepath.obj : filepath.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]findfile.obj : findfile.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]float.obj : float.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]fold.obj : fold.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]fuzzy.obj : fuzzy.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]getchar.obj : getchar.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]gc.obj : gc.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]gui_xim.obj : gui_xim.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]hardcopy.obj : hardcopy.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h version.h
 [.$(DEST)]hashtab.obj : hashtab.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]help.obj : help.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]highlight.obj : highlight.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]if_cscope.obj : if_cscope.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]if_xcmdsrv.obj : if_xcmdsrv.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h version.h
 [.$(DEST)]if_mzsch.obj : if_mzsch.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h option.h structs.h \
- regexp.h gui.h beval.h [.proto]gui_beval.pro ex_cmds.h proto.h \
+ regexp.h gui.h beval.h ex_cmds.h proto.h \
  errors.h globals.h if_mzsch.h
 [.$(DEST)]indent.obj : indent.c vim.h [.$(DEST)]config.h feature.h os_unix.h
 [.$(DEST)]insexpand.obj : insexpand.c vim.h [.$(DEST)]config.h feature.h os_unix.h
 [.$(DEST)]job.obj : job.c vim.h [.$(DEST)]config.h feature.h os_unix.h
 [.$(DEST)]json.obj : json.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]linematch.obj : linematch.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]list.obj : list.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h option.h structs.h regexp.h gui.h \
- beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \
+ beval.h alloc.h ex_cmds.h spell.h proto.h \
  errors.h globals.h
 [.$(DEST)]locale.obj : locale.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h option.h structs.h regexp.h gui.h \
- beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \
+ beval.h alloc.h ex_cmds.h spell.h proto.h \
  errors.h globals.h
 [.$(DEST)]logfile.obj : logfile.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h option.h structs.h regexp.h gui.h \
- beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \
+ beval.h alloc.h ex_cmds.h spell.h proto.h \
  errors.h globals.h
 [.$(DEST)]main.obj : main.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h \
+ option.h ex_cmds.h proto.h errors.h globals.h \
  arabic.c
 [.$(DEST)]map.obj : map.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]mark.obj : mark.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]match.obj : match.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]memfile.obj : memfile.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]memline.obj : memline.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]menu.obj : menu.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]message.obj : message.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]misc1.obj : misc1.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h \
+ option.h ex_cmds.h proto.h errors.h globals.h \
  version.h
 [.$(DEST)]misc2.obj : misc2.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]mouse.obj : mouse.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]move.obj : move.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]mbyte.obj : mbyte.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]normal.obj : normal.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h nv_cmdidxs.h nv_cmds.h
 [.$(DEST)]ops.obj : ops.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]option.obj : option.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h optiondefs.h
 [.$(DEST)]optionstr.obj : optionstr.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]os_unix.obj : os_unix.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h os_unixx.h
 [.$(DEST)]os_vms.obj : os_vms.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h os_unixx.h
 [.$(DEST)]pathdef.obj : [.$(DEST)]pathdef.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]popupmenu.obj : popupmenu.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]popupwin.obj : popupwin.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]pty.obj : pty.c vim.h [.$(DEST)]config.h feature.h os_unix.h
 [.$(DEST)]profiler.obj : profiler.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]quickfix.obj : quickfix.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]regexp.obj : regexp.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]register.obj : register.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]scriptfile.obj : scriptfile.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]screen.obj : screen.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]search.obj : search.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]session.obj : session.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]sha256.obj : sha256.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h option.h structs.h regexp.h gui.h \
- beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \
+ beval.h alloc.h ex_cmds.h spell.h proto.h \
  errors.h globals.h
 [.$(DEST)]sign.obj : sign.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h option.h structs.h regexp.h gui.h \
- beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \
+ beval.h alloc.h ex_cmds.h spell.h proto.h \
  errors.h globals.h
 [.$(DEST)]sound.obj : sound.c vim.h [.$(DEST)]config.h feature.h
 [.$(DEST)]spell.obj : spell.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]spellfile.obj : spellfile.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h option.h structs.h \
- regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \
+ regexp.h gui.h beval.h alloc.h ex_cmds.h spell.h \
  proto.h errors.h globals.h
 [.$(DEST)]spellsuggest.obj : spellsuggest.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h option.h structs.h \
- regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \
+ regexp.h gui.h beval.h alloc.h ex_cmds.h spell.h \
  proto.h errors.h globals.h
 [.$(DEST)]strings.obj : strings.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h option.h structs.h \
- regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \
+ regexp.h gui.h beval.h alloc.h ex_cmds.h spell.h \
  proto.h errors.h globals.h
 [.$(DEST)]syntax.obj : syntax.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]tabpanel.obj : tabpanel.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]tag.obj : tag.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]term.obj : term.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]terminal.obj : terminal.c vim.h [.$(DEST)]config.h feature.h os_unix.h
 [.$(DEST)]termlib.obj : termlib.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]testing.obj : testing.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]textformat.obj : textformat.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]textobject.obj : textobject.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]textprop.obj : textprop.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]time.obj : time.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]tuple.obj : tuple.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]typval.obj : typval.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]ui.obj : ui.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]undo.obj : undo.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]usercmd.obj : usercmd.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h option.h structs.h \
- regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \
+ regexp.h gui.h beval.h alloc.h ex_cmds.h spell.h \
  proto.h errors.h globals.h
 [.$(DEST)]userfunc.obj : userfunc.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h option.h structs.h \
- regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \
+ regexp.h gui.h beval.h alloc.h ex_cmds.h spell.h \
  proto.h errors.h globals.h
 [.$(DEST)]version.obj : version.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h version.h
 [.$(DEST)]viminfo.obj : viminfo.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h version.h
 [.$(DEST)]vim9class.obj : vim9class.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h version.h
 [.$(DEST)]vim9cmds.obj : vim9cmds.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h version.h
 [.$(DEST)]vim9compile.obj : vim9compile.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h version.h
 [.$(DEST)]vim9execute.obj : vim9execute.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h version.h
 [.$(DEST)]vim9expr.obj : vim9expr.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h version.h
 [.$(DEST)]vim9instr.obj : vim9instr.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h version.h
 [.$(DEST)]vim9generics.obj : vim9generics.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h version.h
 [.$(DEST)]vim9script.obj : vim9script.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h version.h
 [.$(DEST)]vim9type.obj : vim9type.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h version.h
 [.$(DEST)]window.obj : window.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]gui.obj : gui.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]gui_gtk.obj : gui_gtk.c gui_gtk_f.h vim.h [.$(DEST)]config.h feature.h \
  os_unix.h   ascii.h keymap.h termdefs.h macros.h structs.h \
- regexp.h gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h \
+ regexp.h gui.h beval.h option.h ex_cmds.h \
  proto.h errors.h globals.h [-.pixmaps]stock_icons.h
 [.$(DEST)]gui_gtk_f.obj : gui_gtk_f.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h gui_gtk_f.h
 [.$(DEST)]gui_motif.obj : gui_motif.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h [-.pixmaps]alert.xpm [-.pixmaps]error.xpm \
  [-.pixmaps]generic.xpm [-.pixmaps]info.xpm [-.pixmaps]quest.xpm
 [.$(DEST)]gui_athena.obj : gui_athena.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h gui_at_sb.h
 [.$(DEST)]gui_gtk_x11.obj : gui_gtk_x11.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h gui_gtk_f.h [-.runtime]vim32x32.xpm \
  [-.runtime]vim16x16.xpm [-.runtime]vim48x48.xpm version.h
 [.$(DEST)]gui_x11.obj : gui_x11.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h [-.runtime]vim32x32.xpm \
  [-.runtime]vim16x16.xpm [-.runtime]vim48x48.xpm [-.pixmaps]tb_new.xpm \
  [-.pixmaps]tb_open.xpm [-.pixmaps]tb_close.xpm [-.pixmaps]tb_save.xpm \
@@ -1492,30 +1492,30 @@ lua_env :
  [-.pixmaps]tb_minwidth.xpm
 [.$(DEST)]gui_at_sb.obj : gui_at_sb.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h gui_at_sb.h
 [.$(DEST)]gui_at_fs.obj : gui_at_fs.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h gui_at_sb.h
 [.$(DEST)]pty.obj : pty.c vim.h [.$(DEST)]config.h feature.h os_unix.h   \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
- [.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
+ option.h ex_cmds.h proto.h errors.h globals.h
 [.$(DEST)]if_perl.obj : [.auto]if_perl.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]if_python.obj : if_python.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]if_tcl.obj : if_tcl.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]if_ruby.obj : if_ruby.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h version.h
 [.$(DEST)]if_lua.obj : if_lua.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  errors.h globals.h version.h
@@ -1525,11 +1525,11 @@ lua_env :
  errors.h globals.h
 [.$(DEST)]gui_beval.obj : gui_beval.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h
 [.$(DEST)]netbeans.obj : netbeans.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h version.h
 [.$(DEST)]gui_xmdlg.obj : gui_xmdlg.c [.$(DEST)]config.h vim.h feature.h os_unix.h
 [.$(DEST)]gui_xmebw.obj : gui_xmebw.c [.$(DEST)]config.h vim.h feature.h os_unix.h

diff --git a/src/Makefile b/src/Makefile
index e76d39675254e2dfaf87463702007594737af55c..ab38487b59ca209a29887fb7354514753d220d04 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1873,6 +1873,7 @@ PROTO_FILES = \
        proto/gc.pro \
        proto/getchar.pro \
        proto/gui_beval.pro \
+       proto/gui_gtk_gresources.pro \
        proto/gui_xim.pro \
        proto/hardcopy.pro \
        proto/hashtab.pro \
@@ -2107,6 +2108,11 @@ update-po:
 # - Only the bare minimum of macro definitions is required.
 # - Generates the same .pro file even across different operating systems.
 #   (maybe)
+# Note: the following proto files need to be manually updated:
+# proto/gui_haiku.pro
+# proto/if_ole.pro
+# proto/if_perl.pro
+# proto/os_macosx.pro
 #
 # How to set up environment to run `make proto`
 # On Ubuntu 24.04:
@@ -2141,6 +2147,9 @@ GEN_PROTO_ARG = -DPROTO -DFEAT_GUI -DFEAT_WAYLAND -DFEAT_WAYLAND_CLIPBOARD -I.
 proto/%.pro: %.c
        @$(PYTHON) $(GEN_PROTO_CMD) $< $(GEN_PROTO_ARG)
 
+proto/gui_gtk_gresources.pro: auto/gui_gtk_gresources.c
+       @$(PYTHON) $(GEN_PROTO_CMD) $< $(GEN_PROTO_ARG)
+
 notags:
        -rm -f tags
 
@@ -3055,13 +3064,13 @@ depend:
        sed -e '/\#\#\# Dependencies/q' < Makefile > tmp_make
        -for i in $(ALL_LOCAL_SRC); do echo $$i; \
                $(CPP_DEPEND) $$i | \
-               sed -e 's+^\([^ ]*\.o\)+objects/\1+' >> tmp_make; done
+               sed -e 's+^\([^ ]*\.o\)+objects/\1+' -e 's+proto/[^ ]*\.pro[ ]*++' >> tmp_make; done
        -for i in $(TERM_SRC); do echo $$i; \
                $(CPP_DEPEND) $$i | \
-               sed -e 's+^\([^ ]*\.o\)+objects/vterm_\1+' >> tmp_make; done
+               sed -e 's+^\([^ ]*\.o\)+objects/vterm_\1+' -e 's+proto/[^ ]*\.pro[ ]*++' >> tmp_make; done
        -for i in $(XDIFF_SRC); do echo $$i; \
                $(CPP_DEPEND) $$i | \
-               sed -e 's+^\([^ ]*\.o\)+objects/\1+' -e 's+xdiff/\.\./++g' >> tmp_make; done
+               sed -e 's+^\([^ ]*\.o\)+objects/\1+' -e 's+proto/[^ ]*\.pro[ ]*++' -e 's+xdiff/\.\./++g' >> tmp_make; done
        -for i in $(PROTO_FILES); do \
                base=`basename $$i .pro`; \
                echo "$$i: $$base.c" >> tmp_make; done
@@ -4663,6 +4672,7 @@ proto/fuzzy.pro: fuzzy.c
 proto/gc.pro: gc.c
 proto/getchar.pro: getchar.c
 proto/gui_beval.pro: gui_beval.c
+proto/gui_gtk_gresources.pro: auto/gui_gtk_gresources.c
 proto/gui_xim.pro: gui_xim.c
 proto/hardcopy.pro: hardcopy.c
 proto/hashtab.pro: hashtab.c

diff --git a/src/proto/gui_gtk_gresources.pro b/src/proto/gui_gtk_gresources.pro
index c09c7937cf3c79f64a3a88e478be9eb10f8734b3..5a004134d857c5fb0ec60be6acce9c5d50536480 100644 (file)
--- a/src/proto/gui_gtk_gresources.pro
+++ b/src/proto/gui_gtk_gresources.pro
@@ -1,4 +1,4 @@
-/* auto/gui_gtk_gresources.c */
+/* gui_gtk_gresources.c */
 GResource *gui_gtk_get_resource(void);
 void gui_gtk_unregister_resource(void);
 void gui_gtk_register_resource(void);

diff --git a/src/proto/if_ole.pro b/src/proto/if_ole.pro
index adedf6aba058321f4b4975503513af584912f1e9..375ccc0f314defea828d1cc854e9d862b8c55a2a 100644 (file)
--- a/src/proto/if_ole.pro
+++ b/src/proto/if_ole.pro
@@ -1,4 +1,4 @@
-/* if_ole.cpp */
+/* manually generated from if_ole.cpp */
 void InitOLE(int* pbDoRestart);
 void UninitOLE(void);
 void RegisterMe(int silent);

diff --git a/src/proto/if_perl.pro b/src/proto/if_perl.pro
index 066c0db254ca5edf3e11c66c0e420bd7b218db6e..64e421f13586b3a667d4a1baf237597dcef4cf6c 100644 (file)
--- a/src/proto/if_perl.pro
+++ b/src/proto/if_perl.pro
@@ -1,4 +1,4 @@
-/* auto/if_perl.c */
+/* manually generated if_perl.c from if_perl.xs */
 int perl_enabled(int verbose);
 void perl_end(void);
 void msg_split(char_u *s, int attr);

diff --git a/src/proto/os_macosx.pro b/src/proto/os_macosx.pro
index c7f94ec9e20265396e5e2dacb00aa6c97a9f0a63..4a83a0b598fa91ea16513b28ef871a5c6e80162a 100644 (file)
--- a/src/proto/os_macosx.pro
+++ b/src/proto/os_macosx.pro
@@ -1,4 +1,4 @@
-/* os_macosx.m */
+/* manually generated from os_macosx.m */
 void process_cfrunloop(void);
 bool sound_mch_play(const char_u* event, long sound_id, soundcb_T *callback, bool playfile);
 void sound_mch_stop(long sound_id);

diff --git a/src/version.c b/src/version.c
index 345cf2fa9976f9db8810f33217f1b3f3d8a78cb4..55b3c80af7aaaeac17e90be8b4baa00a645c6f6e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1841,
 /**/
     1840,
 /**/