To: vim-dev@vim.org

Subject: Patch 7.2.181

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.2.181

Problem:    Some more compiler warnings when using gcc -Wextra.

Solution:   Add UNUSED and type casts.

Files:	    src/if_mzsch.c, src/gui.c, src/gui_gtk.c, src/gui_gtk_x11.c,

	    src/gui_gtk_f.c, src/gui_beval.c, src/netbeans.c

*** ../vim-7.2.180/src/if_mzsch.c	2007-07-06 19:43:08.000000000 +0200

--- src/if_mzsch.c	2009-05-16 22:24:18.000000000 +0200

***************

*** 667,679 ****

      static void CALLBACK

  timer_proc(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime)

  # elif defined(FEAT_GUI_GTK)

- /*ARGSUSED*/

      static gint

! timer_proc(gpointer data)

  # elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)

- /* ARGSUSED */

      static void

! timer_proc(XtPointer timed_out, XtIntervalId *interval_id)

  # elif defined(FEAT_GUI_MAC)

      pascal void

  timer_proc(EventLoopTimerRef theTimer, void *userData)

--- 667,677 ----

      static void CALLBACK

  timer_proc(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime)

  # elif defined(FEAT_GUI_GTK)

      static gint

! timer_proc(gpointer data UNUSED)

  # elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)

      static void

! timer_proc(XtPointer timed_out UNUSED, XtIntervalId *interval_id UNUSED)

  # elif defined(FEAT_GUI_MAC)

      pascal void

  timer_proc(EventLoopTimerRef theTimer, void *userData)

*** ../vim-7.2.180/src/gui.c	2008-12-03 18:50:09.000000000 +0100

--- src/gui.c	2009-05-17 15:52:18.000000000 +0200

***************

*** 678,688 ****

   * Return OK when able to set the font.  When it failed FAIL is returned and

   * the fonts are unchanged.

   */

- /*ARGSUSED*/

      int

  gui_init_font(font_list, fontset)

      char_u	*font_list;

