patch 8.1.1531: clipboard type name is inconsistent
Problem: Clipboard type name is inconsistent.
Solution: Rename VimClipboard to Clipboard_T.
diff --git a/src/proto/gui_gtk_x11.pro b/src/proto/gui_gtk_x11.pro
index 111cac7..708e68d 100644
--- a/src/proto/gui_gtk_x11.pro
+++ b/src/proto/gui_gtk_x11.pro
@@ -59,11 +59,11 @@
void gui_mch_clear_all(void);
void gui_mch_delete_lines(int row, int num_lines);
void gui_mch_insert_lines(int row, int num_lines);
-void clip_mch_request_selection(VimClipboard *cbd);
-void clip_mch_lose_selection(VimClipboard *cbd);
-int clip_mch_own_selection(VimClipboard *cbd);
-void clip_mch_set_selection(VimClipboard *cbd);
-int clip_gtk_owner_exists(VimClipboard *cbd);
+void clip_mch_request_selection(Clipboard_T *cbd);
+void clip_mch_lose_selection(Clipboard_T *cbd);
+int clip_mch_own_selection(Clipboard_T *cbd);
+void clip_mch_set_selection(Clipboard_T *cbd);
+int clip_gtk_owner_exists(Clipboard_T *cbd);
void gui_mch_menu_grey(vimmenu_T *menu, int grey);
void gui_mch_menu_hidden(vimmenu_T *menu, int hidden);
void gui_mch_draw_menubar(void);
diff --git a/src/proto/gui_mac.pro b/src/proto/gui_mac.pro
index 011ef28..a36ad90 100644
--- a/src/proto/gui_mac.pro
+++ b/src/proto/gui_mac.pro
@@ -111,10 +111,10 @@
void mch_errmsg(char *str);
void mch_display_error(void);
-void clip_mch_lose_selection(VimClipboard *cbd);
-void clip_mch_request_selection(VimClipboard *cbd);
-void clip_mch_set_selection(VimClipboard *cbd);
-int clip_mch_own_selection(VimClipboard *cbd);
+void clip_mch_lose_selection(Clipboard_T *cbd);
+void clip_mch_request_selection(Clipboard_T *cbd);
+void clip_mch_set_selection(Clipboard_T *cbd);
+int clip_mch_own_selection(Clipboard_T *cbd);
pascal OSErr FindProcessBySignature( const OSType targetType,
const OSType targetCreator, ProcessSerialNumberPtr psnPtr );
diff --git a/src/proto/gui_x11.pro b/src/proto/gui_x11.pro
index 955f374..5dde37d 100644
--- a/src/proto/gui_x11.pro
+++ b/src/proto/gui_x11.pro
@@ -46,10 +46,10 @@
void gui_mch_clear_all(void);
void gui_mch_delete_lines(int row, int num_lines);
void gui_mch_insert_lines(int row, int num_lines);
-void clip_mch_lose_selection(VimClipboard *cbd);
-int clip_mch_own_selection(VimClipboard *cbd);
-void clip_mch_request_selection(VimClipboard *cbd);
-void clip_mch_set_selection(VimClipboard *cbd);
+void clip_mch_lose_selection(Clipboard_T *cbd);
+int clip_mch_own_selection(Clipboard_T *cbd);
+void clip_mch_request_selection(Clipboard_T *cbd);
+void clip_mch_set_selection(Clipboard_T *cbd);
void gui_mch_menu_grey(vimmenu_T *menu, int grey);
void gui_mch_menu_hidden(vimmenu_T *menu, int hidden);
void gui_mch_draw_menubar(void);
diff --git a/src/proto/ops.pro b/src/proto/ops.pro
index 01df56f..0ff27a2 100644
--- a/src/proto/ops.pro
+++ b/src/proto/ops.pro
@@ -53,10 +53,10 @@
void handle_viminfo_register(garray_T *values, int force);
void write_viminfo_registers(FILE *fp);
void x11_export_final_selection(void);
-void clip_free_selection(VimClipboard *cbd);
-void clip_get_selection(VimClipboard *cbd);
-void clip_yank_selection(int type, char_u *str, long len, VimClipboard *cbd);
-int clip_convert_selection(char_u **str, long_u *len, VimClipboard *cbd);
+void clip_free_selection(Clipboard_T *cbd);
+void clip_get_selection(Clipboard_T *cbd);
+void clip_yank_selection(int type, char_u *str, long len, Clipboard_T *cbd);
+int clip_convert_selection(char_u **str, long_u *len, Clipboard_T *cbd);
void dnd_yank_drag_data(char_u *str, long len);
char_u get_reg_type(int regname, long *reglen);
char_u *get_reg_contents(int regname, int flags);
diff --git a/src/proto/os_qnx.pro b/src/proto/os_qnx.pro
index 89a250f..a3fab62 100644
--- a/src/proto/os_qnx.pro
+++ b/src/proto/os_qnx.pro
@@ -1,8 +1,8 @@
/* os_qnx.c */
void qnx_init(void);
void qnx_clip_init (void);
-int clip_mch_own_selection(VimClipboard *cbd);
-void clip_mch_lose_selection(VimClipboard *cbd);
-void clip_mch_request_selection(VimClipboard *cbd);
-void clip_mch_set_selection(VimClipboard *cbd);
+int clip_mch_own_selection(Clipboard_T *cbd);
+void clip_mch_lose_selection(Clipboard_T *cbd);
+void clip_mch_request_selection(Clipboard_T *cbd);
+void clip_mch_set_selection(Clipboard_T *cbd);
/* vim: set ft=c : */
diff --git a/src/proto/os_unix.pro b/src/proto/os_unix.pro
index 0e7c609..449b3e9 100644
--- a/src/proto/os_unix.pro
+++ b/src/proto/os_unix.pro
@@ -79,10 +79,10 @@
void start_xterm_trace(int button);
void stop_xterm_trace(void);
void clear_xterm_clip(void);
-int clip_xterm_own_selection(VimClipboard *cbd);
-void clip_xterm_lose_selection(VimClipboard *cbd);
-void clip_xterm_request_selection(VimClipboard *cbd);
-void clip_xterm_set_selection(VimClipboard *cbd);
+int clip_xterm_own_selection(Clipboard_T *cbd);
+void clip_xterm_lose_selection(Clipboard_T *cbd);
+void clip_xterm_request_selection(Clipboard_T *cbd);
+void clip_xterm_set_selection(Clipboard_T *cbd);
int xsmp_handle_requests(void);
void xsmp_init(void);
void xsmp_close(void);
diff --git a/src/proto/ui.pro b/src/proto/ui.pro
index e920029..7b28a32 100644
--- a/src/proto/ui.pro
+++ b/src/proto/ui.pro
@@ -15,9 +15,9 @@
void ui_breakcheck(void);
void ui_breakcheck_force(int force);
void clip_init(int can_use);
-void clip_update_selection(VimClipboard *clip);
-void clip_own_selection(VimClipboard *cbd);
-void clip_lose_selection(VimClipboard *cbd);
+void clip_update_selection(Clipboard_T *clip);
+void clip_own_selection(Clipboard_T *cbd);
+void clip_lose_selection(Clipboard_T *cbd);
void start_global_changes(void);
int is_clipboard_needs_update(void);
void end_global_changes(void);
@@ -28,15 +28,15 @@
void clip_start_selection(int col, int row, int repeated_click);
void clip_process_selection(int button, int col, int row, int_u repeated_click);
void clip_may_redraw_selection(int row, int col, int len);
-void clip_clear_selection(VimClipboard *cbd);
+void clip_clear_selection(Clipboard_T *cbd);
void clip_may_clear_selection(int row1, int row2);
void clip_scroll_selection(int rows);
void clip_copy_modeless_selection(int both);
-int clip_gen_own_selection(VimClipboard *cbd);
-void clip_gen_lose_selection(VimClipboard *cbd);
-void clip_gen_set_selection(VimClipboard *cbd);
-void clip_gen_request_selection(VimClipboard *cbd);
-int clip_gen_owner_exists(VimClipboard *cbd);
+int clip_gen_own_selection(Clipboard_T *cbd);
+void clip_gen_lose_selection(Clipboard_T *cbd);
+void clip_gen_set_selection(Clipboard_T *cbd);
+void clip_gen_request_selection(Clipboard_T *cbd);
+int clip_gen_owner_exists(Clipboard_T *cbd);
int vim_is_input_buf_full(void);
int vim_is_input_buf_empty(void);
int vim_free_in_input_buf(void);
@@ -57,12 +57,12 @@
void open_app_context(void);
void x11_setup_atoms(Display *dpy);
void x11_setup_selection(Widget w);
-void clip_x11_request_selection(Widget myShell, Display *dpy, VimClipboard *cbd);
-void clip_x11_lose_selection(Widget myShell, VimClipboard *cbd);
-int clip_x11_own_selection(Widget myShell, VimClipboard *cbd);
-void clip_x11_set_selection(VimClipboard *cbd);
-int clip_x11_owner_exists(VimClipboard *cbd);
-void yank_cut_buffer0(Display *dpy, VimClipboard *cbd);
+void clip_x11_request_selection(Widget myShell, Display *dpy, Clipboard_T *cbd);
+void clip_x11_lose_selection(Widget myShell, Clipboard_T *cbd);
+int clip_x11_own_selection(Widget myShell, Clipboard_T *cbd);
+void clip_x11_set_selection(Clipboard_T *cbd);
+int clip_x11_owner_exists(Clipboard_T *cbd);
+void yank_cut_buffer0(Display *dpy, Clipboard_T *cbd);
int jump_to_mouse(int flags, int *inclusive, int which_button);
int mouse_comp_pos(win_T *win, int *rowp, int *colp, linenr_T *lnump);
win_T *mouse_find_win(int *rowp, int *colp, mouse_find_T popup);
diff --git a/src/proto/winclip.pro b/src/proto/winclip.pro
index 990c1cf..c7cba71 100644
--- a/src/proto/winclip.pro
+++ b/src/proto/winclip.pro
@@ -4,10 +4,10 @@
void MultiByteToWideChar_alloc(UINT cp, DWORD flags, LPCSTR in, int inlen, LPWSTR *out, int *outlen);
void WideCharToMultiByte_alloc(UINT cp, DWORD flags, LPCWSTR in, int inlen, LPSTR *out, int *outlen, LPCSTR def, LPBOOL useddef);
void win_clip_init(void);
-int clip_mch_own_selection(VimClipboard *cbd);
-void clip_mch_lose_selection(VimClipboard *cbd);
-void clip_mch_request_selection(VimClipboard *cbd);
-void clip_mch_set_selection(VimClipboard *cbd);
+int clip_mch_own_selection(Clipboard_T *cbd);
+void clip_mch_lose_selection(Clipboard_T *cbd);
+void clip_mch_request_selection(Clipboard_T *cbd);
+void clip_mch_set_selection(Clipboard_T *cbd);
short_u *enc_to_utf16(char_u *str, int *lenp);
char_u *utf16_to_enc(short_u *str, int *lenp);
void acp_to_enc(char_u *str, int str_size, char_u **out, int *outlen);