diff options
| -rw-r--r-- | src/proto/digraph.pro | 2 | ||||
| -rw-r--r-- | src/proto/fold.pro | 2 | ||||
| -rw-r--r-- | src/proto/misc1.pro | 6 | ||||
| -rw-r--r-- | src/proto/move.pro | 2 | ||||
| -rw-r--r-- | src/proto/os_mswin.pro | 4 | ||||
| -rw-r--r-- | src/proto/os_win32.pro | 2 | ||||
| -rw-r--r-- | src/proto/screen.pro | 4 | ||||
| -rw-r--r-- | src/proto/search.pro | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
9 files changed, 14 insertions, 12 deletions
diff --git a/src/proto/digraph.pro b/src/proto/digraph.pro index be5be71ed..5573b8c36 100644 --- a/src/proto/digraph.pro +++ b/src/proto/digraph.pro @@ -1,7 +1,7 @@ /* digraph.c */ int do_digraph __ARGS((int c)); int get_digraph __ARGS((int cmdline)); -int getdigraph __ARGS((int char1, int char2, int meta)); +int getdigraph __ARGS((int char1, int char2, int meta_char)); void putdigraph __ARGS((char_u *str)); void listdigraphs __ARGS((void)); char_u *keymap_init __ARGS((void)); diff --git a/src/proto/fold.pro b/src/proto/fold.pro index 3318bbde7..10f72012a 100644 --- a/src/proto/fold.pro +++ b/src/proto/fold.pro @@ -27,7 +27,7 @@ void clearFolding __ARGS((win_T *win)); void foldUpdate __ARGS((win_T *wp, linenr_T top, linenr_T bot)); void foldUpdateAll __ARGS((win_T *win)); int foldMoveTo __ARGS((int updown, int dir, long count)); -void foldInitWin __ARGS((win_T *newwin)); +void foldInitWin __ARGS((win_T *new_win)); int find_wl_entry __ARGS((win_T *win, linenr_T lnum)); void foldAdjustVisual __ARGS((void)); void foldAdjustCursor __ARGS((void)); diff --git a/src/proto/misc1.pro b/src/proto/misc1.pro index e74cf9efd..d362e9cca 100644 --- a/src/proto/misc1.pro +++ b/src/proto/misc1.pro @@ -5,8 +5,8 @@ int get_indent_buf __ARGS((buf_T *buf, linenr_T lnum)); int get_indent_str __ARGS((char_u *ptr, int ts)); int set_indent __ARGS((int size, int flags)); int get_number_indent __ARGS((linenr_T lnum)); -int open_line __ARGS((int dir, int flags, int old_indent)); -int get_leader_len __ARGS((char_u *line, char_u **flags, int backward, int do_skip_space)); +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)); int plines __ARGS((linenr_T lnum)); int plines_win __ARGS((win_T *wp, linenr_T lnum, int winheight)); @@ -59,7 +59,7 @@ char_u *vim_getenv __ARGS((char_u *name, int *mustfree)); void vim_setenv __ARGS((char_u *name, char_u *val)); char_u *get_env_name __ARGS((expand_T *xp, int idx)); char_u *get_users __ARGS((expand_T *xp, int idx)); -int match_user __ARGS((char_u* name)); +int match_user __ARGS((char_u *name)); void home_replace __ARGS((buf_T *buf, char_u *src, char_u *dst, int dstlen, int one)); char_u *home_replace_save __ARGS((buf_T *buf, char_u *src)); int fullpathcmp __ARGS((char_u *s1, char_u *s2, int checkname)); diff --git a/src/proto/move.pro b/src/proto/move.pro index 5fe3844d7..595e3b8dd 100644 --- a/src/proto/move.pro +++ b/src/proto/move.pro @@ -24,7 +24,7 @@ int win_col_off __ARGS((win_T *wp)); int curwin_col_off __ARGS((void)); int win_col_off2 __ARGS((win_T *wp)); int curwin_col_off2 __ARGS((void)); -void curs_columns __ARGS((int scroll)); +void curs_columns __ARGS((int may_scroll)); void scrolldown __ARGS((long line_count, int byfold)); void scrollup __ARGS((long line_count, int byfold)); void check_topfill __ARGS((win_T *wp, int down)); diff --git a/src/proto/os_mswin.pro b/src/proto/os_mswin.pro index 2bf927d01..5aa0dbb0b 100644 --- a/src/proto/os_mswin.pro +++ b/src/proto/os_mswin.pro @@ -28,11 +28,11 @@ void MultiByteToWideChar_alloc __ARGS((UINT cp, DWORD flags, LPCSTR in, int inle void WideCharToMultiByte_alloc __ARGS((UINT cp, DWORD flags, LPCWSTR in, int inlen, LPSTR *out, int *outlen, LPCSTR def, LPBOOL useddef)); int clip_mch_own_selection __ARGS((VimClipboard *cbd)); void clip_mch_lose_selection __ARGS((VimClipboard *cbd)); +void clip_mch_request_selection __ARGS((VimClipboard *cbd)); +void clip_mch_set_selection __ARGS((VimClipboard *cbd)); short_u *enc_to_utf16 __ARGS((char_u *str, int *lenp)); char_u *utf16_to_enc __ARGS((short_u *str, int *lenp)); -void clip_mch_request_selection __ARGS((VimClipboard *cbd)); void acp_to_enc __ARGS((char_u *str, int str_size, char_u **out, int *outlen)); -void clip_mch_set_selection __ARGS((VimClipboard *cbd)); void DumpPutS __ARGS((const char *psz)); int mch_get_winpos __ARGS((int *x, int *y)); void mch_set_winpos __ARGS((int x, int y)); diff --git a/src/proto/os_win32.pro b/src/proto/os_win32.pro index 68d4ee2aa..2ae24521c 100644 --- a/src/proto/os_win32.pro +++ b/src/proto/os_win32.pro @@ -22,7 +22,7 @@ void mch_hide __ARGS((char_u *name)); int mch_isdir __ARGS((char_u *name)); int mch_mkdir __ARGS((char_u *name)); int mch_is_linked __ARGS((char_u *fname)); -int win32_fileinfo __ARGS((char_u *name, BY_HANDLE_FILE_INFORMATION *lpFileInfo)); +int win32_fileinfo __ARGS((char_u *fname, BY_HANDLE_FILE_INFORMATION *info)); int mch_writable __ARGS((char_u *name)); int mch_can_exe __ARGS((char_u *name)); int mch_nodetype __ARGS((char_u *name)); diff --git a/src/proto/screen.pro b/src/proto/screen.pro index be791e0c4..6809da9ff 100644 --- a/src/proto/screen.pro +++ b/src/proto/screen.pro @@ -31,8 +31,8 @@ void reset_cterm_colors __ARGS((void)); void screen_draw_rectangle __ARGS((int row, int col, int height, int width, int invert)); void screen_fill __ARGS((int start_row, int end_row, int start_col, int end_col, int c1, int c2, int attr)); void check_for_delay __ARGS((int check_msg_scroll)); -int screen_valid __ARGS((int clear)); -void screenalloc __ARGS((int clear)); +int screen_valid __ARGS((int doclear)); +void screenalloc __ARGS((int doclear)); void free_screenlines __ARGS((void)); void screenclear __ARGS((void)); int can_clear __ARGS((char_u *p)); diff --git a/src/proto/search.pro b/src/proto/search.pro index 9b1fc6396..f94fb69ab 100644 --- a/src/proto/search.pro +++ b/src/proto/search.pro @@ -27,12 +27,12 @@ int bck_word __ARGS((long count, int bigword, int stop)); int end_word __ARGS((long count, int bigword, int stop, int empty)); int bckend_word __ARGS((long count, int bigword, int eol)); int current_word __ARGS((oparg_T *oap, long count, int include, int bigword)); -int current_search __ARGS((long count, int forward)); int current_sent __ARGS((oparg_T *oap, long count, int include)); int current_block __ARGS((oparg_T *oap, long count, int include, int what, int other)); int current_tagblock __ARGS((oparg_T *oap, long count_arg, int include)); int current_par __ARGS((oparg_T *oap, long count, int include, int type)); int current_quote __ARGS((oparg_T *oap, long count, int include, int quotechar)); +int current_search __ARGS((long count, int forward)); int linewhite __ARGS((linenr_T lnum)); void find_pattern_in_path __ARGS((char_u *ptr, int dir, int len, int whole, int skip_comments, int type, long count, int action, linenr_T start_lnum, linenr_T end_lnum)); int read_viminfo_search_pattern __ARGS((vir_T *virp, int force)); diff --git a/src/version.c b/src/version.c index 232ddbc11..6b2919ad9 100644 --- a/src/version.c +++ b/src/version.c @@ -726,6 +726,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 720, +/**/ 719, /**/ 718, |