!     int		fontset;

  {

  #define FONTLEN 320

      char_u	font_name[FONTLEN];

--- 678,687 ----

   * Return OK when able to set the font.  When it failed FAIL is returned and

   * the fonts are unchanged.

   */

      int

  gui_init_font(font_list, fontset)

      char_u	*font_list;

!     int		fontset UNUSED;

  {

  #define FONTLEN 320

      char_u	font_name[FONTLEN];

***************

*** 1138,1147 ****

   * Position the various GUI components (text area, menu).  The vertical

   * scrollbars are NOT handled here.  See gui_update_scrollbars().

   */

- /*ARGSUSED*/

      static void

  gui_position_components(total_width)

!     int	    total_width;

  {

      int	    text_area_x;

      int	    text_area_y;

--- 1137,1145 ----

   * Position the various GUI components (text area, menu).  The vertical

   * scrollbars are NOT handled here.  See gui_update_scrollbars().

   */

      static void

  gui_position_components(total_width)

!     int	    total_width UNUSED;

  {

      int	    text_area_x;

      int	    text_area_y;

***************

*** 1374,1383 ****

   * If "fit_to_display" is TRUE then the size may be reduced to fit the window

   * on the screen.

   */

- /*ARGSUSED*/

      void

  gui_set_shellsize(mustset, fit_to_display, direction)

!     int		mustset;		/* set by the user */

      int		fit_to_display;

      int		direction;		/* RESIZE_HOR, RESIZE_VER */

  {

--- 1372,1380 ----

   * If "fit_to_display" is TRUE then the size may be reduced to fit the window

   * on the screen.

   */

      void

  gui_set_shellsize(mustset, fit_to_display, direction)

!     int		mustset UNUSED;		/* set by the user */

      int		fit_to_display;

      int		direction;		/* RESIZE_HOR, RESIZE_VER */

  {

***************

*** 3120,3126 ****

   * If "oldval" is not NULL, "oldval" is the previous value, the new value is

   * in p_go.

   */

- /*ARGSUSED*/

      void

  gui_init_which_components(oldval)

      char_u	*oldval;

--- 3117,3122 ----

***************

*** 4411,4417 ****

      if (curwin->w_p_wrap)

  	return FALSE;

!     if (curwin->w_leftcol == scrollbar_value)

  	return FALSE;

      curwin->w_leftcol = (colnr_T)scrollbar_value;

--- 4407,4413 ----

      if (curwin->w_p_wrap)

  	return FALSE;

!     if ((long_u)curwin->w_leftcol == scrollbar_value)

  	return FALSE;

      curwin->w_leftcol = (colnr_T)scrollbar_value;

***************

*** 4424,4430 ****

  	    && longest_lnum < curwin->w_botline

  	    && !virtual_active())

      {

! 	if (scrollbar_value > scroll_line_len(curwin->w_cursor.lnum))

  	{

  	    curwin->w_cursor.lnum = longest_lnum;

  	    curwin->w_cursor.col = 0;

--- 4420,4426 ----

  	    && longest_lnum < curwin->w_botline

  	    && !virtual_active())

      {

! 	if (scrollbar_value > (long_u)scroll_line_len(curwin->w_cursor.lnum))

  	{

  	    curwin->w_cursor.lnum = longest_lnum;

  	    curwin->w_cursor.col = 0;

***************

*** 4670,4676 ****

  /*

   * Find window where the mouse pointer "y" coordinate is in.

   */

- /*ARGSUSED*/

      static win_T *

  xy2win(x, y)

      int		x;

--- 4666,4671 ----

***************

*** 5124,5130 ****

   * of dropped files, they will be freed in this function, and caller can't use

   * fnames after call this function.

   */

- /*ARGSUSED*/

      void

  gui_handle_drop(x, y, modifiers, fnames, count)

      int		x;

--- 5119,5124 ----

*** ../vim-7.2.180/src/gui_gtk.c	2008-07-31 22:29:28.000000000 +0200

--- src/gui_gtk.c	2009-05-17 16:06:30.000000000 +0200

***************

*** 285,298 ****

      return image;

  }

- /*ARGSUSED*/

      static gint

! toolbar_button_focus_in_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)

! {

!     /* When we're in a GtkPlug, we don't have window focus events, only widget focus.

!      * To emulate stand-alone gvim, if a button gets focus (e.g., <Tab> into GtkPlug)

!      * immediately pass it to mainwin.

!      */

      if (gtk_socket_id != 0)

  	gtk_widget_grab_focus(gui.drawarea);

--- 285,298 ----

      return image;

  }

      static gint

! toolbar_button_focus_in_event(GtkWidget *widget UNUSED,

! 			      GdkEventFocus *event UNUSED,

! 			      gpointer data UNUSED)

! {

!     /* When we're in a GtkPlug, we don't have window focus events, only widget

!      * focus.  To emulate stand-alone gvim, if a button gets focus (e.g.,

!      * <Tab> into GtkPlug) immediately pass it to mainwin. */

      if (gtk_socket_id != 0)

  	gtk_widget_grab_focus(gui.drawarea);

***************

*** 585,593 ****

      gtk_menu_prepend(GTK_MENU(menu->submenu_id), menu->tearoff_handle);

  }

- /*ARGSUSED*/

      static void

! menu_item_activate(GtkWidget *widget, gpointer data)

  {

      gui_menu_cb((vimmenu_T *)data);

--- 585,592 ----

      gtk_menu_prepend(GTK_MENU(menu->submenu_id), menu->tearoff_handle);

  }

      static void

! menu_item_activate(GtkWidget *widget UNUSED, gpointer data)

  {

      gui_menu_cb((vimmenu_T *)data);

***************

*** 1202,1210 ****

  #endif

  #ifndef USE_FILE_CHOOSER

- /*ARGSUSED*/

      static void

! browse_ok_cb(GtkWidget *widget, gpointer cbdata)

  {

      gui_T *vw = (gui_T *)cbdata;

--- 1201,1208 ----

  #endif

  #ifndef USE_FILE_CHOOSER

      static void

! browse_ok_cb(GtkWidget *widget UNUSED, gpointer cbdata)

  {

      gui_T *vw = (gui_T *)cbdata;

***************

*** 1218,1226 ****

  	gtk_main_quit();

  }

- /*ARGSUSED*/

      static void

! browse_cancel_cb(GtkWidget *widget, gpointer cbdata)

  {

      gui_T *vw = (gui_T *)cbdata;

--- 1216,1223 ----

  	gtk_main_quit();

  }

      static void

! browse_cancel_cb(GtkWidget *widget UNUSED, gpointer cbdata)

  {

      gui_T *vw = (gui_T *)cbdata;

***************

*** 1234,1242 ****

  	gtk_main_quit();

  }

- /*ARGSUSED*/

      static gboolean

! browse_destroy_cb(GtkWidget * widget)

  {

      if (gui.browse_fname != NULL)

      {

--- 1231,1238 ----

  	gtk_main_quit();

  }

      static gboolean

! browse_destroy_cb(GtkWidget *widget UNUSED)

  {

      if (gui.browse_fname != NULL)

      {

***************

*** 1262,1275 ****

   * initdir			initial directory, NULL for current dir

   * filter			not used (file name filter)

   */

- /*ARGSUSED*/

      char_u *

! gui_mch_browse(int saving,

  	       char_u *title,

  	       char_u *dflt,

! 	       char_u *ext,

  	       char_u *initdir,

! 	       char_u *filter)

  {

  #ifdef USE_FILE_CHOOSER

      GtkWidget		*fc;

--- 1258,1270 ----

   * initdir			initial directory, NULL for current dir

   * filter			not used (file name filter)

   */

      char_u *

! gui_mch_browse(int saving UNUSED,

  	       char_u *title,

  	       char_u *dflt,

! 	       char_u *ext UNUSED,

  	       char_u *initdir,

! 	       char_u *filter UNUSED)

  {

  #ifdef USE_FILE_CHOOSER

      GtkWidget		*fc;

***************

*** 1377,1383 ****

   * dflt				default name

   * initdir			initial directory, NULL for current dir

   */

- /*ARGSUSED*/

      char_u *

  gui_mch_browsedir(

  	       char_u *title,

--- 1372,1377 ----

***************

*** 1460,1466 ****

  }

  # ifdef FEAT_GUI_GNOME

- /* ARGSUSED */

      static int

  gui_gnome_dialog( int	type,

  		char_u	*title,

--- 1454,1459 ----

***************

*** 1611,1617 ****

      GtkWidget	*dialog;

  } CancelData;

- /* ARGSUSED */

      static void

  dlg_button_clicked(GtkWidget * widget, ButtonData *data)

  {

--- 1604,1609 ----

***************

*** 1622,1628 ****

  /*

   * This makes the Escape key equivalent to the cancel button.

   */

- /*ARGSUSED*/

      static int

  dlg_key_press_event(GtkWidget *widget, GdkEventKey *event, CancelData *data)

  {

--- 1614,1619 ----

***************

*** 1655,1661 ****

  	gtk_main_quit();

  }

- /* ARGSUSED */

      int

  gui_mch_dialog(	int	type,		/* type of dialog */

  		char_u	*title,		/* title of dialog */

--- 1646,1651 ----

***************

*** 2215,2221 ****

      GtkDialog	*dialog;	    /* Widget of the dialog */

  } DialogInfo;

- /*ARGSUSED2*/

      static gboolean

  dialog_key_press_event_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)

  {

--- 2205,2210 ----

***************

*** 2398,2411 ****

   * Note: The push_in output argument seems to affect scrolling of huge

   * menus that don't fit on the screen.	Leave it at the default for now.

   */

- /*ARGSUSED0*/

      static void

! popup_menu_position_func(GtkMenu *menu,

  			 gint *x, gint *y,

  # ifdef HAVE_GTK2

! 			 gboolean *push_in,

  # endif

! 			 gpointer user_data)

  {

      gdk_window_get_origin(gui.drawarea->window, x, y);

--- 2387,2399 ----

   * Note: The push_in output argument seems to affect scrolling of huge

   * menus that don't fit on the screen.	Leave it at the default for now.

   */

      static void

! popup_menu_position_func(GtkMenu *menu UNUSED,

  			 gint *x, gint *y,

  # ifdef HAVE_GTK2

! 			 gboolean *push_in UNUSED,

  # endif

! 			 gpointer user_data UNUSED)

  {

      gdk_window_get_origin(gui.drawarea->window, x, y);

***************

*** 2464,2476 ****

      GtkWidget *all;	/* 'Replace All' action button */

  } SharedFindReplace;

! static SharedFindReplace find_widgets = { NULL, };

! static SharedFindReplace repl_widgets = { NULL, };

- /* ARGSUSED */

      static int

  find_key_press_event(

! 		GtkWidget	*widget,

  		GdkEventKey	*event,

  		SharedFindReplace *frdp)

  {

--- 2452,2463 ----

      GtkWidget *all;	/* 'Replace All' action button */

  } SharedFindReplace;

! static SharedFindReplace find_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};

! static SharedFindReplace repl_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};

      static int

  find_key_press_event(

! 		GtkWidget	*widget UNUSED,

  		GdkEventKey	*event,

  		SharedFindReplace *frdp)

  {

***************

*** 2962,2970 ****

  /*

   * Callback for actions of the find and replace dialogs

   */

- /*ARGSUSED*/

      static void

! find_replace_cb(GtkWidget *widget, gpointer data)

  {

      int			flags;

      char_u		*find_text;

--- 2949,2956 ----

  /*

   * Callback for actions of the find and replace dialogs

   */

      static void

! find_replace_cb(GtkWidget *widget UNUSED, gpointer data)

  {

      int			flags;

      char_u		*find_text;

***************

*** 3010,3018 ****

  }

  /* our usual callback function */

- /*ARGSUSED*/

      static void

! entry_activate_cb(GtkWidget *widget, gpointer data)

  {

      gtk_widget_grab_focus(GTK_WIDGET(data));

  }

--- 2996,3003 ----

  }

  /* our usual callback function */

      static void

! entry_activate_cb(GtkWidget *widget UNUSED, gpointer data)

  {

      gtk_widget_grab_focus(GTK_WIDGET(data));

  }

***************

*** 3055,3064 ****

  /*

   * ":helpfind"

   */

- /*ARGSUSED*/

      void

  ex_helpfind(eap)

!     exarg_T	*eap;

  {

      /* This will fail when menus are not loaded.  Well, it's only for

       * backwards compatibility anyway. */

--- 3040,3048 ----

  /*

   * ":helpfind"

   */

      void

  ex_helpfind(eap)

!     exarg_T	*eap UNUSED;

  {

      /* This will fail when menus are not loaded.  Well, it's only for

       * backwards compatibility anyway. */

*** ../vim-7.2.180/src/gui_gtk_x11.c	2008-11-28 21:26:50.000000000 +0100

--- src/gui_gtk_x11.c	2009-05-17 15:53:02.000000000 +0200

***************

*** 619,627 ****

   * Doesn't seem possible, since check_copy_area() relies on

   * this information.  --danielk

   */

- /*ARGSUSED*/

      static gint

! visibility_event(GtkWidget *widget, GdkEventVisibility *event, gpointer data)

  {

      gui.visibility = event->state;

      /*

--- 625,634 ----

   * Doesn't seem possible, since check_copy_area() relies on

   * this information.  --danielk

   */

      static gint

! visibility_event(GtkWidget *widget UNUSED,

! 		 GdkEventVisibility *event,

! 		 gpointer data UNUSED)

  {

      gui.visibility = event->state;

      /*

***************

*** 638,646 ****

  /*

   * Redraw the corresponding portions of the screen.

   */

- /*ARGSUSED*/

      static gint

! expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)

  {

      /* Skip this when the GUI isn't set up yet, will redraw later. */

      if (gui.starting)

--- 645,654 ----

  /*

   * Redraw the corresponding portions of the screen.

   */

      static gint

! expose_event(GtkWidget *widget UNUSED,

! 	     GdkEventExpose *event,

! 	     gpointer data UNUSED)

  {

      /* Skip this when the GUI isn't set up yet, will redraw later. */

      if (gui.starting)

***************

*** 668,676 ****

  /*

   * Handle changes to the "Comm" property

   */

- /*ARGSUSED2*/

      static gint

! property_event(GtkWidget *widget, GdkEventProperty *event, gpointer data)

  {

      if (event->type == GDK_PROPERTY_NOTIFY

  	    && event->state == (int)GDK_PROPERTY_NEW_VALUE

--- 676,685 ----

  /*

   * Handle changes to the "Comm" property

   */

      static gint

! property_event(GtkWidget *widget,

! 	       GdkEventProperty *event,

! 	       gpointer data UNUSED)

  {

      if (event->type == GDK_PROPERTY_NOTIFY

  	    && event->state == (int)GDK_PROPERTY_NEW_VALUE

***************

*** 740,748 ****

      blink_state = BLINK_NONE;

  }

- /*ARGSUSED*/

      static gint

! blink_cb(gpointer data)

  {

      if (blink_state == BLINK_ON)

      {

--- 749,756 ----

      blink_state = BLINK_NONE;

  }

      static gint

! blink_cb(gpointer data UNUSED)

  {

      if (blink_state == BLINK_ON)

      {

***************

*** 781,789 ****

      }

  }

- /*ARGSUSED*/

      static gint

! enter_notify_event(GtkWidget *widget, GdkEventCrossing *event, gpointer data)

  {

      if (blink_state == BLINK_NONE)

  	gui_mch_start_blink();

--- 789,798 ----

      }

  }

      static gint

! enter_notify_event(GtkWidget *widget UNUSED,

! 		   GdkEventCrossing *event UNUSED,

! 		   gpointer data UNUSED)

  {

      if (blink_state == BLINK_NONE)

  	gui_mch_start_blink();

***************

*** 795,803 ****

      return FALSE;

  }

- /*ARGSUSED*/

      static gint

! leave_notify_event(GtkWidget *widget, GdkEventCrossing *event, gpointer data)

  {

      if (blink_state != BLINK_NONE)

  	gui_mch_stop_blink();

--- 804,813 ----

      return FALSE;

  }

      static gint

! leave_notify_event(GtkWidget *widget UNUSED,

! 		   GdkEventCrossing *event UNUSED,

! 		   gpointer data UNUSED)

  {

      if (blink_state != BLINK_NONE)

  	gui_mch_stop_blink();

***************

*** 805,813 ****

      return FALSE;

  }

- /*ARGSUSED*/

      static gint

! focus_in_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)

  {

      gui_focus_change(TRUE);

--- 815,824 ----

      return FALSE;

  }

      static gint

! focus_in_event(GtkWidget *widget,

! 	       GdkEventFocus *event UNUSED,

! 	       gpointer data UNUSED)

  {

      gui_focus_change(TRUE);

***************

*** 826,834 ****

      return TRUE;

  }

- /*ARGSUSED*/

      static gint

! focus_out_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)

  {

      gui_focus_change(FALSE);

--- 837,846 ----

      return TRUE;

  }

      static gint

! focus_out_event(GtkWidget *widget UNUSED,

! 	        GdkEventFocus *event UNUSED,

! 		gpointer data UNUSED)

  {

      gui_focus_change(FALSE);

***************

*** 956,964 ****

  /*

   * Main keyboard handler:

   */

- /*ARGSUSED*/

      static gint

! key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data)

  {

  #ifdef HAVE_GTK2

      /* 256 bytes is way over the top, but for safety let's reduce it only

--- 968,977 ----

  /*

   * Main keyboard handler:

   */

      static gint

! key_press_event(GtkWidget *widget UNUSED,

! 		GdkEventKey *event,

! 		gpointer data UNUSED)

  {

  #ifdef HAVE_GTK2

      /* 256 bytes is way over the top, but for safety let's reduce it only

***************

*** 1225,1233 ****

  }

  #if defined(FEAT_XIM) && defined(HAVE_GTK2)

- /*ARGSUSED0*/

      static gboolean

! key_release_event(GtkWidget *widget, GdkEventKey *event, gpointer data)

  {

      /*

       * GTK+ 2 input methods may do fancy stuff on key release events too.

--- 1238,1247 ----

  }

  #if defined(FEAT_XIM) && defined(HAVE_GTK2)

      static gboolean

! key_release_event(GtkWidget *widget UNUSED,

! 		  GdkEventKey *event,

! 		  gpointer data UNUSED)

  {

      /*

       * GTK+ 2 input methods may do fancy stuff on key release events too.

***************

*** 1243,1253 ****

   * Selection handlers:

   */

- /*ARGSUSED*/

      static gint

! selection_clear_event(GtkWidget		*widget,

  		      GdkEventSelection	*event,

! 		      gpointer		user_data)

  {

      if (event->selection == clip_plus.gtk_sel_atom)

  	clip_lose_selection(&clip_plus);

--- 1257,1266 ----

   * Selection handlers:

   */

      static gint

! selection_clear_event(GtkWidget		*widget UNUSED,

  		      GdkEventSelection	*event,

! 		      gpointer		user_data UNUSED)

  {

      if (event->selection == clip_plus.gtk_sel_atom)

  	clip_lose_selection(&clip_plus);

***************

*** 1265,1276 ****

  #define RS_FAIL	2	/* selection_received_cb() called and failed */

  static int received_selection = RS_NONE;

- /*ARGSUSED*/

      static void

! selection_received_cb(GtkWidget		*widget,

  		      GtkSelectionData	*data,

! 		      guint		time_,

! 		      gpointer		user_data)

  {

      VimClipboard    *cbd;

      char_u	    *text;

--- 1278,1288 ----

  #define RS_FAIL	2	/* selection_received_cb() called and failed */

  static int received_selection = RS_NONE;

      static void

! selection_received_cb(GtkWidget		*widget UNUSED,

  		      GtkSelectionData	*data,

! 		      guint		time_ UNUSED,

! 		      gpointer		user_data UNUSED)

  {

      VimClipboard    *cbd;

      char_u	    *text;

***************

*** 1414,1426 ****

   * Prepare our selection data for passing it to the external selection

   * client.

   */

- /*ARGSUSED*/

      static void

! selection_get_cb(GtkWidget	    *widget,

  		 GtkSelectionData   *selection_data,

  		 guint		    info,

! 		 guint		    time_,

! 		 gpointer	    user_data)

  {

      char_u	    *string;

      char_u	    *tmpbuf;

--- 1426,1437 ----

   * Prepare our selection data for passing it to the external selection

   * client.

   */

      static void

! selection_get_cb(GtkWidget	    *widget UNUSED,

  		 GtkSelectionData   *selection_data,

  		 guint		    info,

! 		 guint		    time_ UNUSED,

! 		 gpointer	    user_data UNUSED)

  {

      char_u	    *string;

      char_u	    *tmpbuf;

***************

*** 1678,1684 ****

  	offshoot = dx > dy ? dx : dy;

! 	/* Make a linearly declaying timer delay with a threshold of 5 at a

  	 * distance of 127 pixels from the main window.

  	 *

  	 * One could think endlessly about the most ergonomic variant here.

--- 1689,1695 ----

  	offshoot = dx > dy ? dx : dy;

! 	/* Make a linearly decaying timer delay with a threshold of 5 at a

  	 * distance of 127 pixels from the main window.

  	 *

  	 * One could think endlessly about the most ergonomic variant here.

***************

*** 1707,1715 ****

  /*

   * Timer used to recognize multiple clicks of the mouse button.

   */

- /*ARGSUSED0*/

      static gint

! motion_repeat_timer_cb(gpointer data)

  {

      int		    x;

      int		    y;

--- 1718,1725 ----

  /*

   * Timer used to recognize multiple clicks of the mouse button.

   */

      static gint

! motion_repeat_timer_cb(gpointer data UNUSED)

  {

      int		    x;

      int		    y;

***************

*** 1749,1757 ****

      return FALSE;

  }

- /*ARGSUSED2*/

      static gint

! motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data)

  {

      if (event->is_hint)

      {

--- 1759,1768 ----

      return FALSE;

  }

      static gint

! motion_notify_event(GtkWidget *widget,

! 		    GdkEventMotion *event,

! 		    gpointer data UNUSED)

  {

      if (event->is_hint)

      {

***************

*** 1777,1785 ****

   * by our own timeout mechanism instead of the one provided by GTK+ itself.

   * This is due to the way the generic VIM code is recognizing multiple clicks.

   */

- /*ARGSUSED2*/

      static gint

! button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data)

  {

      int button;

      int repeated_click = FALSE;

--- 1788,1797 ----

   * by our own timeout mechanism instead of the one provided by GTK+ itself.

   * This is due to the way the generic VIM code is recognizing multiple clicks.

   */

      static gint

! button_press_event(GtkWidget *widget,

! 		   GdkEventButton *event,

! 		   gpointer data UNUSED)

  {