summaryrefslogtreecommitdiff
path: root/src/proto
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-12-17 14:36:14 +0100
committerBram Moolenaar <Bram@vim.org>2014-12-17 14:36:14 +0100
commitcaad4f0a0b428f3dc4e9e395ad0b1cddb38d3bcd (patch)
treee3e4c705d4d74258f06d4d3e93b75b48ab4a7da6 /src/proto
parente3faf44bef029d07f37a457bd0050653b628058f (diff)
downloadvim-git-caad4f0a0b428f3dc4e9e395ad0b1cddb38d3bcd.tar.gz
updated for version 7.4.553v7.4.553
Problem: Various small issues. Solution: Fix those issues.
Diffstat (limited to 'src/proto')
-rw-r--r--src/proto/eval.pro2
-rw-r--r--src/proto/misc1.pro2
-rw-r--r--src/proto/ops.pro2
-rw-r--r--src/proto/os_vms.pro3
-rw-r--r--src/proto/screen.pro2
5 files changed, 6 insertions, 5 deletions
diff --git a/src/proto/eval.pro b/src/proto/eval.pro
index 517d9e71a..b264365fe 100644
--- a/src/proto/eval.pro
+++ b/src/proto/eval.pro
@@ -59,8 +59,8 @@ int list_append_tv __ARGS((list_T *l, typval_T *tv));
int list_append_dict __ARGS((list_T *list, dict_T *dict));
int list_append_string __ARGS((list_T *l, char_u *str, int len));
int list_insert_tv __ARGS((list_T *l, typval_T *tv, listitem_T *item));
-void vimlist_remove __ARGS((list_T *l, listitem_T *item, listitem_T *item2));
void list_insert __ARGS((list_T *l, listitem_T *ni, listitem_T *item));
+void vimlist_remove __ARGS((list_T *l, listitem_T *item, listitem_T *item2));
int garbage_collect __ARGS((void));
void set_ref_in_ht __ARGS((hashtab_T *ht, int copyID));
void set_ref_in_list __ARGS((list_T *l, int copyID));
diff --git a/src/proto/misc1.pro b/src/proto/misc1.pro
index 274c7af46..5df81c928 100644
--- a/src/proto/misc1.pro
+++ b/src/proto/misc1.pro
@@ -5,7 +5,7 @@ int get_indent_buf __ARGS((buf_T *buf, linenr_T lnum));
int get_indent_str __ARGS((char_u *ptr, int ts, int list));
int set_indent __ARGS((int size, int flags));
int get_number_indent __ARGS((linenr_T lnum));
-int get_breakindent_win __ARGS((win_T *wp, char_u *ptr));
+int get_breakindent_win __ARGS((win_T *wp, char_u *line));
int open_line __ARGS((int dir, int flags, int second_line_indent));
int get_leader_len __ARGS((char_u *line, char_u **flags, int backward, int include_space));
int get_last_leader_offset __ARGS((char_u *line, char_u **flags));
diff --git a/src/proto/ops.pro b/src/proto/ops.pro
index fe40151cd..c1a1b455e 100644
--- a/src/proto/ops.pro
+++ b/src/proto/ops.pro
@@ -55,8 +55,8 @@ void dnd_yank_drag_data __ARGS((char_u *str, long len));
char_u get_reg_type __ARGS((int regname, long *reglen));
char_u *get_reg_contents __ARGS((int regname, int flags));
void write_reg_contents __ARGS((int name, char_u *str, int maxlen, int must_append));
-void write_reg_contents_ex __ARGS((int name, char_u *str, int maxlen, int must_append, int yank_type, long block_len));
void write_reg_contents_lst __ARGS((int name, char_u **strings, int maxlen, int must_append, int yank_type, long block_len));
+void write_reg_contents_ex __ARGS((int name, char_u *str, int maxlen, int must_append, int yank_type, long block_len));
void clear_oparg __ARGS((oparg_T *oap));
void cursor_pos_info __ARGS((void));
/* vim: set ft=c : */
diff --git a/src/proto/os_vms.pro b/src/proto/os_vms.pro
index 6408455e4..cc0f1d913 100644
--- a/src/proto/os_vms.pro
+++ b/src/proto/os_vms.pro
@@ -5,11 +5,12 @@ void mch_set_shellsize __ARGS((void));
char_u *mch_getenv __ARGS((char_u *lognam));
int mch_setenv __ARGS((char *var, char *value, int x));
int vms_sys __ARGS((char *cmd, char *out, char *inp));
+char *vms_tolower __ARGS((char *name));
int vms_sys_status __ARGS((int status));
int vms_read __ARGS((char *inbuf, size_t nbytes));
-char *vms_tolower __ARGS((char *name));
int mch_expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags));
int mch_expandpath __ARGS((garray_T *gap, char_u *path, int flags));
void *vms_fixfilename __ARGS((void *instring));
void vms_remove_version __ARGS((void *fname));
+int RealWaitForChar __ARGS((int fd, long msec, int *check_for_gpm));
/* vim: set ft=c : */
diff --git a/src/proto/screen.pro b/src/proto/screen.pro
index 31f97d544..a4df6269f 100644
--- a/src/proto/screen.pro
+++ b/src/proto/screen.pro
@@ -26,7 +26,7 @@ int get_keymap_str __ARGS((win_T *wp, char_u *buf, int len));
void screen_putchar __ARGS((int c, int row, int col, int attr));
void screen_getbytes __ARGS((int row, int col, char_u *bytes, int *attrp));
void screen_puts __ARGS((char_u *text, int row, int col, int attr));
-void screen_puts_len __ARGS((char_u *text, int len, int row, int col, int attr));
+void screen_puts_len __ARGS((char_u *text, int textlen, int row, int col, int attr));
void screen_stop_highlight __ARGS((void));
void reset_cterm_colors __ARGS((void));
void screen_draw_rectangle __ARGS((int row, int col, int height, int width, int invert));