7.2.181

   1 To: vim-dev@vim.org
   2 Subject: Patch 7.2.181
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.2.181
  11 Problem:    Some more compiler warnings when using gcc -Wextra.
  12 Solution:   Add UNUSED and type casts.
  13 Files:      src/if_mzsch.c, src/gui.c, src/gui_gtk.c, src/gui_gtk_x11.c,
  14             src/gui_gtk_f.c, src/gui_beval.c, src/netbeans.c
  15
  16
  17 *** ../vim-7.2.180/src/if_mzsch.c       2007-07-06 19:43:08.000000000 +0200
  18 --- src/if_mzsch.c      2009-05-16 22:24:18.000000000 +0200
  19 ***************
  20 *** 667,679 ****
  21       static void CALLBACK
  22   timer_proc(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime)
  23   # elif defined(FEAT_GUI_GTK)
  24 - /*ARGSUSED*/
  25       static gint
  26 ! timer_proc(gpointer data)
  27   # elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
  28 - /* ARGSUSED */
  29       static void
  30 ! timer_proc(XtPointer timed_out, XtIntervalId *interval_id)
  31   # elif defined(FEAT_GUI_MAC)
  32       pascal void
  33   timer_proc(EventLoopTimerRef theTimer, void *userData)
  34 --- 667,677 ----
  35       static void CALLBACK
  36   timer_proc(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime)
  37   # elif defined(FEAT_GUI_GTK)
  38       static gint
  39 ! timer_proc(gpointer data UNUSED)
  40   # elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
  41       static void
  42 ! timer_proc(XtPointer timed_out UNUSED, XtIntervalId *interval_id UNUSED)
  43   # elif defined(FEAT_GUI_MAC)
  44       pascal void
  45   timer_proc(EventLoopTimerRef theTimer, void *userData)
  46 *** ../vim-7.2.180/src/gui.c    2008-12-03 18:50:09.000000000 +0100
  47 --- src/gui.c   2009-05-17 15:52:18.000000000 +0200
  48 ***************
  49 *** 678,688 ****
  50    * Return OK when able to set the font.  When it failed FAIL is returned and
  51    * the fonts are unchanged.
  52    */
  53 - /*ARGSUSED*/
  54       int
  55   gui_init_font(font_list, fontset)
  56       char_u    *font_list;
  57 !     int               fontset;
  58   {
  59   #define FONTLEN 320
  60       char_u    font_name[FONTLEN];
  61 --- 678,687 ----
  62    * Return OK when able to set the font.  When it failed FAIL is returned and
  63    * the fonts are unchanged.
  64    */
  65       int
  66   gui_init_font(font_list, fontset)
  67       char_u    *font_list;
  68 !     int               fontset UNUSED;
  69   {
  70   #define FONTLEN 320
  71       char_u    font_name[FONTLEN];
  72 ***************
  73 *** 1138,1147 ****
  74    * Position the various GUI components (text area, menu).  The vertical
  75    * scrollbars are NOT handled here.  See gui_update_scrollbars().
  76    */
  77 - /*ARGSUSED*/
  78       static void
  79   gui_position_components(total_width)
  80 !     int           total_width;
  81   {
  82       int           text_area_x;
  83       int           text_area_y;
  84 --- 1137,1145 ----
  85    * Position the various GUI components (text area, menu).  The vertical
  86    * scrollbars are NOT handled here.  See gui_update_scrollbars().
  87    */
  88       static void
  89   gui_position_components(total_width)
  90 !     int           total_width UNUSED;
  91   {
  92       int           text_area_x;
  93       int           text_area_y;
  94 ***************
  95 *** 1374,1383 ****
  96    * If "fit_to_display" is TRUE then the size may be reduced to fit the window
  97    * on the screen.
  98    */
  99 - /*ARGSUSED*/
 100       void
 101   gui_set_shellsize(mustset, fit_to_display, direction)
 102 !     int               mustset;                /* set by the user */
 103       int               fit_to_display;
 104       int               direction;              /* RESIZE_HOR, RESIZE_VER */
 105   {
 106 --- 1372,1380 ----
 107    * If "fit_to_display" is TRUE then the size may be reduced to fit the window
 108    * on the screen.
 109    */
 110       void
 111   gui_set_shellsize(mustset, fit_to_display, direction)
 112 !     int               mustset UNUSED;         /* set by the user */
 113       int               fit_to_display;
 114       int               direction;              /* RESIZE_HOR, RESIZE_VER */
 115   {
 116 ***************
 117 *** 3120,3126 ****
 118    * If "oldval" is not NULL, "oldval" is the previous value, the new value is
 119    * in p_go.
 120    */
 121 - /*ARGSUSED*/
 122       void
 123   gui_init_which_components(oldval)
 124       char_u    *oldval;
 125 --- 3117,3122 ----
 126 ***************
 127 *** 4411,4417 ****
 128       if (curwin->w_p_wrap)
 129         return FALSE;
 130
 131 !     if (curwin->w_leftcol == scrollbar_value)
 132         return FALSE;
 133
 134       curwin->w_leftcol = (colnr_T)scrollbar_value;
 135 --- 4407,4413 ----
 136       if (curwin->w_p_wrap)
 137         return FALSE;
 138
 139 !     if ((long_u)curwin->w_leftcol == scrollbar_value)
 140         return FALSE;
 141
 142       curwin->w_leftcol = (colnr_T)scrollbar_value;
 143 ***************
 144 *** 4424,4430 ****
 145             && longest_lnum < curwin->w_botline
 146             && !virtual_active())
 147       {
 148 !       if (scrollbar_value > scroll_line_len(curwin->w_cursor.lnum))
 149         {
 150             curwin->w_cursor.lnum = longest_lnum;
 151             curwin->w_cursor.col = 0;
 152 --- 4420,4426 ----
 153             && longest_lnum < curwin->w_botline
 154             && !virtual_active())
 155       {
 156 !       if (scrollbar_value > (long_u)scroll_line_len(curwin->w_cursor.lnum))
 157         {
 158             curwin->w_cursor.lnum = longest_lnum;
 159             curwin->w_cursor.col = 0;
 160 ***************
 161 *** 4670,4676 ****
 162   /*
 163    * Find window where the mouse pointer "y" coordinate is in.
 164    */
 165 - /*ARGSUSED*/
 166       static win_T *
 167   xy2win(x, y)
 168       int               x;
 169 --- 4666,4671 ----
 170 ***************
 171 *** 5124,5130 ****
 172    * of dropped files, they will be freed in this function, and caller can't use
 173    * fnames after call this function.
 174    */
 175 - /*ARGSUSED*/
 176       void
 177   gui_handle_drop(x, y, modifiers, fnames, count)
 178       int               x;
 179 --- 5119,5124 ----
 180 *** ../vim-7.2.180/src/gui_gtk.c        2008-07-31 22:29:28.000000000 +0200
 181 --- src/gui_gtk.c       2009-05-17 16:06:30.000000000 +0200
 182 ***************
 183 *** 285,298 ****
 184       return image;
 185   }
 186
 187 - /*ARGSUSED*/
 188       static gint
 189 ! toolbar_button_focus_in_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
 190 ! {
 191 !     /* When we're in a GtkPlug, we don't have window focus events, only widget focus.
 192 !      * To emulate stand-alone gvim, if a button gets focus (e.g., <Tab> into GtkPlug)
 193 !      * immediately pass it to mainwin.
 194 !      */
 195       if (gtk_socket_id != 0)
 196         gtk_widget_grab_focus(gui.drawarea);
 197
 198 --- 285,298 ----
 199       return image;
 200   }
 201
 202       static gint
 203 ! toolbar_button_focus_in_event(GtkWidget *widget UNUSED,
 204 !                             GdkEventFocus *event UNUSED,
 205 !                             gpointer data UNUSED)
 206 ! {
 207 !     /* When we're in a GtkPlug, we don't have window focus events, only widget
 208 !      * focus.  To emulate stand-alone gvim, if a button gets focus (e.g.,
 209 !      * <Tab> into GtkPlug) immediately pass it to mainwin. */
 210       if (gtk_socket_id != 0)
 211         gtk_widget_grab_focus(gui.drawarea);
 212
 213 ***************
 214 *** 585,593 ****
 215       gtk_menu_prepend(GTK_MENU(menu->submenu_id), menu->tearoff_handle);
 216   }
 217
 218 - /*ARGSUSED*/
 219       static void
 220 ! menu_item_activate(GtkWidget *widget, gpointer data)
 221   {
 222       gui_menu_cb((vimmenu_T *)data);
 223
 224 --- 585,592 ----
 225       gtk_menu_prepend(GTK_MENU(menu->submenu_id), menu->tearoff_handle);
 226   }
 227
 228       static void
 229 ! menu_item_activate(GtkWidget *widget UNUSED, gpointer data)
 230   {
 231       gui_menu_cb((vimmenu_T *)data);
 232
 233 ***************
 234 *** 1202,1210 ****
 235   #endif
 236
 237   #ifndef USE_FILE_CHOOSER
 238 - /*ARGSUSED*/
 239       static void
 240 ! browse_ok_cb(GtkWidget *widget, gpointer cbdata)
 241   {
 242       gui_T *vw = (gui_T *)cbdata;
 243
 244 --- 1201,1208 ----
 245   #endif
 246
 247   #ifndef USE_FILE_CHOOSER
 248       static void
 249 ! browse_ok_cb(GtkWidget *widget UNUSED, gpointer cbdata)
 250   {
 251       gui_T *vw = (gui_T *)cbdata;
 252
 253 ***************
 254 *** 1218,1226 ****
 255         gtk_main_quit();
 256   }
 257
 258 - /*ARGSUSED*/
 259       static void
 260 ! browse_cancel_cb(GtkWidget *widget, gpointer cbdata)
 261   {
 262       gui_T *vw = (gui_T *)cbdata;
 263
 264 --- 1216,1223 ----
 265         gtk_main_quit();
 266   }
 267
 268       static void
 269 ! browse_cancel_cb(GtkWidget *widget UNUSED, gpointer cbdata)
 270   {
 271       gui_T *vw = (gui_T *)cbdata;
 272
 273 ***************
 274 *** 1234,1242 ****
 275         gtk_main_quit();
 276   }
 277
 278 - /*ARGSUSED*/
 279       static gboolean
 280 ! browse_destroy_cb(GtkWidget * widget)
 281   {
 282       if (gui.browse_fname != NULL)
 283       {
 284 --- 1231,1238 ----
 285         gtk_main_quit();
 286   }
 287
 288       static gboolean
 289 ! browse_destroy_cb(GtkWidget *widget UNUSED)
 290   {
 291       if (gui.browse_fname != NULL)
 292       {
 293 ***************
 294 *** 1262,1275 ****
 295    * initdir                    initial directory, NULL for current dir
 296    * filter                     not used (file name filter)
 297    */
 298 - /*ARGSUSED*/
 299       char_u *
 300 ! gui_mch_browse(int saving,
 301                char_u *title,
 302                char_u *dflt,
 303 !              char_u *ext,
 304                char_u *initdir,
 305 !              char_u *filter)
 306   {
 307   #ifdef USE_FILE_CHOOSER
 308       GtkWidget         *fc;
 309 --- 1258,1270 ----
 310    * initdir                    initial directory, NULL for current dir
 311    * filter                     not used (file name filter)
 312    */
 313       char_u *
 314 ! gui_mch_browse(int saving UNUSED,
 315                char_u *title,
 316                char_u *dflt,
 317 !              char_u *ext UNUSED,
 318                char_u *initdir,
 319 !              char_u *filter UNUSED)
 320   {
 321   #ifdef USE_FILE_CHOOSER
 322       GtkWidget         *fc;
 323 ***************
 324 *** 1377,1383 ****
 325    * dflt                               default name
 326    * initdir                    initial directory, NULL for current dir
 327    */
 328 - /*ARGSUSED*/
 329       char_u *
 330   gui_mch_browsedir(
 331                char_u *title,
 332 --- 1372,1377 ----
 333 ***************
 334 *** 1460,1466 ****
 335   }
 336
 337   # ifdef FEAT_GUI_GNOME
 338 - /* ARGSUSED */
 339       static int
 340   gui_gnome_dialog( int type,
 341                 char_u  *title,
 342 --- 1454,1459 ----
 343 ***************
 344 *** 1611,1617 ****
 345       GtkWidget *dialog;
 346   } CancelData;
 347
 348 - /* ARGSUSED */
 349       static void
 350   dlg_button_clicked(GtkWidget * widget, ButtonData *data)
 351   {
 352 --- 1604,1609 ----
 353 ***************
 354 *** 1622,1628 ****
 355   /*
 356    * This makes the Escape key equivalent to the cancel button.
 357    */
 358 - /*ARGSUSED*/
 359       static int
 360   dlg_key_press_event(GtkWidget *widget, GdkEventKey *event, CancelData *data)
 361   {
 362 --- 1614,1619 ----
 363 ***************
 364 *** 1655,1661 ****
 365         gtk_main_quit();
 366   }
 367
 368 - /* ARGSUSED */
 369       int
 370   gui_mch_dialog(       int     type,           /* type of dialog */
 371                 char_u  *title,         /* title of dialog */
 372 --- 1646,1651 ----
 373 ***************
 374 *** 2215,2221 ****
 375       GtkDialog *dialog;            /* Widget of the dialog */
 376   } DialogInfo;
 377
 378 - /*ARGSUSED2*/
 379       static gboolean
 380   dialog_key_press_event_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 381   {
 382 --- 2205,2210 ----
 383 ***************
 384 *** 2398,2411 ****
 385    * Note: The push_in output argument seems to affect scrolling of huge
 386    * menus that don't fit on the screen.        Leave it at the default for now.
 387    */
 388 - /*ARGSUSED0*/
 389       static void
 390 ! popup_menu_position_func(GtkMenu *menu,
 391                          gint *x, gint *y,
 392   # ifdef HAVE_GTK2
 393 !                        gboolean *push_in,
 394   # endif
 395 !                        gpointer user_data)
 396   {
 397       gdk_window_get_origin(gui.drawarea->window, x, y);
 398
 399 --- 2387,2399 ----
 400    * Note: The push_in output argument seems to affect scrolling of huge
 401    * menus that don't fit on the screen.        Leave it at the default for now.
 402    */
 403       static void
 404 ! popup_menu_position_func(GtkMenu *menu UNUSED,
 405                          gint *x, gint *y,
 406   # ifdef HAVE_GTK2
 407 !                        gboolean *push_in UNUSED,
 408   # endif
 409 !                        gpointer user_data UNUSED)
 410   {
 411       gdk_window_get_origin(gui.drawarea->window, x, y);
 412
 413 ***************
 414 *** 2464,2476 ****
 415       GtkWidget *all;   /* 'Replace All' action button */
 416   } SharedFindReplace;
 417
 418 ! static SharedFindReplace find_widgets = { NULL, };
 419 ! static SharedFindReplace repl_widgets = { NULL, };
 420
 421 - /* ARGSUSED */
 422       static int
 423   find_key_press_event(
 424 !               GtkWidget       *widget,
 425                 GdkEventKey     *event,
 426                 SharedFindReplace *frdp)
 427   {
 428 --- 2452,2463 ----
 429       GtkWidget *all;   /* 'Replace All' action button */
 430   } SharedFindReplace;
 431
 432 ! static SharedFindReplace find_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
 433 ! static SharedFindReplace repl_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
 434
 435       static int
 436   find_key_press_event(
 437 !               GtkWidget       *widget UNUSED,
 438                 GdkEventKey     *event,
 439                 SharedFindReplace *frdp)
 440   {
 441 ***************
 442 *** 2962,2970 ****
 443   /*
 444    * Callback for actions of the find and replace dialogs
 445    */
 446 - /*ARGSUSED*/
 447       static void
 448 ! find_replace_cb(GtkWidget *widget, gpointer data)
 449   {
 450       int                       flags;
 451       char_u            *find_text;
 452 --- 2949,2956 ----
 453   /*
 454    * Callback for actions of the find and replace dialogs
 455    */
 456       static void
 457 ! find_replace_cb(GtkWidget *widget UNUSED, gpointer data)
 458   {
 459       int                       flags;
 460       char_u            *find_text;
 461 ***************
 462 *** 3010,3018 ****
 463   }
 464
 465   /* our usual callback function */
 466 - /*ARGSUSED*/
 467       static void
 468 ! entry_activate_cb(GtkWidget *widget, gpointer data)
 469   {
 470       gtk_widget_grab_focus(GTK_WIDGET(data));
 471   }
 472 --- 2996,3003 ----
 473   }
 474
 475   /* our usual callback function */
 476       static void
 477 ! entry_activate_cb(GtkWidget *widget UNUSED, gpointer data)
 478   {
 479       gtk_widget_grab_focus(GTK_WIDGET(data));
 480   }
 481 ***************
 482 *** 3055,3064 ****
 483   /*
 484    * ":helpfind"
 485    */
 486 - /*ARGSUSED*/
 487       void
 488   ex_helpfind(eap)
 489 !     exarg_T   *eap;
 490   {
 491       /* This will fail when menus are not loaded.  Well, it's only for
 492        * backwards compatibility anyway. */
 493 --- 3040,3048 ----
 494   /*
 495    * ":helpfind"
 496    */
 497       void
 498   ex_helpfind(eap)
 499 !     exarg_T   *eap UNUSED;
 500   {
 501       /* This will fail when menus are not loaded.  Well, it's only for
 502        * backwards compatibility anyway. */
 503 *** ../vim-7.2.180/src/gui_gtk_x11.c    2008-11-28 21:26:50.000000000 +0100
 504 --- src/gui_gtk_x11.c   2009-05-17 15:53:02.000000000 +0200
 505 ***************
 506 *** 619,627 ****
 507    * Doesn't seem possible, since check_copy_area() relies on
 508    * this information.  --danielk
 509    */
 510 - /*ARGSUSED*/
 511       static gint
 512 ! visibility_event(GtkWidget *widget, GdkEventVisibility *event, gpointer data)
 513   {
 514       gui.visibility = event->state;
 515       /*
 516 --- 625,634 ----
 517    * Doesn't seem possible, since check_copy_area() relies on
 518    * this information.  --danielk
 519    */
 520       static gint
 521 ! visibility_event(GtkWidget *widget UNUSED,
 522 !                GdkEventVisibility *event,
 523 !                gpointer data UNUSED)
 524   {
 525       gui.visibility = event->state;
 526       /*
 527 ***************
 528 *** 638,646 ****
 529   /*
 530    * Redraw the corresponding portions of the screen.
 531    */
 532 - /*ARGSUSED*/
 533       static gint
 534 ! expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
 535   {
 536       /* Skip this when the GUI isn't set up yet, will redraw later. */
 537       if (gui.starting)
 538 --- 645,654 ----
 539   /*
 540    * Redraw the corresponding portions of the screen.
 541    */
 542       static gint
 543 ! expose_event(GtkWidget *widget UNUSED,
 544 !            GdkEventExpose *event,
 545 !            gpointer data UNUSED)
 546   {
 547       /* Skip this when the GUI isn't set up yet, will redraw later. */
 548       if (gui.starting)
 549 ***************
 550 *** 668,676 ****
 551   /*
 552    * Handle changes to the "Comm" property
 553    */
 554 - /*ARGSUSED2*/
 555       static gint
 556 ! property_event(GtkWidget *widget, GdkEventProperty *event, gpointer data)
 557   {
 558       if (event->type == GDK_PROPERTY_NOTIFY
 559             && event->state == (int)GDK_PROPERTY_NEW_VALUE
 560 --- 676,685 ----
 561   /*
 562    * Handle changes to the "Comm" property
 563    */
 564       static gint
 565 ! property_event(GtkWidget *widget,
 566 !              GdkEventProperty *event,
 567 !              gpointer data UNUSED)
 568   {
 569       if (event->type == GDK_PROPERTY_NOTIFY
 570             && event->state == (int)GDK_PROPERTY_NEW_VALUE
 571 ***************
 572 *** 740,748 ****
 573       blink_state = BLINK_NONE;
 574   }
 575
 576 - /*ARGSUSED*/
 577       static gint
 578 ! blink_cb(gpointer data)
 579   {
 580       if (blink_state == BLINK_ON)
 581       {
 582 --- 749,756 ----
 583       blink_state = BLINK_NONE;
 584   }
 585
 586       static gint
 587 ! blink_cb(gpointer data UNUSED)
 588   {
 589       if (blink_state == BLINK_ON)
 590       {
 591 ***************
 592 *** 781,789 ****
 593       }
 594   }
 595
 596 - /*ARGSUSED*/
 597       static gint
 598 ! enter_notify_event(GtkWidget *widget, GdkEventCrossing *event, gpointer data)
 599   {
 600       if (blink_state == BLINK_NONE)
 601         gui_mch_start_blink();
 602 --- 789,798 ----
 603       }
 604   }
 605
 606       static gint
 607 ! enter_notify_event(GtkWidget *widget UNUSED,
 608 !                  GdkEventCrossing *event UNUSED,
 609 !                  gpointer data UNUSED)
 610   {
 611       if (blink_state == BLINK_NONE)
 612         gui_mch_start_blink();
 613 ***************
 614 *** 795,803 ****
 615       return FALSE;
 616   }
 617
 618 - /*ARGSUSED*/
 619       static gint
 620 ! leave_notify_event(GtkWidget *widget, GdkEventCrossing *event, gpointer data)
 621   {
 622       if (blink_state != BLINK_NONE)
 623         gui_mch_stop_blink();
 624 --- 804,813 ----
 625       return FALSE;
 626   }
 627
 628       static gint
 629 ! leave_notify_event(GtkWidget *widget UNUSED,
 630 !                  GdkEventCrossing *event UNUSED,
 631 !                  gpointer data UNUSED)
 632   {
 633       if (blink_state != BLINK_NONE)
 634         gui_mch_stop_blink();
 635 ***************
 636 *** 805,813 ****
 637       return FALSE;
 638   }
 639
 640 - /*ARGSUSED*/
 641       static gint
 642 ! focus_in_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
 643   {
 644       gui_focus_change(TRUE);
 645
 646 --- 815,824 ----
 647       return FALSE;
 648   }
 649
 650       static gint
 651 ! focus_in_event(GtkWidget *widget,
 652 !              GdkEventFocus *event UNUSED,
 653 !              gpointer data UNUSED)
 654   {
 655       gui_focus_change(TRUE);
 656
 657 ***************
 658 *** 826,834 ****
 659       return TRUE;
 660   }
 661
 662 - /*ARGSUSED*/
 663       static gint
 664 ! focus_out_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
 665   {
 666       gui_focus_change(FALSE);
 667
 668 --- 837,846 ----
 669       return TRUE;
 670   }
 671
 672       static gint
 673 ! focus_out_event(GtkWidget *widget UNUSED,
 674 !               GdkEventFocus *event UNUSED,
 675 !               gpointer data UNUSED)
 676   {
 677       gui_focus_change(FALSE);
 678
 679 ***************
 680 *** 956,964 ****
 681   /*
 682    * Main keyboard handler:
 683    */
 684 - /*ARGSUSED*/
 685       static gint
 686 ! key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 687   {
 688   #ifdef HAVE_GTK2
 689       /* 256 bytes is way over the top, but for safety let's reduce it only
 690 --- 968,977 ----
 691   /*
 692    * Main keyboard handler:
 693    */
 694       static gint
 695 ! key_press_event(GtkWidget *widget UNUSED,
 696 !               GdkEventKey *event,
 697 !               gpointer data UNUSED)
 698   {
 699   #ifdef HAVE_GTK2
 700       /* 256 bytes is way over the top, but for safety let's reduce it only
 701 ***************
 702 *** 1225,1233 ****
 703   }
 704
 705   #if defined(FEAT_XIM) && defined(HAVE_GTK2)
 706 - /*ARGSUSED0*/
 707       static gboolean
 708 ! key_release_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 709   {
 710       /*
 711        * GTK+ 2 input methods may do fancy stuff on key release events too.
 712 --- 1238,1247 ----
 713   }
 714
 715   #if defined(FEAT_XIM) && defined(HAVE_GTK2)
 716       static gboolean
 717 ! key_release_event(GtkWidget *widget UNUSED,
 718 !                 GdkEventKey *event,
 719 !                 gpointer data UNUSED)
 720   {
 721       /*
 722        * GTK+ 2 input methods may do fancy stuff on key release events too.
 723 ***************
 724 *** 1243,1253 ****
 725    * Selection handlers:
 726    */
 727
 728 - /*ARGSUSED*/
 729       static gint
 730 ! selection_clear_event(GtkWidget               *widget,
 731                       GdkEventSelection *event,
 732 !                     gpointer          user_data)
 733   {
 734       if (event->selection == clip_plus.gtk_sel_atom)
 735         clip_lose_selection(&clip_plus);
 736 --- 1257,1266 ----
 737    * Selection handlers:
 738    */
 739
 740       static gint
 741 ! selection_clear_event(GtkWidget               *widget UNUSED,
 742                       GdkEventSelection *event,
 743 !                     gpointer          user_data UNUSED)
 744   {
 745       if (event->selection == clip_plus.gtk_sel_atom)
 746         clip_lose_selection(&clip_plus);
 747 ***************
 748 *** 1265,1276 ****
 749   #define RS_FAIL       2       /* selection_received_cb() called and failed */
 750   static int received_selection = RS_NONE;
 751
 752 - /*ARGSUSED*/
 753       static void
 754 ! selection_received_cb(GtkWidget               *widget,
 755                       GtkSelectionData  *data,
 756 !                     guint             time_,
 757 !                     gpointer          user_data)
 758   {
 759       VimClipboard    *cbd;
 760       char_u        *text;
 761 --- 1278,1288 ----
 762   #define RS_FAIL       2       /* selection_received_cb() called and failed */
 763   static int received_selection = RS_NONE;
 764
 765       static void
 766 ! selection_received_cb(GtkWidget               *widget UNUSED,
 767                       GtkSelectionData  *data,
 768 !                     guint             time_ UNUSED,
 769 !                     gpointer          user_data UNUSED)
 770   {
 771       VimClipboard    *cbd;
 772       char_u        *text;
 773 ***************
 774 *** 1414,1426 ****
 775    * Prepare our selection data for passing it to the external selection
 776    * client.
 777    */
 778 - /*ARGSUSED*/
 779       static void
 780 ! selection_get_cb(GtkWidget        *widget,
 781                  GtkSelectionData   *selection_data,
 782                  guint              info,
 783 !                guint              time_,
 784 !                gpointer           user_data)
 785   {
 786       char_u        *string;
 787       char_u        *tmpbuf;
 788 --- 1426,1437 ----
 789    * Prepare our selection data for passing it to the external selection
 790    * client.
 791    */
 792       static void
 793 ! selection_get_cb(GtkWidget        *widget UNUSED,
 794                  GtkSelectionData   *selection_data,
 795                  guint              info,
 796 !                guint              time_ UNUSED,
 797 !                gpointer           user_data UNUSED)
 798   {
 799       char_u        *string;
 800       char_u        *tmpbuf;
 801 ***************
 802 *** 1678,1684 ****
 803
 804         offshoot = dx > dy ? dx : dy;
 805
 806 !       /* Make a linearly declaying timer delay with a threshold of 5 at a
 807          * distance of 127 pixels from the main window.
 808          *
 809          * One could think endlessly about the most ergonomic variant here.
 810 --- 1689,1695 ----
 811
 812         offshoot = dx > dy ? dx : dy;
 813
 814 !       /* Make a linearly decaying timer delay with a threshold of 5 at a
 815          * distance of 127 pixels from the main window.
 816          *
 817          * One could think endlessly about the most ergonomic variant here.
 818 ***************
 819 *** 1707,1715 ****
 820   /*
 821    * Timer used to recognize multiple clicks of the mouse button.
 822    */
 823 - /*ARGSUSED0*/
 824       static gint
 825 ! motion_repeat_timer_cb(gpointer data)
 826   {
 827       int                   x;
 828       int                   y;
 829 --- 1718,1725 ----
 830   /*
 831    * Timer used to recognize multiple clicks of the mouse button.
 832    */
 833       static gint
 834 ! motion_repeat_timer_cb(gpointer data UNUSED)
 835   {
 836       int                   x;
 837       int                   y;
 838 ***************
 839 *** 1749,1757 ****
 840       return FALSE;
 841   }
 842
 843 - /*ARGSUSED2*/
 844       static gint
 845 ! motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data)
 846   {
 847       if (event->is_hint)
 848       {
 849 --- 1759,1768 ----
 850       return FALSE;
 851   }
 852
 853       static gint
 854 ! motion_notify_event(GtkWidget *widget,
 855 !                   GdkEventMotion *event,
 856 !                   gpointer data UNUSED)
 857   {
 858       if (event->is_hint)
 859       {
 860 ***************
 861 *** 1777,1785 ****
 862    * by our own timeout mechanism instead of the one provided by GTK+ itself.
 863    * This is due to the way the generic VIM code is recognizing multiple clicks.
 864    */
 865 - /*ARGSUSED2*/
 866       static gint
 867 ! button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
 868   {
 869       int button;
 870       int repeated_click = FALSE;
 871 --- 1788,1797 ----
 872    * by our own timeout mechanism instead of the one provided by GTK+ itself.
 873    * This is due to the way the generic VIM code is recognizing multiple clicks.
 874    */
 875       static gint
 876 ! button_press_event(GtkWidget *widget,
 877 !                  GdkEventButton *event,
 878 !                  gpointer data UNUSED)
 879   {
 880       int button;
 881       int repeated_click = FALSE;
 882 ***************
 883 *** 1855,1863 ****
 884    * GTK+ 2 doesn't handle mouse buttons 4, 5, 6 and 7 the same way as GTK+ 1.
 885    * Instead, it abstracts scrolling via the new GdkEventScroll.
 886    */
 887 - /*ARGSUSED2*/
 888       static gboolean
 889 ! scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data)
 890   {
 891       int           button;
 892       int_u   vim_modifiers;
 893 --- 1867,1876 ----
 894    * GTK+ 2 doesn't handle mouse buttons 4, 5, 6 and 7 the same way as GTK+ 1.
 895    * Instead, it abstracts scrolling via the new GdkEventScroll.
 896    */
 897       static gboolean
 898 ! scroll_event(GtkWidget *widget,
 899 !            GdkEventScroll *event,
 900 !            gpointer data UNUSED)
 901   {
 902       int           button;
 903       int_u   vim_modifiers;
 904 ***************
 905 *** 1896,1904 ****
 906   #endif /* HAVE_GTK2 */
 907
 908
 909 - /*ARGSUSED*/
 910       static gint
 911 ! button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
 912   {
 913       int x, y;
 914       int_u vim_modifiers;
 915 --- 1909,1918 ----
 916   #endif /* HAVE_GTK2 */
 917
 918
 919       static gint
 920 ! button_release_event(GtkWidget *widget UNUSED,
 921 !                    GdkEventButton *event,
 922 !                    gpointer data UNUSED)
 923   {
 924       int x, y;
 925       int_u vim_modifiers;
 926 ***************
 927 *** 2100,2106 ****
 928   /*
 929    * DND receiver.
 930    */
 931 - /*ARGSUSED2*/
 932       static void
 933   drag_data_received_cb(GtkWidget               *widget,
 934                       GdkDragContext    *context,
 935 --- 2114,2119 ----
 936 ***************
 937 *** 2109,2115 ****
 938                       GtkSelectionData  *data,
 939                       guint             info,
 940                       guint             time_,
 941 !                     gpointer          user_data)
 942   {
 943       GdkModifierType state;
 944
 945 --- 2122,2128 ----
 946                       GtkSelectionData  *data,
 947                       guint             info,
 948                       guint             time_,
 949 !                     gpointer          user_data UNUSED)
 950   {
 951       GdkModifierType state;
 952
 953 ***************
 954 *** 2143,2149 ****
 955    * be abandoned and pop up a dialog asking the user for confirmation if
 956    * necessary.
 957    */
 958 - /*ARGSUSED0*/
 959       static void
 960   sm_client_check_changed_any(GnomeClient           *client,
 961                             gint            key,
 962 --- 2156,2161 ----
 963 ***************
 964 *** 2251,2257 ****
 965    * for confirmation if necessary.  Save the current editing session and tell
 966    * the session manager how to restart Vim.
 967    */
 968 - /*ARGSUSED1*/
 969       static gboolean
 970   sm_client_save_yourself(GnomeClient       *client,
 971                         gint                phase,
 972 --- 2263,2268 ----
 973 ***************
 974 *** 2339,2345 ****
 975    * here since "save_yourself" has been emitted before (unless serious trouble
 976    * is happening).
 977    */
 978 - /*ARGSUSED0*/
 979       static void
 980   sm_client_die(GnomeClient *client, gpointer data)
 981   {
 982 --- 2350,2355 ----
 983 ***************
 984 *** 2379,2388 ****
 985   /*
 986    * GTK tells us that XSMP needs attention
 987    */
 988 - /*ARGSUSED*/
 989       static gboolean
 990   local_xsmp_handle_requests(source, condition, data)
 991 !     GIOChannel                *source;
 992       GIOCondition      condition;
 993       gpointer          data;
 994   {
 995 --- 2389,2397 ----
 996   /*
 997    * GTK tells us that XSMP needs attention
 998    */
 999       static gboolean
1000   local_xsmp_handle_requests(source, condition, data)
1001 !     GIOChannel                *source UNUSED;
1002       GIOCondition      condition;
1003       gpointer          data;
1004   {
1005 ***************
1006 *** 2480,2495 ****
1007    * WM_SAVE_YOURSELF hack it actually stores the session...  And yes,
1008    * it should work with KDE as well.
1009    */
1010 - /*ARGSUSED1*/
1011       static GdkFilterReturn
1012 ! global_event_filter(GdkXEvent *xev, GdkEvent *event, gpointer data)
1013   {
1014       XEvent *xevent = (XEvent *)xev;
1015
1016       if (xevent != NULL
1017             && xevent->type == ClientMessage
1018             && xevent->xclient.message_type == GET_X_ATOM(wm_protocols_atom)
1019 !           && xevent->xclient.data.l[0] == GET_X_ATOM(save_yourself_atom))
1020       {
1021         out_flush();
1022         ml_sync_all(FALSE, FALSE); /* preserve all swap files */
1023 --- 2489,2506 ----
1024    * WM_SAVE_YOURSELF hack it actually stores the session...  And yes,
1025    * it should work with KDE as well.
1026    */
1027       static GdkFilterReturn
1028 ! global_event_filter(GdkXEvent *xev,
1029 !                   GdkEvent *event UNUSED,
1030 !                   gpointer data UNUSED)
1031   {
1032       XEvent *xevent = (XEvent *)xev;
1033
1034       if (xevent != NULL
1035             && xevent->type == ClientMessage
1036             && xevent->xclient.message_type == GET_X_ATOM(wm_protocols_atom)
1037 !           && (long_u)xevent->xclient.data.l[0]
1038 !                                           == GET_X_ATOM(save_yourself_atom))
1039       {
1040         out_flush();
1041         ml_sync_all(FALSE, FALSE); /* preserve all swap files */
1042 ***************
1043 *** 2512,2518 ****
1044   /*
1045    * GDK handler for X ClientMessage events.
1046    */
1047 - /*ARGSUSED2*/
1048       static GdkFilterReturn
1049   gdk_wm_protocols_filter(GdkXEvent *xev, GdkEvent *event, gpointer data)
1050   {
1051 --- 2523,2528 ----
1052 ***************
1053 *** 2558,2566 ****
1054   /*
1055    * Setup the window icon & xcmdsrv comm after the main window has been realized.
1056    */
1057 - /*ARGSUSED*/
1058       static void
1059 ! mainwin_realize(GtkWidget *widget, gpointer data)
1060   {
1061   /* If you get an error message here, you still need to unpack the runtime
1062    * archive! */
1063 --- 2568,2575 ----
1064   /*
1065    * Setup the window icon & xcmdsrv comm after the main window has been realized.
1066    */
1067       static void
1068 ! mainwin_realize(GtkWidget *widget UNUSED, gpointer data UNUSED)
1069   {
1070   /* If you get an error message here, you still need to unpack the runtime
1071    * archive! */
1072 ***************
1073 *** 2712,2722 ****
1074   }
1075
1076   #ifdef HAVE_GTK_MULTIHEAD
1077 - /*ARGSUSED1*/
1078       static void
1079   mainwin_screen_changed_cb(GtkWidget  *widget,
1080 !                         GdkScreen  *previous_screen,
1081 !                         gpointer   data)
1082   {
1083       if (!gtk_widget_has_screen(widget))
1084         return;
1085 --- 2721,2730 ----
1086   }
1087
1088   #ifdef HAVE_GTK_MULTIHEAD
1089       static void
1090   mainwin_screen_changed_cb(GtkWidget  *widget,
1091 !                         GdkScreen  *previous_screen UNUSED,
1092 !                         gpointer   data UNUSED)
1093   {
1094       if (!gtk_widget_has_screen(widget))
1095         return;
1096 ***************
1097 *** 2757,2765 ****
1098    * Don't try to set any VIM scrollbar sizes anywhere here. I'm relying on the
1099    * fact that the main VIM engine doesn't take them into account anywhere.
1100    */
1101 - /*ARGSUSED1*/
1102       static void
1103 ! drawarea_realize_cb(GtkWidget *widget, gpointer data)
1104   {
1105       GtkWidget *sbar;
1106
1107 --- 2765,2772 ----
1108    * Don't try to set any VIM scrollbar sizes anywhere here. I'm relying on the
1109    * fact that the main VIM engine doesn't take them into account anywhere.
1110    */
1111       static void
1112 ! drawarea_realize_cb(GtkWidget *widget, gpointer data UNUSED)
1113   {
1114       GtkWidget *sbar;
1115
1116 ***************
1117 *** 2789,2797 ****
1118   /*
1119    * Properly clean up on shutdown.
1120    */
1121 - /*ARGSUSED0*/
1122       static void
1123 ! drawarea_unrealize_cb(GtkWidget *widget, gpointer data)
1124   {
1125       /* Don't write messages to the GUI anymore */
1126       full_screen = FALSE;
1127 --- 2796,2803 ----
1128   /*
1129    * Properly clean up on shutdown.
1130    */
1131       static void
1132 ! drawarea_unrealize_cb(GtkWidget *widget UNUSED, gpointer data UNUSED)
1133   {
1134       /* Don't write messages to the GUI anymore */
1135       full_screen = FALSE;
1136 ***************
1137 *** 2827,2837 ****
1138   #endif
1139   }
1140
1141 - /*ARGSUSED0*/
1142       static void
1143 ! drawarea_style_set_cb(GtkWidget       *widget,
1144 !                     GtkStyle  *previous_style,
1145 !                     gpointer  data)
1146   {
1147       gui_mch_new_colors();
1148   }
1149 --- 2833,2842 ----
1150   #endif
1151   }
1152
1153       static void
1154 ! drawarea_style_set_cb(GtkWidget       *widget UNUSED,
1155 !                     GtkStyle  *previous_style UNUSED,
1156 !                     gpointer  data UNUSED)
1157   {
1158       gui_mch_new_colors();
1159   }
1160 ***************
1161 *** 2840,2848 ****
1162    * Callback routine for the "delete_event" signal on the toplevel window.
1163    * Tries to vim gracefully, or refuses to exit with changed buffers.
1164    */
1165 - /*ARGSUSED*/
1166       static gint
1167 ! delete_event_cb(GtkWidget *widget, GdkEventAny *event, gpointer data)
1168   {
1169       gui_shell_closed();
1170       return TRUE;
1171 --- 2845,2854 ----
1172    * Callback routine for the "delete_event" signal on the toplevel window.
1173    * Tries to vim gracefully, or refuses to exit with changed buffers.
1174    */
1175       static gint
1176 ! delete_event_cb(GtkWidget *widget UNUSED,
1177 !               GdkEventAny *event UNUSED,
1178 !               gpointer data UNUSED)
1179   {
1180       gui_shell_closed();
1181       return TRUE;
1182 ***************
1183 *** 2964,2970 ****
1184
1185       /* At start-up, don't try to set the hints until the initial
1186        * values have been used (those that dictate our initial size)
1187 !      * Let forced (i.e., correct) values thruogh always.
1188        */
1189       if (!(force_width && force_height)  &&  init_window_hints_state > 0)
1190       {
1191 --- 2970,2976 ----
1192
1193       /* At start-up, don't try to set the hints until the initial
1194        * values have been used (those that dictate our initial size)
1195 !      * Let forced (i.e., correct) values through always.
1196        */
1197       if (!(force_width && force_height)  &&  init_window_hints_state > 0)
1198       {
1199 ***************
1200 *** 3142,3150 ****
1201   /*
1202    * Handle selecting an item in the tab line popup menu.
1203    */
1204 - /*ARGSUSED*/
1205       static void
1206 ! tabline_menu_handler(GtkMenuItem *item, gpointer user_data)
1207   {
1208       /* Add the string cmd into input buffer */
1209       send_tabline_menu_event(clicked_page, (int)(long)user_data);
1210 --- 3148,3155 ----
1211   /*
1212    * Handle selecting an item in the tab line popup menu.
1213    */
1214       static void
1215 ! tabline_menu_handler(GtkMenuItem *item UNUSED, gpointer user_data)
1216   {
1217       /* Add the string cmd into input buffer */
1218       send_tabline_menu_event(clicked_page, (int)(long)user_data);
1219 ***************
1220 *** 3244,3256 ****
1221   /*
1222    * Handle selecting one of the tabs.
1223    */
1224 - /*ARGSUSED*/
1225       static void
1226   on_select_tab(
1227 !       GtkNotebook     *notebook,
1228 !       GtkNotebookPage *page,
1229         gint            idx,
1230 !       gpointer        data)
1231   {
1232       if (!ignore_tabline_evt)
1233       {
1234 --- 3249,3260 ----
1235   /*
1236    * Handle selecting one of the tabs.
1237    */
1238       static void
1239   on_select_tab(
1240 !       GtkNotebook     *notebook UNUSED,
1241 !       GtkNotebookPage *page UNUSED,
1242         gint            idx,
1243 !       gpointer        data UNUSED)
1244   {
1245       if (!ignore_tabline_evt)
1246       {
1247 ***************
1248 *** 3784,3790 ****
1249   #endif
1250
1251       if (gtk_socket_id != 0)
1252 !       /* make sure keybord input can go to the drawarea */
1253         GTK_WIDGET_SET_FLAGS(gui.drawarea, GTK_CAN_FOCUS);
1254
1255       /*
1256 --- 3788,3794 ----
1257   #endif
1258
1259       if (gtk_socket_id != 0)
1260 !       /* make sure keyboard input can go to the drawarea */
1261         GTK_WIDGET_SET_FLAGS(gui.drawarea, GTK_CAN_FOCUS);
1262
1263       /*
1264 ***************
1265 *** 3922,3931 ****
1266   /*
1267    * This signal informs us about the need to rearrange our sub-widgets.
1268    */
1269 - /*ARGSUSED*/
1270       static gint
1271 ! form_configure_event(GtkWidget *widget, GdkEventConfigure *event,
1272 !                    gpointer data)
1273   {
1274       int usable_height = event->height;
1275
1276 --- 3926,3935 ----
1277   /*
1278    * This signal informs us about the need to rearrange our sub-widgets.
1279    */
1280       static gint
1281 ! form_configure_event(GtkWidget *widget UNUSED,
1282 !                    GdkEventConfigure *event,
1283 !                    gpointer data UNUSED)
1284   {
1285       int usable_height = event->height;
1286
1287 ***************
1288 *** 3948,3956 ****
1289    * We can't do much more here than to trying to preserve what had been done,
1290    * since the window is already inevitably going away.
1291    */
1292 - /*ARGSUSED0*/
1293       static void
1294 ! mainwin_destroy_cb(GtkObject *object, gpointer data)
1295   {
1296       /* Don't write messages to the GUI anymore */
1297       full_screen = FALSE;
1298 --- 3952,3959 ----
1299    * We can't do much more here than to trying to preserve what had been done,
1300    * since the window is already inevitably going away.
1301    */
1302       static void
1303 ! mainwin_destroy_cb(GtkObject *object UNUSED, gpointer data UNUSED)
1304   {
1305       /* Don't write messages to the GUI anymore */
1306       full_screen = FALSE;
1307 ***************
1308 *** 3980,3988 ****
1309    * scrollbar init.), actually do the standard hinst and stop the timer.
1310    * We'll not let the default hints be set while this timer's active.
1311    */
1312 - /*ARGSUSED*/
1313       static gboolean
1314 ! check_startup_plug_hints(gpointer data)
1315   {
1316       if (init_window_hints_state == 1)
1317       {
1318 --- 3983,3990 ----
1319    * scrollbar init.), actually do the standard hinst and stop the timer.
1320    * We'll not let the default hints be set while this timer's active.
1321    */
1322       static gboolean
1323 ! check_startup_plug_hints(gpointer data UNUSED)
1324   {
1325       if (init_window_hints_state == 1)
1326       {
1327 ***************
1328 *** 4055,4061 ****
1329             Columns = w;
1330         if (mask & HeightValue)
1331         {
1332 !           if (p_window > h - 1 || !option_was_set((char_u *)"window"))
1333                 p_window = h - 1;
1334             Rows = h;
1335         }
1336 --- 4057,4063 ----
1337             Columns = w;
1338         if (mask & HeightValue)
1339         {
1340 !           if (p_window > (long)h - 1 || !option_was_set((char_u *)"window"))
1341                 p_window = h - 1;
1342             Rows = h;
1343         }
1344 ***************
1345 *** 4229,4237 ****
1346   }
1347
1348
1349 - /*ARGSUSED0*/
1350       void
1351 ! gui_mch_exit(int rc)
1352   {
1353       if (gui.mainwin != NULL)
1354         gtk_widget_destroy(gui.mainwin);
1355 --- 4231,4238 ----
1356   }
1357
1358
1359       void
1360 ! gui_mch_exit(int rc UNUSED)
1361   {
1362       if (gui.mainwin != NULL)
1363         gtk_widget_destroy(gui.mainwin);
1364 ***************
1365 *** 4286,4292 ****
1366    * report the new size through form_configure_event().  That caused the window
1367    * layout to be messed up.
1368    */
1369 - /*ARGSUSED0*/
1370       static gboolean
1371   force_shell_resize_idle(gpointer data)
1372   {
1373 --- 4287,4292 ----
1374 ***************
1375 *** 4314,4325 ****
1376   /*
1377    * Set the windows size.
1378    */
1379 - /*ARGSUSED2*/
1380       void
1381   gui_mch_set_shellsize(int width, int height,
1382 !                     int min_width,  int min_height,
1383 !                     int base_width, int base_height,
1384 !                     int direction)
1385   {
1386   #ifndef HAVE_GTK2
1387       /* Hack: When the form already is at the desired size, the window might
1388 --- 4314,4324 ----
1389   /*
1390    * Set the windows size.
1391    */
1392       void
1393   gui_mch_set_shellsize(int width, int height,
1394 !                     int min_width UNUSED,  int min_height UNUSED,
1395 !                     int base_width UNUSED, int base_height UNUSED,
1396 !                     int direction UNUSED)
1397   {
1398   #ifndef HAVE_GTK2
1399       /* Hack: When the form already is at the desired size, the window might
1400 ***************
1401 *** 4413,4421 ****
1402   }
1403
1404   #if defined(FEAT_TITLE) || defined(PROTO)
1405 - /*ARGSUSED*/
1406       void
1407 ! gui_mch_settitle(char_u *title, char_u *icon)
1408   {
1409   # ifdef HAVE_GTK2
1410       if (title != NULL && output_conv.vc_type != CONV_NONE)
1411 --- 4412,4419 ----
1412   }
1413
1414   #if defined(FEAT_TITLE) || defined(PROTO)
1415       void
1416 ! gui_mch_settitle(char_u *title, char_u *icon UNUSED)
1417   {
1418   # ifdef HAVE_GTK2
1419       if (title != NULL && output_conv.vc_type != CONV_NONE)
1420 ***************
1421 *** 4493,4499 ****
1422    * Get a font structure for highlighting.
1423    * "cbdata" is a pointer to the global gui structure.
1424    */
1425 - /*ARGSUSED*/
1426       static void
1427   font_sel_ok(GtkWidget *wgt, gpointer cbdata)
1428   {
1429 --- 4491,4496 ----
1430 ***************
1431 *** 4509,4515 ****
1432         gtk_main_quit();
1433   }
1434
1435 - /*ARGSUSED*/
1436       static void
1437   font_sel_cancel(GtkWidget *wgt, gpointer cbdata)
1438   {
1439 --- 4506,4511 ----
1440 ***************
1441 *** 4520,4526 ****
1442         gtk_main_quit();
1443   }
1444
1445 - /*ARGSUSED*/
1446       static void
1447   font_sel_destroy(GtkWidget *wgt, gpointer cbdata)
1448   {
1449 --- 4516,4521 ----
1450 ***************
1451 *** 4620,4626 ****
1452   /*
1453    * Try to load the requested fontset.
1454    */
1455 - /*ARGSUSED2*/
1456       GuiFontset
1457   gui_mch_get_fontset(char_u *name, int report_error, int fixed_width)
1458   {
1459 --- 4615,4620 ----
1460 ***************
1461 *** 4863,4869 ****
1462       styled_font[1] = &gui.ital_font;
1463       styled_font[2] = &gui.boldital_font;
1464
1465 !     /* First free whatever was freviously there. */
1466       for (i = 0; i < 3; ++i)
1467         if (*styled_font[i])
1468         {
1469 --- 4857,4863 ----
1470       styled_font[1] = &gui.ital_font;
1471       styled_font[2] = &gui.boldital_font;
1472
1473 !     /* First free whatever was previously there. */
1474       for (i = 0; i < 3; ++i)
1475         if (*styled_font[i])
1476         {
1477 ***************
1478 *** 5012,5020 ****
1479    * Initialize Vim to use the font or fontset with the given name.
1480    * Return FAIL if the font could not be loaded, OK otherwise.
1481    */
1482 - /*ARGSUSED1*/
1483       int
1484 ! gui_mch_init_font(char_u *font_name, int fontset)
1485   {
1486   #ifdef HAVE_GTK2
1487       PangoFontDescription    *font_desc;
1488 --- 5006,5013 ----
1489    * Initialize Vim to use the font or fontset with the given name.
1490    * Return FAIL if the font could not be loaded, OK otherwise.
1491    */
1492       int
1493 ! gui_mch_init_font(char_u *font_name, int fontset UNUSED)
1494   {
1495   #ifdef HAVE_GTK2
1496       PangoFontDescription    *font_desc;
1497 ***************
1498 *** 5326,5334 ****
1499   /*
1500    * Return the name of font "font" in allocated memory.
1501    */
1502 - /*ARGSUSED*/
1503       char_u *
1504 ! gui_mch_get_fontname(GuiFont font, char_u *name)
1505   {
1506   # ifdef HAVE_GTK2
1507       if (font != NOFONT)
1508 --- 5319,5326 ----
1509   /*
1510    * Return the name of font "font" in allocated memory.
1511    */
1512       char_u *
1513 ! gui_mch_get_fontname(GuiFont font, char_u *name UNUSED)
1514   {
1515   # ifdef HAVE_GTK2
1516       if (font != NOFONT)
1517 ***************
1518 *** 5732,5738 ****
1519   {
1520       int                       i;
1521       int                       offset;
1522 !     const static int  val[8] = {1, 0, 0, 0, 1, 2, 2, 2 };
1523       int                       y = FILL_Y(row + 1) - 1;
1524
1525       /* Undercurl: draw curl at the bottom of the character cell. */
1526 --- 5724,5730 ----
1527   {
1528       int                       i;
1529       int                       offset;
1530 !     static const int  val[8] = {1, 0, 0, 0, 1, 2, 2, 2 };
1531       int                       y = FILL_Y(row + 1) - 1;
1532
1533       /* Undercurl: draw curl at the bottom of the character cell. */
1534 ***************
1535 *** 6402,6408 ****
1536   /*
1537    * Callback function, used when data is available on the SNiFF connection.
1538    */
1539 - /* ARGSUSED */
1540       static void
1541   sniff_request_cb(
1542       gpointer  data,
1543 --- 6394,6399 ----
1544 ***************
1545 *** 6711,6719 ****
1546   /*
1547    * Disown the selection.
1548    */
1549 - /*ARGSUSED*/
1550       void
1551 ! clip_mch_lose_selection(VimClipboard *cbd)
1552   {
1553       /* WEIRD: when using NULL to actually disown the selection, we lose the
1554        * selection the first time we own it. */
1555 --- 6702,6709 ----
1556   /*
1557    * Disown the selection.
1558    */
1559       void
1560 ! clip_mch_lose_selection(VimClipboard *cbd UNUSED)
1561   {
1562       /* WEIRD: when using NULL to actually disown the selection, we lose the
1563        * selection the first time we own it. */
1564 ***************
1565 *** 6741,6749 ****
1566    * Send the current selection to the clipboard.  Do nothing for X because we
1567    * will fill in the selection only when requested by another app.
1568    */
1569 - /*ARGSUSED*/
1570       void
1571 ! clip_mch_set_selection(VimClipboard *cbd)
1572   {
1573   }
1574
1575 --- 6731,6738 ----
1576    * Send the current selection to the clipboard.  Do nothing for X because we
1577    * will fill in the selection only when requested by another app.
1578    */
1579       void
1580 ! clip_mch_set_selection(VimClipboard *cbd UNUSED)
1581   {
1582   }
1583
1584 ***************
1585 *** 6950,6956 ****
1586             else
1587                 id &= ~1;       /* they are always even (why?) */
1588         }
1589 !       else if (shape < sizeof(mshape_ids) / sizeof(int))
1590             id = mshape_ids[shape];
1591         else
1592             return;
1593 --- 6939,6945 ----
1594             else
1595                 id &= ~1;       /* they are always even (why?) */
1596         }
1597 !       else if (shape < (int)(sizeof(mshape_ids) / sizeof(int)))
1598             id = mshape_ids[shape];
1599         else
1600             return;
1601 *** ../vim-7.2.180/src/gui_gtk_f.c      2007-05-10 19:50:33.000000000 +0200
1602 --- src/gui_gtk_f.c     2009-05-17 15:48:51.000000000 +0200
1603 ***************
1604 *** 227,240 ****
1605
1606       if (!form_type)
1607       {
1608 !       GtkTypeInfo form_info =
1609 !       {
1610 !           "GtkForm",
1611 !           sizeof(GtkForm),
1612 !           sizeof(GtkFormClass),
1613 !           (GtkClassInitFunc) gtk_form_class_init,
1614 !           (GtkObjectInitFunc) gtk_form_init
1615 !       };
1616
1617         form_type = gtk_type_unique(GTK_TYPE_CONTAINER, &form_info);
1618       }
1619 --- 227,239 ----
1620
1621       if (!form_type)
1622       {
1623 !       GtkTypeInfo form_info;
1624 !
1625 !       form_info.type_name = "GtkForm";
1626 !       form_info.object_size = sizeof(GtkForm);
1627 !       form_info.class_size = sizeof(GtkFormClass);
1628 !       form_info.class_init_func = (GtkClassInitFunc)gtk_form_class_init;
1629 !       form_info.object_init_func = (GtkObjectInitFunc)gtk_form_init;
1630
1631         form_type = gtk_type_unique(GTK_TYPE_CONTAINER, &form_info);
1632       }
1633 ***************
1634 *** 611,620 ****
1635       }
1636   }
1637
1638 - /*ARGSUSED1*/
1639       static void
1640   gtk_form_forall(GtkContainer  *container,
1641 !               gboolean        include_internals,
1642                 GtkCallback     callback,
1643                 gpointer        callback_data)
1644   {
1645 --- 610,618 ----
1646       }
1647   }
1648
1649       static void
1650   gtk_form_forall(GtkContainer  *container,
1651 !               gboolean        include_internals UNUSED,
1652                 GtkCallback     callback,
1653                 gpointer        callback_data)
1654   {
1655 ***************
1656 *** 786,794 ****
1657    * them or discards them, depending on whether we are obscured
1658    * or not.
1659    */
1660 - /*ARGSUSED1*/
1661       static GdkFilterReturn
1662 ! gtk_form_filter(GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
1663   {
1664       XEvent *xevent;
1665       GtkForm *form;
1666 --- 784,791 ----
1667    * them or discards them, depending on whether we are obscured
1668    * or not.
1669    */
1670       static GdkFilterReturn
1671 ! gtk_form_filter(GdkXEvent *gdk_xevent, GdkEvent *event UNUSED, gpointer data)
1672   {
1673       XEvent *xevent;
1674       GtkForm *form;
1675 ***************
1676 *** 821,829 ****
1677    * there is no corresponding event in GTK, so we have
1678    * to get the events from a filter
1679    */
1680 - /*ARGSUSED1*/
1681       static GdkFilterReturn
1682 ! gtk_form_main_filter(GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
1683   {
1684       XEvent *xevent;
1685       GtkForm *form;
1686 --- 818,827 ----
1687    * there is no corresponding event in GTK, so we have
1688    * to get the events from a filter
1689    */
1690       static GdkFilterReturn
1691 ! gtk_form_main_filter(GdkXEvent *gdk_xevent,
1692 !                    GdkEvent *event UNUSED,
1693 !                    gpointer data)
1694   {
1695       XEvent *xevent;
1696       GtkForm *form;
1697 ***************
1698 *** 911,919 ****
1699   #endif
1700   }
1701
1702 - /*ARGSUSED0*/
1703       static void
1704 ! gtk_form_child_map(GtkWidget *widget, gpointer user_data)
1705   {
1706       GtkFormChild *child;
1707
1708 --- 909,916 ----
1709   #endif
1710   }
1711
1712       static void
1713 ! gtk_form_child_map(GtkWidget *widget UNUSED, gpointer user_data)
1714   {
1715       GtkFormChild *child;
1716
1717 ***************
1718 *** 923,931 ****
1719       gdk_window_show(child->window);
1720   }
1721
1722 - /*ARGSUSED0*/
1723       static void
1724 ! gtk_form_child_unmap(GtkWidget *widget, gpointer user_data)
1725   {
1726       GtkFormChild *child;
1727
1728 --- 920,927 ----
1729       gdk_window_show(child->window);
1730   }
1731
1732       static void
1733 ! gtk_form_child_unmap(GtkWidget *widget UNUSED, gpointer user_data)
1734   {
1735       GtkFormChild *child;
1736
1737 *** ../vim-7.2.180/src/gui_beval.c      2009-03-18 12:20:35.000000000 +0100
1738 --- src/gui_beval.c     2009-05-17 15:53:22.000000000 +0200
1739 ***************
1740 *** 15,21 ****
1741   /*
1742    * Common code, invoked when the mouse is resting for a moment.
1743    */
1744 - /*ARGSUSED*/
1745       void
1746   general_beval_cb(beval, state)
1747       BalloonEval *beval;
1748 --- 15,20 ----
1749 ***************
1750 *** 551,559 ****
1751       return FALSE; /* continue emission */
1752   }
1753
1754 - /*ARGSUSED*/
1755       static gint
1756 ! mainwin_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
1757   {
1758       BalloonEval *beval = (BalloonEval *)data;
1759
1760 --- 550,557 ----
1761       return FALSE; /* continue emission */
1762   }
1763
1764       static gint
1765 ! mainwin_event_cb(GtkWidget *widget UNUSED, GdkEvent *event, gpointer data)
1766   {
1767       BalloonEval *beval = (BalloonEval *)data;
1768
1769 ***************
1770 *** 663,671 ****
1771       return FALSE; /* don't call me again */
1772   }
1773
1774 - /*ARGSUSED2*/
1775       static gint
1776 ! balloon_expose_event_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data)
1777   {
1778       gtk_paint_flat_box(widget->style, widget->window,
1779                        GTK_STATE_NORMAL, GTK_SHADOW_OUT,
1780 --- 661,670 ----
1781       return FALSE; /* don't call me again */
1782   }
1783
1784       static gint
1785 ! balloon_expose_event_cb(GtkWidget *widget,
1786 !                       GdkEventExpose *event,
1787 !                       gpointer data UNUSED)
1788   {
1789       gtk_paint_flat_box(widget->style, widget->window,
1790                        GTK_STATE_NORMAL, GTK_SHADOW_OUT,
1791 ***************
1792 *** 676,682 ****
1793   }
1794
1795   # ifndef HAVE_GTK2
1796 - /*ARGSUSED2*/
1797       static void
1798   balloon_draw_cb(GtkWidget *widget, GdkRectangle *area, gpointer data)
1799   {
1800 --- 675,680 ----
1801 ***************
1802 *** 726,732 ****
1803   /*
1804    * The X event handler. All it does is call the real event handler.
1805    */
1806 - /*ARGSUSED*/
1807       static void
1808   pointerEventEH(w, client_data, event, unused)
1809       Widget    w;
1810 --- 724,729 ----
1811 ***************
1812 *** 877,883 ****
1813       }
1814   }
1815
1816 - /*ARGSUSED*/
1817       static void
1818   timerRoutine(dx, id)
1819       XtPointer     dx;
1820 --- 874,879 ----
1821 *** ../vim-7.2.180/src/netbeans.c       2009-02-21 22:12:43.000000000 +0100
1822 --- src/netbeans.c      2009-05-17 15:51:14.000000000 +0200
1823 ***************
1824 *** 700,706 ****
1825   /*
1826    * Read and process a command from netbeans.
1827    */
1828 - /*ARGSUSED*/
1829   #if defined(FEAT_GUI_W32) || defined(PROTO)
1830   /* Use this one when generating prototypes, the others are static. */
1831       void
1832 --- 700,705 ----
1833 ***************
1834 *** 708,719 ****
1835   #else
1836   # ifdef FEAT_GUI_MOTIF
1837       static void
1838 ! messageFromNetbeans(XtPointer clientData, int *unused1, XtInputId *unused2)
1839   # endif
1840   # ifdef FEAT_GUI_GTK
1841       static void
1842 ! messageFromNetbeans(gpointer clientData, gint unused1,
1843 !                                                   GdkInputCondition unused2)
1844   # endif
1845   #endif
1846   {
1847 --- 707,721 ----
1848   #else
1849   # ifdef FEAT_GUI_MOTIF
1850       static void
1851 ! messageFromNetbeans(XtPointer clientData UNUSED
1852 !                   int *unused1 UNUSED,
1853 !                   XtInputId *unused2 UNUSED)
1854   # endif
1855   # ifdef FEAT_GUI_GTK
1856       static void
1857 ! messageFromNetbeans(gpointer clientData UNUSED,
1858 !                   gint unused1 UNUSED,
1859 !                   GdkInputCondition unused2 UNUSED)
1860   # endif
1861   #endif
1862   {
1863 ***************
1864 *** 1585,1591 ****
1865 --- 1587,1595 ----
1866                             buf_delsign(buf->bufp, id);
1867                         }
1868                         else
1869 +                       {
1870                             nbdebug(("    No sign on line %d\n", i));
1871 +                       }
1872                     }
1873
1874                     nbdebug(("    Deleting lines %d through %d\n", del_from_lnum, del_to_lnum));
1875 ***************
1876 *** 2144,2150 ****
1877 --- 2148,2156 ----
1878   #endif
1879             }
1880             else
1881 +           {
1882                 nbdebug(("    BAD POSITION in setDot: %s\n", s));
1883 +           }
1884
1885             /* gui_update_cursor(TRUE, FALSE); */
1886             /* update_curbuf(NOT_VALID); */
1887 ***************
1888 *** 2744,2754 ****
1889    * cursor and sends it to the debugger for evaluation.  The debugger should
1890    * respond with a showBalloon command when there is a useful result.
1891    */
1892 - /*ARGSUSED*/
1893       void
1894   netbeans_beval_cb(
1895         BalloonEval     *beval,
1896 !       int              state)
1897   {
1898       win_T     *wp;
1899       char_u    *text;
1900 --- 2750,2759 ----
1901    * cursor and sends it to the debugger for evaluation.  The debugger should
1902    * respond with a showBalloon command when there is a useful result.
1903    */
1904       void
1905   netbeans_beval_cb(
1906         BalloonEval     *beval,
1907 !       int              state UNUSED)
1908   {
1909       win_T     *wp;
1910       char_u    *text;
1911 ***************
1912 *** 3061,3069 ****
1913   /*
1914    * Send netbeans an unmodufied command.
1915    */
1916 - /*ARGSUSED*/
1917       void
1918 ! netbeans_unmodified(buf_T *bufp)
1919   {
1920   #if 0
1921       char_u    buf[128];
1922 --- 3066,3073 ----
1923   /*
1924    * Send netbeans an unmodufied command.
1925    */
1926       void
1927 ! netbeans_unmodified(buf_T *bufp UNUSED)
1928   {
1929   #if 0
1930       char_u    buf[128];
1931 ***************
1932 *** 3370,3382 ****
1933    * buf->signmapused[] maps buffer-local annotation IDs to an index in
1934    *                    globalsignmap[].
1935    */
1936 - /*ARGSUSED*/
1937       static void
1938   addsigntype(
1939       nbbuf_T   *buf,
1940       int               typeNum,
1941       char_u    *typeName,
1942 !     char_u    *tooltip,
1943       char_u    *glyphFile,
1944       int               use_fg,
1945       int               fg,
1946 --- 3374,3385 ----
1947    * buf->signmapused[] maps buffer-local annotation IDs to an index in
1948    *                    globalsignmap[].
1949    */
1950       static void
1951   addsigntype(
1952       nbbuf_T   *buf,
1953       int               typeNum,
1954       char_u    *typeName,
1955 !     char_u    *tooltip UNUSED,
1956       char_u    *glyphFile,
1957       int               use_fg,
1958       int               fg,
1959 *** ../vim-7.2.180/src/version.c        2009-05-17 13:30:58.000000000 +0200
1960 --- src/version.c       2009-05-17 16:07:26.000000000 +0200
1961 ***************
1962 *** 678,679 ****
1963 --- 678,681 ----
1964   {   /* Add new patch number below this line */
1965 + /**/
1966 +     181,
1967   /**/
1968
1969 --
1970 I am always surprised in the Linux world how quickly solutions can be
1971 obtained.  (Imagine sending an email to Bill Gates, asking why Windows
1972 crashed, and how to fix it...  and then getting an answer that fixed the
1973 problem... <0>_<0> !)                         -- Mark Langdon
1974
1975  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
1976 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
1977 \\\        download, build and distribute -- http://www.A-A-P.org        ///
1978  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///