refactor: reorganize option header files (#25437)

- Move vimoption_T to option.h
- option_defs.h is for option-related types
- option_vars.h corresponds to Vim's option.h
- option_defs.h and option_vars.h don't include each other

106 files changed, 1187 insertions, 1110 deletions

diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index 8b061add0d..478415376a 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -288,6 +288,10 @@ preprocess_patch() {
   LC_ALL=C sed -Ee 's/( [ab]\/src\/nvim)\/keymap\.h/\1\/keycodes.h/g' \
     "$file" > "$file".tmp && mv "$file".tmp "$file"
 
+  # Rename option.h to option_vars.h
+  LC_ALL=C sed -Ee 's/( [ab]\/src\/nvim)\/option\.h/\1\/option_vars.h/g' \
+    "$file" > "$file".tmp && mv "$file".tmp "$file"
+
   # Rename terminal.txt to nvim_terminal_emulator.txt
   LC_ALL=C sed -Ee 's/( [ab]\/runtime\/doc)\/terminal\.txt/\1\/nvim_terminal_emulator.txt/g' \
     "$file" > "$file".tmp && mv "$file".tmp "$file"
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index f064a8e82a..9d9a5080e4 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -55,6 +55,7 @@
 #include "nvim/msgpack_rpc/unpacker.h"
 #include "nvim/ops.h"
 #include "nvim/option.h"
+#include "nvim/option_vars.h"
 #include "nvim/optionstr.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os_defs.h"
diff --git a/src/nvim/arabic.c b/src/nvim/arabic.c
index 41024cafda..bab77a4a84 100644
--- a/src/nvim/arabic.c
+++ b/src/nvim/arabic.c
@@ -28,7 +28,7 @@
 #include "nvim/ascii.h"
 #include "nvim/macros.h"
 #include "nvim/mbyte.h"
-#include "nvim/option_defs.h"
+#include "nvim/option_vars.h"
 #include "nvim/vim.h"
 
 // Unicode values for Arabic characters.
diff --git a/src/nvim/arglist.c b/src/nvim/arglist.c
index 10e4b09600..a4221a1562 100644
--- a/src/nvim/arglist.c
+++ b/src/nvim/arglist.c
@@ -31,6 +31,7 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/option.h"
+#include "nvim/option_vars.h"
 #include "nvim/os/input.h"
 #include "nvim/path.h"
 #include "nvim/pos.h"
diff --git a/src/nvim/autocmd.c b/src/nvim/autocmd.c
index 8c2df6f3b5..657760914f 100644
--- a/src/nvim/autocmd.c
+++ b/src/nvim/autocmd.c
@@ -34,7 +34,7 @@
 #include "nvim/memline_defs.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/option_defs.h"
+#include "nvim/option.h"
 #include "nvim/optionstr.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index e418e415e0..5025e86771 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -79,6 +79,7 @@
 #include "nvim/move.h"
 #include "nvim/normal.h"
 #include "nvim/option.h"
+#include "nvim/option_vars.h"
 #include "nvim/optionstr.h"
 #include "nvim/os/fs_defs.h"
 #include "nvim/os/input.h"
diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h
index f0fdf0a230..ebaad45960 100644
--- a/src/nvim/buffer_defs.h
+++ b/src/nvim/buffer_defs.h
@@ -28,7 +28,7 @@ typedef struct {
 #include "nvim/mapping_defs.h"
 #include "nvim/mark_defs.h"
 #include "nvim/marktree.h"
-#include "nvim/option_defs.h"
+#include "nvim/option_vars.h"
 #include "nvim/pos.h"
 #include "nvim/statusline_defs.h"
 #include "nvim/undo_defs.h"
diff --git a/src/nvim/bufwrite.c b/src/nvim/bufwrite.c
index 770c269b0e..40b95e5790 100644
--- a/src/nvim/bufwrite.c
+++ b/src/nvim/bufwrite.c
@@ -37,6 +37,7 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/option.h"
+#include "nvim/option_vars.h"
 #include "nvim/os/fs_defs.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
diff --git a/src/nvim/change.c b/src/nvim/change.c
index 084a8a1897..48dc02b65b 100644
--- a/src/nvim/change.c
+++ b/src/nvim/change.c
@@ -39,6 +39,7 @@
 #include "nvim/message.h"
 #include "nvim/move.h"
 #include "nvim/option.h"
+#include "nvim/option_vars.h"
 #include "nvim/os/time.h"
 #include "nvim/plines.h"
 #include "nvim/pos.h"
diff --git a/src/nvim/charset.h b/src/nvim/charset.h
index d633136073..d615012cd5 100644
--- a/src/nvim/charset.h
+++ b/src/nvim/charset.h
@@ -7,6 +7,7 @@
 #include "nvim/buffer_defs.h"
 #include "nvim/eval/typval_defs.h"
 #include "nvim/option_defs.h"
+#include "nvim/option_vars.h"
 #include "nvim/pos.h"
 #include "nvim/strings.h"
 
diff --git a/src/nvim/cmdexpand.c b/src/nvim/cmdexpand.c
index 19182b2d5c..d733ffe6ab 100644
--- a/src/nvim/cmdexpand.c
+++ b/src/nvim/cmdexpand.c
@@ -48,6 +48,7 @@
 #include "nvim/menu.h"
 #include "nvim/message.h"
 #include "nvim/option.h"
+#include "nvim/option_vars.h"
 #include "nvim/os/lang.h"
 #include "nvim/os/os.h"
 #include "nvim/path.h"
diff --git a/src/nvim/cmdhist.c b/src/nvim/cmdhist.c
index 72379fd86d..50bdfd892f 100644
--- a/src/nvim/cmdhist.c
+++ b/src/nvim/cmdhist.c
@@ -22,7 +22,7 @@
 #include "nvim/macros.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/option_defs.h"
+#include "nvim/option_vars.h"
 #include "nvim/pos.h"
 #include "nvim/regexp.h"
 #include "nvim/strings.h"
diff --git a/src/nvim/cursor.c b/src/nvim/cursor.c
index be8fd03d57..ca309757f9 100644
--- a/src/nvim/cursor.c
+++ b/src/nvim/cursor.c
@@ -21,6 +21,7 @@
 #include "nvim/memory.h"
 #include "nvim/move.h"
 #include "nvim/option.h"
+#include "nvim/option_vars.h"
 #include "nvim/plines.h"
 #include "nvim/pos.h"
 #include "nvim/state.h"
diff --git a/src/nvim/cursor_shape.c b/src/nvim/cursor_shape.c
index 4e5886406a..fb2ca9ff8c 100644
--- a/src/nvim/cursor_shape.c
+++ b/src/nvim/cursor_shape.c
@@ -17,7 +17,7 @@
 #include "nvim/log.h"
 #include "nvim/macros.h"
 #include "nvim/memory.h"
-#include "nvim/option_defs.h"
+#include "nvim/option_vars.h"
 #include "nvim/strings.h"
 #include "nvim/ui.h"
 #include "nvim/vim.h"
diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index 9a47a78035..3ab1da76f4 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -47,6 +47,7 @@
 #include "nvim/move.h"
 #include "nvim/normal.h"
 #include "nvim/option.h"
+#include "nvim/option_vars.h"
 #include "nvim/optionstr.h"
 #include "nvim/os/fs_defs.h"
 #include "nvim/os/os.h"
diff --git a/src/nvim/digraph.c b/src/nvim/digraph.c
index 49fc916f23..1bcb21508b 100644
--- a/src/nvim/digraph.c
+++ b/src/nvim/digraph.c
@@ -31,7 +31,7 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/normal.h"
-#include "nvim/option_defs.h"
+#include "nvim/option_vars.h"
 #include "nvim/os/input.h"
 #include "nvim/runtime.h"
 #include "nvim/strings.h"
diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c
index 2c2874fbb7..eef427a7b8 100644
--- a/src/nvim/drawline.c
+++ b/src/nvim/drawline.c
@@ -38,6 +38,7 @@
 #include "nvim/memory.h"
 #include "nvim/move.h"
 #include "nvim/option.h"
+#include "nvim/option_vars.h"
 #include "nvim/plines.h"
 #include "nvim/pos.h"
 #include "nvim/quickfix.h"
diff --git a/src/nvim/drawscreen.c b/src/nvim/drawscreen.c
index a6614ffde5..cc22accf2b 100644
--- a/src/nvim/drawscreen.c
+++ b/src/nvim/drawscreen.c
@@ -94,6 +94,7 @@
 #include "nvim/move.h"
 #include "nvim/normal.h"
 #include "nvim/option.h"
+#include "nvim/option_vars.h"
 #include "nvim/os/os_defs.h"
 #include "nvim/plines.h"
 #include "nvim/popupmenu.h"
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 42cc7401e6..7f29e615ab 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -48,6 +48,7 @@
 #include "nvim/normal.h"
 #include "nvim/ops.h"
 #include "nvim/option.h"
+#include "nvim/option_vars.h"
 #include "nvim/os/input.h"
 #include "nvim/plines.h"
 #include "nvim/popupmenu.h"
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 5d0600c6c1..0bf26b2451 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -60,6 +60,7 @@
 #include "nvim/msgpack_rpc/channel_defs.h"
 #include "nvim/ops.h"
 #include "nvim/option.h"
+#include "nvim/option_vars.h"
 #include "nvim/optionstr.h"
 #include "nvim/os/fileio.h"
 #include "nvim/os/fs_defs.h"
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index 61f3793f4d..710d9c73a5 100644
--- a/src/nvim/eval/funcs.c
+++ b/