Skip to content

Commit 96e9041

Browse files
janlazobrammool
janlazo
and
brammool
authored
vim-patch:partial:8.1.1939: code for handling v: variables in generic eval file (#35968)
Problem: Code for handling v: variables in generic eval file. Solution: Move v: variables to evalvars.c. (Yegappan Lakshmanan, closes vim/vim#4872) vim/vim@e5cdf15 Remove direct reference to "vimvars" for following functions: - assert_error() - get_vim_var_nr() - get_vim_var_list() - get_vim_var_dict() - get_vim_var_str() - set_cmdarg() - set_reg_var() - set_vcount() - set_vexception() - set_vthrowpoint() - set_vim_var_bool() - set_vim_var_dict() - set_vim_var_list() - set_vim_var_nr() - set_vim_var_special() - set_vim_var_string() - set_vim_var_type() Reorder functions based on v8.2.4930 for eval_one_expr_in_str() and eval_all_expr_in_str(). Co-authored-by: Bram Moolenaar <[email protected]>
1 parent 04022c7 commit 96e9041

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+647
-607
lines changed

‎src/nvim/api/events.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "nvim/autocmd_defs.h"
1919
#include "nvim/channel.h"
2020
#include "nvim/channel_defs.h"
21-
#include "nvim/eval.h"
21+
#include "nvim/eval/vars.h"
2222
#include "nvim/globals.h"
2323
#include "nvim/main.h"
2424
#include "nvim/map_defs.h"

‎src/nvim/api/ui.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#include "nvim/autocmd_defs.h"
1818
#include "nvim/channel.h"
1919
#include "nvim/channel_defs.h"
20-
#include "nvim/eval.h"
2120
#include "nvim/eval/typval.h"
21+
#include "nvim/eval/vars.h"
2222
#include "nvim/event/defs.h"
2323
#include "nvim/event/loop.h"
2424
#include "nvim/event/multiqueue.h"

‎src/nvim/api/vim.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
#include "nvim/drawline.h"
3232
#include "nvim/drawscreen.h"
3333
#include "nvim/errors.h"
34-
#include "nvim/eval.h"
3534
#include "nvim/eval/typval.h"
3635
#include "nvim/eval/typval_defs.h"
36+
#include "nvim/eval/vars.h"
3737
#include "nvim/ex_docmd.h"
3838
#include "nvim/ex_eval.h"
3939
#include "nvim/fold.h"

‎src/nvim/buffer.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
#include "nvim/digraph.h"
4545
#include "nvim/drawscreen.h"
4646
#include "nvim/errors.h"
47-
#include "nvim/eval.h"
4847
#include "nvim/eval/typval.h"
4948
#include "nvim/eval/vars.h"
5049
#include "nvim/ex_cmds.h"

‎src/nvim/change.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "nvim/diff.h"
1919
#include "nvim/drawscreen.h"
2020
#include "nvim/edit.h"
21-
#include "nvim/eval.h"
21+
#include "nvim/eval/vars.h"
2222
#include "nvim/ex_cmds_defs.h"
2323
#include "nvim/extmark.h"
2424
#include "nvim/extmark_defs.h"

‎src/nvim/drawline.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "nvim/diff.h"
2222
#include "nvim/drawline.h"
2323
#include "nvim/drawscreen.h"
24-
#include "nvim/eval.h"
24+
#include "nvim/eval/vars.h"
2525
#include "nvim/fold.h"
2626
#include "nvim/fold_defs.h"
2727
#include "nvim/globals.h"

‎src/nvim/drawscreen.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
#include "nvim/digraph.h"
7676
#include "nvim/drawline.h"
7777
#include "nvim/drawscreen.h"
78-
#include "nvim/eval.h"
78+
#include "nvim/eval/vars.h"
7979
#include "nvim/ex_getln.h"
8080
#include "nvim/fold.h"
8181
#include "nvim/fold_defs.h"

‎src/nvim/edit.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "nvim/errors.h"
2626
#include "nvim/eval.h"
2727
#include "nvim/eval/typval_defs.h"
28+
#include "nvim/eval/vars.h"
2829
#include "nvim/ex_cmds_defs.h"
2930
#include "nvim/ex_docmd.h"
3031
#include "nvim/extmark.h"

0 commit comments

Comments
 (0)