summaryrefslogtreecommitdiffstats
path: root/src/proto
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-06-26 06:24:45 +0200
committerBram Moolenaar <Bram@vim.org>2010-06-26 06:24:45 +0200
commit644044794ea55fdee8599ee1e861234216c20402 (patch)
tree9dfe2fa4bae0f9914f0d12f7a502aaffc1795c43 /src/proto
parent0eda7ac7f897433c9d346743bf38fcd291673070 (diff)
Various small fixes from Dominique Pelle.
Diffstat (limited to 'src/proto')
-rw-r--r--src/proto/mbyte.pro12
-rw-r--r--src/proto/netbeans.pro3
2 files changed, 6 insertions, 9 deletions
diff --git a/src/proto/mbyte.pro b/src/proto/mbyte.pro
index ac350e1dd7..e805cb442e 100644
--- a/src/proto/mbyte.pro
+++ b/src/proto/mbyte.pro
@@ -69,23 +69,21 @@ int encname2codepage __ARGS((char_u *name));
void *my_iconv_open __ARGS((char_u *to, char_u *from));
int iconv_enabled __ARGS((int verbose));
void iconv_end __ARGS((void));
-int im_xim_isvalid_imactivate __ARGS((void));
void im_set_active __ARGS((int active));
void xim_set_focus __ARGS((int focus));
void im_set_position __ARGS((int row, int col));
void xim_set_preedit __ARGS((void));
-void xim_set_status_area __ARGS((void));
-void xim_init __ARGS((void));
-void xim_decide_input_style __ARGS((void));
int im_get_feedback_attr __ARGS((int col));
-void xim_reset __ARGS((void));
-int xim_queue_key_press_event __ARGS((GdkEventKey *event, int down));
void xim_init __ARGS((void));
void im_shutdown __ARGS((void));
-int xim_get_status_area_height __ARGS((void));
+int im_xim_isvalid_imactivate __ARGS((void));
+void xim_reset __ARGS((void));
+int xim_queue_key_press_event __ARGS((GdkEventKey *event, int down));
int im_get_status __ARGS((void));
int preedit_get_status __ARGS((void));
int im_is_preediting __ARGS((void));
+void xim_set_status_area __ARGS((void));
+int xim_get_status_area_height __ARGS((void));
int convert_setup __ARGS((vimconv_T *vcp, char_u *from, char_u *to));
int convert_setup_ext __ARGS((vimconv_T *vcp, char_u *from, int from_unicode_is_utf8, char_u *to, int to_unicode_is_utf8));
int convert_input __ARGS((char_u *ptr, int len, int maxlen));
diff --git a/src/proto/netbeans.pro b/src/proto/netbeans.pro
index 17a60bccb4..a6e5f5f5f8 100644
--- a/src/proto/netbeans.pro
+++ b/src/proto/netbeans.pro
@@ -11,7 +11,7 @@ void netbeans_beval_cb __ARGS((BalloonEval *beval, int state));
int netbeans_active __ARGS((void));
int netbeans_filedesc __ARGS((void));
void netbeans_gui_register __ARGS((void));
-void netbeans_open __ARGS((char *params, int abort));
+void netbeans_open __ARGS((char *params, int doabort));
void netbeans_send_disconnect __ARGS((void));
void netbeans_frame_moved __ARGS((int new_x, int new_y));
void netbeans_file_activated __ARGS((buf_T *bufp));
@@ -26,6 +26,5 @@ void netbeans_save_buffer __ARGS((buf_T *bufp));
void netbeans_deleted_all_lines __ARGS((buf_T *bufp));
int netbeans_is_guarded __ARGS((linenr_T top, linenr_T bot));
void netbeans_draw_multisign_indicator __ARGS((int row));
-void netbeans_draw_multisign_indicator __ARGS((int row));
void netbeans_gutter_click __ARGS((linenr_T lnum));
/* vim: set ft=c : */