diff options
Diffstat (limited to '')
| -rw-r--r-- | src/proto/charset.pro | 1 | ||||
| -rw-r--r-- | src/proto/eval.pro | 6 | ||||
| -rw-r--r-- | src/proto/evalvars.pro | 1 | ||||
| -rw-r--r-- | src/proto/mbyte.pro | 1 | ||||
| -rw-r--r-- | src/proto/misc2.pro | 4 | ||||
| -rw-r--r-- | src/proto/move.pro | 5 | ||||
| -rw-r--r-- | src/proto/normal.pro | 3 | ||||
| -rw-r--r-- | src/proto/scriptfile.pro | 1 | ||||
| -rw-r--r-- | src/proto/vim9class.pro | 1 | ||||
| -rw-r--r-- | src/proto/vim9instr.pro | 2 | ||||
| -rw-r--r-- | src/proto/window.pro | 1 |
11 files changed, 19 insertions, 7 deletions
diff --git a/src/proto/charset.pro b/src/proto/charset.pro index c915c58..a747319 100644 --- a/src/proto/charset.pro +++ b/src/proto/charset.pro @@ -20,6 +20,7 @@ int linetabsize_str(char_u *s); int linetabsize_col(int startcol, char_u *s); int win_linetabsize(win_T *wp, linenr_T lnum, char_u *line, colnr_T len); int linetabsize(win_T *wp, linenr_T lnum); +int linetabsize_no_outer(win_T *wp, linenr_T lnum); void win_linetabsize_cts(chartabsize_T *cts, colnr_T len); int vim_isIDc(int c); int vim_isNormalIDc(int c); diff --git a/src/proto/eval.pro b/src/proto/eval.pro index 47fd83d..1c2d05d 100644 --- a/src/proto/eval.pro +++ b/src/proto/eval.pro @@ -14,9 +14,9 @@ void init_evalarg(evalarg_T *evalarg); void clear_evalarg(evalarg_T *evalarg, exarg_T *eap); int skip_expr(char_u **pp, evalarg_T *evalarg); int skip_expr_concatenate(char_u **arg, char_u **start, char_u **end, evalarg_T *evalarg); -char_u *typval2string(typval_T *tv, int convert); -char_u *eval_to_string_eap(char_u *arg, int convert, exarg_T *eap, int use_simple_function); -char_u *eval_to_string(char_u *arg, int convert, int use_simple_function); +char_u *typval2string(typval_T *tv, int join_list); +char_u *eval_to_string_eap(char_u *arg, int join_list, exarg_T *eap, int use_simple_function); +char_u *eval_to_string(char_u *arg, int join_list, int use_simple_function); char_u *eval_to_string_safe(char_u *arg, int use_sandbox, int keep_script_version, int use_simple_function); varnumber_T eval_to_number(char_u *expr, int use_simple_function); typval_T *eval_expr(char_u *arg, exarg_T *eap); diff --git a/src/proto/evalvars.pro b/src/proto/evalvars.pro index ea14fe5..a0e0100 100644 --- a/src/proto/evalvars.pro +++ b/src/proto/evalvars.pro @@ -63,6 +63,7 @@ int eval_variable(char_u *name, int len, scid_T sid, typval_T *rettv, dictitem_T int eval_variable_import(char_u *name, typval_T *rettv); void check_vars(char_u *name, int len); dictitem_T *find_var(char_u *name, hashtab_T **htp, int no_autoload); +dictitem_T *find_var_autoload_prefix(char_u *name, int sid, hashtab_T **htp, char_u **namep); dictitem_T *find_var_also_in_script(char_u *name, hashtab_T **htp, int no_autoload); dictitem_T *find_var_in_ht(hashtab_T *ht, int htname, char_u *varname, int no_autoload); hashtab_T *get_script_local_ht(void); diff --git a/src/proto/mbyte.pro b/src/proto/mbyte.pro index 7883b3b..c57c94c 100644 --- a/src/proto/mbyte.pro +++ b/src/proto/mbyte.pro @@ -85,6 +85,7 @@ int convert_input(char_u *ptr, int len, int maxlen); int convert_input_safe(char_u *ptr, int len, int maxlen, char_u **restp, int *restlenp); char_u *string_convert(vimconv_T *vcp, char_u *ptr, int *lenp); char_u *string_convert_ext(vimconv_T *vcp, char_u *ptr, int *lenp, int *unconvlenp); +int get_cellwidth(int c); void f_setcellwidths(typval_T *argvars, typval_T *rettv); void f_getcellwidths(typval_T *argvars, typval_T *rettv); void f_charclass(typval_T *argvars, typval_T *rettv); diff --git a/src/proto/misc2.pro b/src/proto/misc2.pro index f596ffa..7a5b367 100644 --- a/src/proto/misc2.pro +++ b/src/proto/misc2.pro @@ -61,4 +61,8 @@ int mch_parse_cmd(char_u *cmd, int use_shcf, char ***argv, int *argc); int build_argv_from_string(char_u *cmd, char ***argv, int *argc); int build_argv_from_list(list_T *l, char ***argv, int *argc); int get_special_pty_type(void); +int cmp_keyvalue_value(const void *a, const void *b); +int cmp_keyvalue_value_n(const void *a, const void *b); +int cmp_keyvalue_value_i(const void *a, const void *b); +int cmp_keyvalue_value_ni(const void *a, const void *b); /* vim: set ft=c : */ diff --git a/src/proto/move.pro b/src/proto/move.pro index bc9c025..1302c29 100644 --- a/src/proto/move.pro +++ b/src/proto/move.pro @@ -9,6 +9,7 @@ void check_cursor_moved(win_T *wp); void changed_window_setting(void); void changed_window_setting_win(win_T *wp); void changed_window_setting_buf(buf_T *buf); +void changed_window_setting_all(void); void set_topline(win_T *wp, linenr_T lnum); void changed_cline_bef_curs(void); void changed_cline_bef_curs_win(win_T *wp); @@ -37,6 +38,7 @@ void f_screenpos(typval_T *argvars, typval_T *rettv); void f_virtcol2col(typval_T *argvars, typval_T *rettv); void scrolldown(long line_count, int byfold); void scrollup(long line_count, int byfold); +void scroll_redraw(int up, long count); void adjust_skipcol(void); void check_topfill(win_T *wp, int down); void scrolldown_clamp(void); @@ -46,7 +48,6 @@ void set_empty_rows(win_T *wp, int used); void scroll_cursor_bot(int min_scroll, int set_topbot); void scroll_cursor_halfway(int atend, int prefer_above); void cursor_correct(void); -int onepage(int dir, long count); -void halfpage(int flag, linenr_T Prenum); +int pagescroll(int dir, long count, int half); void do_check_cursorbind(void); /* vim: set ft=c : */ diff --git a/src/proto/normal.pro b/src/proto/normal.pro index eff08df..6dcbe41 100644 --- a/src/proto/normal.pro +++ b/src/proto/normal.pro @@ -22,8 +22,9 @@ void pop_showcmd(void); void do_check_scrollbind(int check); void check_scrollbind(linenr_T topline_diff, long leftcol_diff); int find_decl(char_u *ptr, int len, int locally, int thisblock, int flags_arg); +void nv_g_home_m_cmd(cmdarg_T *cap); +int nv_screengo(oparg_T *oap, int dir, long dist); void nv_scroll_line(cmdarg_T *cap); -void scroll_redraw(int up, long count); void handle_tabmenu(void); void do_nv_ident(int c1, int c2); int get_visual_text(cmdarg_T *cap, char_u **pp, int *lenp); diff --git a/src/proto/scriptfile.pro b/src/proto/scriptfile.pro index dbcc849..c8ff04a 100644 --- a/src/proto/scriptfile.pro +++ b/src/proto/scriptfile.pro @@ -9,6 +9,7 @@ void ex_runtime(exarg_T *eap); void set_context_in_runtime_cmd(expand_T *xp, char_u *arg); int find_script_by_name(char_u *name); int get_new_scriptitem_for_fname(int *error, char_u *fname); +void check_script_symlink(int sid); int do_in_path(char_u *path, char *prefix, char_u *name, int flags, void (*callback)(char_u *fname, void *ck), void *cookie); int do_in_runtimepath(char_u *name, int flags, void (*callback)(char_u *fname, void *ck), void *cookie); int source_runtime(char_u *name, int flags); diff --git a/src/proto/vim9class.pro b/src/proto/vim9class.pro index 1ed175e..d3d3b99 100644 --- a/src/proto/vim9class.pro +++ b/src/proto/vim9class.pro @@ -3,6 +3,7 @@ int object_index_from_itf_index(class_T *itf, int is_method, int idx, class_T *c int is_valid_builtin_obj_methodname(char_u *funcname); ufunc_T *class_get_builtin_method(class_T *cl, class_builtin_T builtin_method, int *method_idx); void ex_class(exarg_T *eap); +void enum_set_internal_obj_vars(class_T *en, object_T *enval); type_T *oc_member_type(class_T *cl, int is_object, char_u *name, char_u *name_end, int *member_idx); type_T *oc_member_type_by_idx(class_T *cl, int is_object, int member_idx); void ex_enum(exarg_T *eap); diff --git a/src/proto/vim9instr.pro b/src/proto/vim9instr.pro index 0fb449d..1b2f79c 100644 --- a/src/proto/vim9instr.pro +++ b/src/proto/vim9instr.pro @@ -7,7 +7,7 @@ int generate_CONSTRUCT(cctx_T *cctx, class_T *cl); int generate_GET_OBJ_MEMBER(cctx_T *cctx, int idx, type_T *type); int generate_GET_ITF_MEMBER(cctx_T *cctx, class_T *itf, int idx, type_T *type); int generate_STORE_THIS(cctx_T *cctx, int idx); -int may_generate_2STRING(int offset, int tolerant, cctx_T *cctx); +int may_generate_2STRING(int offset, int tostring_flags, cctx_T *cctx); int generate_add_instr(cctx_T *cctx, vartype_T vartype, type_T *type1, type_T *type2, exprtype_T expr_type); vartype_T operator_type(type_T *type1, type_T *type2); int generate_two_op(cctx_T *cctx, char_u *op); diff --git a/src/proto/window.pro b/src/proto/window.pro index 9e66db5..26c7040 100644 --- a/src/proto/window.pro +++ b/src/proto/window.pro @@ -57,6 +57,7 @@ tabpage_T *win_find_tabpage(win_T *win); win_T *win_vert_neighbor(tabpage_T *tp, win_T *wp, int up, long count); win_T *win_horz_neighbor(tabpage_T *tp, win_T *wp, int left, long count); void win_enter(win_T *wp, int undo_sync); +void win_fix_current_dir(void); win_T *buf_jump_open_win(buf_T *buf); win_T *buf_jump_open_tab(buf_T *buf); int win_unlisted(win_T *wp); |