7.2.184

   1 To: vim-dev@vim.org
   2 Subject: Patch 7.2.184
   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.184
  11 Problem:    Some more compiler warnings when using gcc -Wextra.
  12 Solution:   Add UNUSED and type casts.  Autoconf check for wchar_t.
  13 Files:      src/auto/configure, src/config.h.in, src/configure.in,
  14             src/gui_athena.c, src/gui_x11.c, src/gui.c, src/gui_beval.c,
  15             src/gui_at_sb.c, src/gui_at_fs.c, src/gui_motif.c,
  16             src/gui_xmdlg.c, src/gui_xmebw.c, src/if_python.c, src/window.c,
  17             src/workshop.c
  18
  19
  20 *** ../vim-7.2.183/src/auto/configure   2009-05-21 15:19:59.000000000 +0200
  21 --- src/auto/configure  2009-05-21 16:05:01.000000000 +0200
  22 ***************
  23 *** 7977,7982 ****
  24 --- 7977,8058 ----
  25
  26       LDFLAGS="$ac_save_LDFLAGS"
  27
  28 +     { $as_echo "$as_me:$LINENO: checking size of wchar_t is 2 bytes" >&5
  29 + $as_echo_n "checking size of wchar_t is 2 bytes... " >&6; }
  30 +     if test "${ac_cv_small_wchar_t+set}" = set; then
  31 +   $as_echo_n "(cached) " >&6
  32 + else
  33 +   if test "$cross_compiling" = yes; then
  34 +   { { $as_echo "$as_me:$LINENO: error: failed to compile test program" >&5
  35 + $as_echo "$as_me: error: failed to compile test program" >&2;}
  36 +    { (exit 1); exit 1; }; }
  37 + else
  38 +   cat >conftest.$ac_ext <<_ACEOF
  39 + /* confdefs.h.  */
  40 + _ACEOF
  41 + cat confdefs.h >>conftest.$ac_ext
  42 + cat >>conftest.$ac_ext <<_ACEOF
  43 + /* end confdefs.h.  */
  44 +
  45 + #include <X11/Xlib.h>
  46 + #if STDC_HEADERS
  47 + # include <stdlib.h>
  48 + # include <stddef.h>
  49 + #endif
  50 +               main()
  51 +               {
  52 +                 if (sizeof(wchar_t) <= 2)
  53 +                   exit(1);
  54 +                 exit(0);
  55 +               }
  56 + _ACEOF
  57 + rm -f conftest$ac_exeext
  58 + if { (ac_try="$ac_link"
  59 + case "(($ac_try" in
  60 +   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  61 +   *) ac_try_echo=$ac_try;;
  62 + esac
  63 + eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  64 + $as_echo "$ac_try_echo") >&5
  65 +   (eval "$ac_link") 2>&5
  66 +   ac_status=$?
  67 +   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  68 +   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
  69 +   { (case "(($ac_try" in
  70 +   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  71 +   *) ac_try_echo=$ac_try;;
  72 + esac
  73 + eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  74 + $as_echo "$ac_try_echo") >&5
  75 +   (eval "$ac_try") 2>&5
  76 +   ac_status=$?
  77 +   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  78 +   (exit $ac_status); }; }; then
  79 +   ac_cv_small_wchar_t="no"
  80 + else
  81 +   $as_echo "$as_me: program exited with status $ac_status" >&5
  82 + $as_echo "$as_me: failed program was:" >&5
  83 + sed 's/^/| /' conftest.$ac_ext >&5
  84 +
  85 + ( exit $ac_status )
  86 + ac_cv_small_wchar_t="yes"
  87 + fi
  88 + rm -rf conftest.dSYM
  89 + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  90 + fi
  91 +
  92 +
  93 + fi
  94 +
  95 +     { $as_echo "$as_me:$LINENO: result: $ac_cv_small_wchar_t" >&5
  96 + $as_echo "$ac_cv_small_wchar_t" >&6; }
  97 +     if test "x$ac_cv_small_wchar_t" = "xyes" ; then
  98 +       cat >>confdefs.h <<\_ACEOF
  99 + #define SMALL_WCHAR_T 1
 100 + _ACEOF
 101 +
 102 +     fi
 103 +
 104     fi
 105   fi
 106
 107 ***************
 108 *** 15417,15423 ****
 109
 110
 111
 112 -
 113   bcopy_test_prog='
 114   #include "confdefs.h"
 115   #ifdef HAVE_STRING_H
 116 --- 15493,15498 ----
 117 *** ../vim-7.2.183/src/config.h.in      2009-05-14 22:19:19.000000000 +0200
 118 --- src/config.h.in     2009-05-21 15:44:24.000000000 +0200
 119 ***************
 120 *** 39,44 ****
 121 --- 39,47 ----
 122   /* Defined to the size of an int */
 123   #undef SIZEOF_INT
 124
 125 + /* Define when wchar_t is only 2 bytes. */
 126 + #undef SMALL_WCHAR_T
 127 +
 128   /*
 129    * If we cannot trust one of the following from the libraries, we use our
 130    * own safe but probably slower vim_memmove().
 131 *** ../vim-7.2.183/src/configure.in     2009-05-21 15:19:59.000000000 +0200
 132 --- src/configure.in    2009-05-21 16:04:56.000000000 +0200
 133 ***************
 134 *** 1193,1198 ****
 135 --- 1193,1220 ----
 136
 137       LDFLAGS="$ac_save_LDFLAGS"
 138
 139 +     AC_MSG_CHECKING(size of wchar_t is 2 bytes)
 140 +     AC_CACHE_VAL(ac_cv_small_wchar_t,
 141 +       [AC_TRY_RUN([
 142 + #include <X11/Xlib.h>
 143 + #if STDC_HEADERS
 144 + # include <stdlib.h>
 145 + # include <stddef.h>
 146 + #endif
 147 +               main()
 148 +               {
 149 +                 if (sizeof(wchar_t) <= 2)
 150 +                   exit(1);
 151 +                 exit(0);
 152 +               }],
 153 +               ac_cv_small_wchar_t="no",
 154 +               ac_cv_small_wchar_t="yes",
 155 +               AC_MSG_ERROR(failed to compile test program))])
 156 +     AC_MSG_RESULT($ac_cv_small_wchar_t)
 157 +     if test "x$ac_cv_small_wchar_t" = "xyes" ; then
 158 +       AC_DEFINE(SMALL_WCHAR_T)
 159 +     fi
 160 +
 161     fi
 162   fi
 163
 164 ***************
 165 *** 2881,2887 ****
 166   AC_MSG_RESULT($ac_cv_sizeof_int)
 167   AC_DEFINE_UNQUOTED(SIZEOF_INT, $ac_cv_sizeof_int)
 168
 169 -
 170   dnl Check for memmove() before bcopy(), makes memmove() be used when both are
 171   dnl present, fixes problem with incompatibility between Solaris 2.4 and 2.5.
 172
 173 --- 2903,2908 ----
 174 *** ../vim-7.2.183/src/gui_athena.c     2008-06-24 23:00:51.000000000 +0200
 175 --- src/gui_athena.c    2009-05-21 16:39:43.000000000 +0200
 176 ***************
 177 *** 86,95 ****
 178    * Scrollbar callback (XtNjumpProc) for when the scrollbar is dragged with the
 179    * left or middle mouse button.
 180    */
 181 - /* ARGSUSED */
 182       static void
 183   gui_athena_scroll_cb_jump(w, client_data, call_data)
 184 !     Widget    w;
 185       XtPointer client_data, call_data;
 186   {
 187       scrollbar_T *sb, *sb_info;
 188 --- 86,94 ----
 189    * Scrollbar callback (XtNjumpProc) for when the scrollbar is dragged with the
 190    * left or middle mouse button.
 191    */
 192       static void
 193   gui_athena_scroll_cb_jump(w, client_data, call_data)
 194 !     Widget    w UNUSED;
 195       XtPointer client_data, call_data;
 196   {
 197       scrollbar_T *sb, *sb_info;
 198 ***************
 199 *** 122,131 ****
 200    * Scrollbar callback (XtNscrollProc) for paging up or down with the left or
 201    * right mouse buttons.
 202    */
 203 - /* ARGSUSED */
 204       static void
 205   gui_athena_scroll_cb_scroll(w, client_data, call_data)
 206 !     Widget    w;
 207       XtPointer client_data, call_data;
 208   {
 209       scrollbar_T *sb, *sb_info;
 210 --- 121,129 ----
 211    * Scrollbar callback (XtNscrollProc) for paging up or down with the left or
 212    * right mouse buttons.
 213    */
 214       static void
 215   gui_athena_scroll_cb_scroll(w, client_data, call_data)
 216 !     Widget    w UNUSED;
 217       XtPointer client_data, call_data;
 218   {
 219       scrollbar_T *sb, *sb_info;
 220 ***************
 221 *** 492,498 ****
 222       if (menu->icon_builtin || gui_find_bitmap(menu->name, buf, "xpm") == FAIL)
 223       {
 224         if (menu->iconidx >= 0 && menu->iconidx
 225 !                  < (sizeof(built_in_pixmaps) / sizeof(built_in_pixmaps[0])))
 226             xpm = built_in_pixmaps[menu->iconidx];
 227         else
 228             xpm = tb_blank_xpm;
 229 --- 490,496 ----
 230       if (menu->icon_builtin || gui_find_bitmap(menu->name, buf, "xpm") == FAIL)
 231       {
 232         if (menu->iconidx >= 0 && menu->iconidx
 233 !             < (int)(sizeof(built_in_pixmaps) / sizeof(built_in_pixmaps[0])))
 234             xpm = built_in_pixmaps[menu->iconidx];
 235         else
 236             xpm = tb_blank_xpm;
 237 ***************
 238 *** 763,769 ****
 239       XtGetValues(XtParent(widget), args, n);
 240
 241       retval = num_children;
 242 !     for (i = 0; i < num_children; ++i)
 243       {
 244         Widget  current = children[i];
 245         vimmenu_T       *menu = NULL;
 246 --- 761,767 ----
 247       XtGetValues(XtParent(widget), args, n);
 248
 249       retval = num_children;
 250 !     for (i = 0; i < (int)num_children; ++i)
 251       {
 252         Widget  current = children[i];
 253         vimmenu_T       *menu = NULL;
 254 ***************
 255 *** 780,790 ****
 256       return retval;
 257   }
 258
 259 - /* ARGSUSED */
 260       void
 261   gui_mch_add_menu(menu, idx)
 262       vimmenu_T *menu;
 263 !     int               idx;
 264   {
 265       char_u    *pullright_name;
 266       Dimension height, space, border;
 267 --- 778,787 ----
 268       return retval;
 269   }
 270
 271       void
 272   gui_mch_add_menu(menu, idx)
 273       vimmenu_T *menu;
 274 !     int               idx UNUSED;
 275   {
 276       char_u    *pullright_name;
 277       Dimension height, space, border;
 278 ***************
 279 *** 869,875 ****
 280             XtVaGetValues(parent->submenu_id, XtNchildren, &children,
 281                                               XtNnumChildren, &num_children,
 282                                               NULL);
 283 !           for (i = 0; i < num_children; ++i)
 284             {
 285                 XtVaSetValues(children[i],
 286                               XtNrightMargin, puller_width,
 287 --- 866,872 ----
 288             XtVaGetValues(parent->submenu_id, XtNchildren, &children,
 289                                               XtNnumChildren, &num_children,
 290                                               NULL);
 291 !           for (i = 0; i < (int)num_children; ++i)
 292             {
 293                 XtVaSetValues(children[i],
 294                               XtNrightMargin, puller_width,
 295 ***************
 296 *** 913,919 ****
 297       XtVaGetValues(id, XtNchildren, &children,
 298                       XtNnumChildren, &num_children,
 299                       NULL);
 300 !     for (i = 0; i < num_children; ++i)
 301       {
 302         if (children[i] == ignore)
 303             continue;
 304 --- 910,916 ----
 305       XtVaGetValues(id, XtNchildren, &children,
 306                       XtNnumChildren, &num_children,
 307                       NULL);
 308 !     for (i = 0; i < (int)num_children; ++i)
 309       {
 310         if (children[i] == ignore)
 311             continue;
 312 ***************
 313 *** 1175,1185 ****
 314       return pname;
 315   }
 316
 317 - /* ARGSUSED */
 318       void
 319   gui_mch_add_menu_item(menu, idx)
 320       vimmenu_T *menu;
 321 !     int               idx;
 322   {
 323       vimmenu_T *parent = menu->parent;
 324
 325 --- 1172,1181 ----
 326       return pname;
 327   }
 328
 329       void
 330   gui_mch_add_menu_item(menu, idx)
 331       vimmenu_T *menu;
 332 !     int               idx UNUSED;
 333   {
 334       vimmenu_T *parent = menu->parent;
 335
 336 ***************
 337 *** 1444,1450 ****
 338                 XtNchildren,        &children,
 339                 XtNnumChildren,     &numChildren,
 340                 NULL);
 341 !       for (i = 0; i < numChildren; i++)
 342         {
 343             whgt = 0;
 344
 345 --- 1440,1446 ----
 346                 XtNchildren,        &children,
 347                 XtNnumChildren,     &numChildren,
 348                 NULL);
 349 !       for (i = 0; i < (int)numChildren; i++)
 350         {
 351             whgt = 0;
 352
 353 ***************
 354 *** 1473,1482 ****
 355   #endif
 356
 357
 358 - /* ARGSUSED */
 359       void
 360   gui_mch_toggle_tearoffs(enable)
 361 !     int               enable;
 362   {
 363       /* no tearoff menus */
 364   }
 365 --- 1469,1477 ----
 366   #endif
 367
 368
 369       void
 370   gui_mch_toggle_tearoffs(enable)
 371 !     int               enable UNUSED;
 372   {
 373       /* no tearoff menus */
 374   }
 375 ***************
 376 *** 1537,1543 ****
 377             else
 378                 get_left_margin = True;
 379
 380 !           for (i = 0; i < num_children; ++i)
 381             {
 382                 if (children[i] == menu->id)
 383                     continue;
 384 --- 1532,1538 ----
 385             else
 386                 get_left_margin = True;
 387
 388 !           for (i = 0; i < (int)num_children; ++i)
 389             {
 390                 if (children[i] == menu->id)
 391                     continue;
 392 ***************
 393 *** 1645,1655 ****
 394       }
 395   }
 396
 397 - /*ARGSUSED*/
 398       static void
 399   gui_athena_menu_timeout(client_data, id)
 400       XtPointer     client_data;
 401 !     XtIntervalId    *id;
 402   {
 403       Widget  w = (Widget)client_data;
 404       Widget  popup;
 405 --- 1640,1649 ----
 406       }
 407   }
 408
 409       static void
 410   gui_athena_menu_timeout(client_data, id)
 411       XtPointer     client_data;
 412 !     XtIntervalId    *id UNUSED;
 413   {
 414       Widget  w = (Widget)client_data;
 415       Widget  popup;
 416 ***************
 417 *** 1678,1689 ****
 418    *
 419    * This is called when XtPopup() is called.
 420    */
 421 - /*ARGSUSED*/
 422       static void
 423   gui_athena_popup_callback(w, client_data, call_data)
 424       Widget    w;
 425       XtPointer client_data;
 426 !     XtPointer call_data;
 427   {
 428       /* Assumption: XtIsSubclass(XtParent(w),simpleMenuWidgetClass) */
 429       vimmenu_T *menu = (vimmenu_T *)client_data;
 430 --- 1672,1682 ----
 431    *
 432    * This is called when XtPopup() is called.
 433    */
 434       static void
 435   gui_athena_popup_callback(w, client_data, call_data)
 436       Widget    w;
 437       XtPointer client_data;
 438 !     XtPointer call_data UNUSED;
 439   {
 440       /* Assumption: XtIsSubclass(XtParent(w),simpleMenuWidgetClass) */
 441       vimmenu_T *menu = (vimmenu_T *)client_data;
 442 ***************
 443 *** 1711,1717 ****
 444                      NULL);
 445   }
 446
 447 - /* ARGSUSED */
 448       static void
 449   gui_athena_popdown_submenus_action(w, event, args, nargs)
 450       Widget    w;
 451 --- 1704,1709 ----
 452 ***************
 453 *** 1756,1762 ****
 454       return False;
 455   }
 456
 457 - /* ARGSUSED */
 458       static void
 459   gui_athena_delayed_arm_action(w, event, args, nargs)
 460       Widget    w;
 461 --- 1748,1753 ----
 462 ***************
 463 *** 1837,1843 ****
 464        * (XtIsSubclass(popup,simpleMenuWidgetClass) == True) */
 465   }
 466
 467 - /* ARGSUSED */
 468       void
 469   gui_mch_show_popupmenu(menu)
 470       vimmenu_T *menu;
 471 --- 1828,1833 ----
 472 ***************
 473 *** 2046,2060 ****
 474    * Put up a file requester.
 475    * Returns the selected name in allocated memory, or NULL for Cancel.
 476    */
 477 - /* ARGSUSED */
 478       char_u *
 479   gui_mch_browse(saving, title, dflt, ext, initdir, filter)
 480 !     int               saving;         /* select file to write */
 481 !     char_u    *title;         /* not used (title for the window) */
 482 !     char_u    *dflt;          /* not used (default name) */
 483 !     char_u    *ext;           /* not used (extension added) */
 484       char_u    *initdir;       /* initial directory, NULL for current dir */
 485 !     char_u    *filter;        /* not used (file name filter) */
 486   {
 487       Position x, y;
 488       char_u    dirbuf[MAXPATHL];
 489 --- 2036,2049 ----
 490    * Put up a file requester.
 491    * Returns the selected name in allocated memory, or NULL for Cancel.
 492    */
 493       char_u *
 494   gui_mch_browse(saving, title, dflt, ext, initdir, filter)
 495 !     int               saving UNUSED;  /* select file to write */
 496 !     char_u    *title;         /* title for the window */
 497 !     char_u    *dflt;          /* default name */
 498 !     char_u    *ext UNUSED;    /* extension added */
 499       char_u    *initdir;       /* initial directory, NULL for current dir */
 500 !     char_u    *filter UNUSED; /* file name filter */
 501   {
 502       Position x, y;
 503       char_u    dirbuf[MAXPATHL];
 504 ***************
 505 *** 2100,2112 ****
 506    * Callback function for the textfield.  When CR is hit this works like
 507    * hitting the "OK" button, ESC like "Cancel".
 508    */
 509 - /* ARGSUSED */
 510       static void
 511   keyhit_callback(w, client_data, event, cont)
 512 !     Widget            w;
 513 !     XtPointer         client_data;
 514       XEvent            *event;
 515 !     Boolean           *cont;
 516   {
 517       char      buf[2];
 518
 519 --- 2089,2100 ----
 520    * Callback function for the textfield.  When CR is hit this works like
 521    * hitting the "OK" button, ESC like "Cancel".
 522    */
 523       static void
 524   keyhit_callback(w, client_data, event, cont)
 525 !     Widget            w UNUSED;
 526 !     XtPointer         client_data UNUSED;
 527       XEvent            *event;
 528 !     Boolean           *cont UNUSED;
 529   {
 530       char      buf[2];
 531
 532 ***************
 533 *** 2119,2130 ****
 534       }
 535   }
 536
 537 - /* ARGSUSED */
 538       static void
 539   butproc(w, client_data, call_data)
 540 !     Widget    w;
 541       XtPointer client_data;
 542 !     XtPointer call_data;
 543   {
 544       dialogStatus = (int)(long)client_data + 1;
 545   }
 546 --- 2107,2117 ----
 547       }
 548   }
 549
 550       static void
 551   butproc(w, client_data, call_data)
 552 !     Widget    w UNUSED;
 553       XtPointer client_data;
 554 !     XtPointer call_data UNUSED;
 555   {
 556       dialogStatus = (int)(long)client_data + 1;
 557   }
 558 ***************
 559 *** 2132,2158 ****
 560   /*
 561    * Function called when dialog window closed.
 562    */
 563 - /*ARGSUSED*/
 564       static void
 565   dialog_wm_handler(w, client_data, event, dum)
 566 !     Widget    w;
 567 !     XtPointer client_data;
 568       XEvent    *event;
 569 !     Boolean   *dum;
 570   {
 571       if (event->type == ClientMessage
 572 !           && ((XClientMessageEvent *)event)->data.l[0] == dialogatom)
 573         dialogStatus = 0;
 574   }
 575
 576 - /* ARGSUSED */
 577       int
 578   gui_mch_dialog(type, title, message, buttons, dfltbutton, textfield)
 579 !     int               type;
 580       char_u    *title;
 581       char_u    *message;
 582       char_u    *buttons;
 583 !     int               dfltbutton;
 584       char_u    *textfield;
 585   {
 586       char_u            *buts;
 587 --- 2119,2143 ----
 588   /*
 589    * Function called when dialog window closed.
 590    */
 591       static void
 592   dialog_wm_handler(w, client_data, event, dum)
 593 !     Widget    w UNUSED;
 594 !     XtPointer client_data UNUSED;
 595       XEvent    *event;
 596 !     Boolean   *dum UNUSED;
 597   {
 598       if (event->type == ClientMessage
 599 !           && (Atom)((XClientMessageEvent *)event)->data.l[0] == dialogatom)
 600         dialogStatus = 0;
 601   }
 602
 603       int
 604   gui_mch_dialog(type, title, message, buttons, dfltbutton, textfield)
 605 !     int               type UNUSED;
 606       char_u    *title;
 607       char_u    *message;
 608       char_u    *buttons;
 609 !     int               dfltbutton UNUSED;
 610       char_u    *textfield;
 611   {
 612       char_u            *buts;
 613 *** ../vim-7.2.183/src/gui_x11.c        2009-02-24 04:11:07.000000000 +0100
 614 --- src/gui_x11.c       2009-05-21 16:47:02.000000000 +0200
 615 ***************
 616 *** 570,591 ****
 617    * Call-back routines.
 618    */
 619
 620 - /* ARGSUSED */
 621       static void
 622   gui_x11_timer_cb(timed_out, interval_id)
 623       XtPointer     timed_out;
 624 !     XtIntervalId    *interval_id;
 625   {
 626       *((int *)timed_out) = TRUE;
 627   }
 628
 629 - /* ARGSUSED */
 630       static void
 631   gui_x11_visibility_cb(w, dud, event, dum)
 632 !     Widget    w;
 633 !     XtPointer dud;
 634       XEvent    *event;
 635 !     Boolean   *dum;
 636   {
 637       if (event->type != VisibilityNotify)
 638         return;
 639 --- 570,589 ----
 640    * Call-back routines.
 641    */
 642
 643       static void
 644   gui_x11_timer_cb(timed_out, interval_id)
 645       XtPointer     timed_out;
 646 !     XtIntervalId    *interval_id UNUSED;
 647   {
 648       *((int *)timed_out) = TRUE;
 649   }
 650
 651       static void
 652   gui_x11_visibility_cb(w, dud, event, dum)
 653 !     Widget    w UNUSED;
 654 !     XtPointer dud UNUSED;
 655       XEvent    *event;
 656 !     Boolean   *dum UNUSED;
 657   {
 658       if (event->type != VisibilityNotify)
 659         return;
 660 ***************
 661 *** 603,615 ****
 662       gui_mch_update();
 663   }
 664
 665 - /* ARGSUSED */
 666       static void
 667   gui_x11_expose_cb(w, dud, event, dum)
 668 !     Widget    w;
 669 !     XtPointer dud;
 670       XEvent    *event;
 671 !     Boolean   *dum;
 672   {
 673       XExposeEvent      *gevent;
 674       int                       new_x;
 675 --- 601,612 ----
 676       gui_mch_update();
 677   }
 678
 679       static void
 680   gui_x11_expose_cb(w, dud, event, dum)
 681 !     Widget    w UNUSED;
 682 !     XtPointer dud UNUSED;
 683       XEvent    *event;
 684 !     Boolean   *dum UNUSED;
 685   {
 686       XExposeEvent      *gevent;
 687       int                       new_x;
 688 ***************
 689 *** 680,692 ****
 690   }
 691   #endif
 692
 693 - /* ARGSUSED */
 694       static void
 695   gui_x11_resize_window_cb(w, dud, event, dum)
 696 !     Widget    w;
 697 !     XtPointer dud;
 698       XEvent    *event;
 699 !     Boolean   *dum;
 700   {
 701       static int lastWidth, lastHeight;
 702
 703 --- 677,688 ----
 704   }
 705   #endif
 706
 707       static void
 708   gui_x11_resize_window_cb(w, dud, event, dum)
 709 !     Widget    w UNUSED;
 710 !     XtPointer dud UNUSED;
 711       XEvent    *event;
 712 !     Boolean   *dum UNUSED;
 713   {
 714       static int lastWidth, lastHeight;
 715
 716 ***************
 717 *** 727,761 ****
 718   #endif
 719   }
 720
 721 - /* ARGSUSED */
 722       static void
 723   gui_x11_focus_change_cb(w, data, event, dum)
 724 !     Widget    w;
 725 !     XtPointer data;
 726       XEvent    *event;
 727 !     Boolean   *dum;
 728   {
 729       gui_focus_change(event->type == FocusIn);
 730   }
 731
 732 - /* ARGSUSED */
 733       static void
 734   gui_x11_enter_cb(w, data, event, dum)
 735 !     Widget    w;
 736 !     XtPointer data;
 737 !     XEvent    *event;
 738 !     Boolean   *dum;
 739   {
 740       gui_focus_change(TRUE);
 741   }
 742
 743 - /* ARGSUSED */
 744       static void
 745   gui_x11_leave_cb(w, data, event, dum)
 746 !     Widget    w;
 747 !     XtPointer data;
 748 !     XEvent    *event;
 749 !     Boolean   *dum;
 750   {
 751       gui_focus_change(FALSE);
 752   }
 753 --- 723,754 ----
 754   #endif
 755   }
 756
 757       static void
 758   gui_x11_focus_change_cb(w, data, event, dum)
 759 !     Widget    w UNUSED;
 760 !     XtPointer data UNUSED;
 761       XEvent    *event;
 762 !     Boolean   *dum UNUSED;
 763   {
 764       gui_focus_change(event->type == FocusIn);
 765   }
 766
 767       static void
 768   gui_x11_enter_cb(w, data, event, dum)
 769 !     Widget    w UNUSED;
 770 !     XtPointer data UNUSED;
 771 !     XEvent    *event UNUSED;
 772 !     Boolean   *dum UNUSED;
 773   {
 774       gui_focus_change(TRUE);
 775   }
 776
 777       static void
 778   gui_x11_leave_cb(w, data, event, dum)
 779 !     Widget    w UNUSED;
 780 !     XtPointer data UNUSED;
 781 !     XEvent    *event UNUSED;
 782 !     Boolean   *dum UNUSED;
 783   {
 784       gui_focus_change(FALSE);
 785   }
 786 ***************
 787 *** 766,778 ****
 788   # endif
 789   #endif
 790
 791 - /* ARGSUSED */
 792       void
 793   gui_x11_key_hit_cb(w, dud, event, dum)
 794 !     Widget    w;
 795 !     XtPointer dud;
 796       XEvent    *event;
 797 !     Boolean   *dum;
 798   {
 799       XKeyPressedEvent  *ev_press;
 800   #ifdef FEAT_XIM
 801 --- 759,770 ----
 802   # endif
 803   #endif
 804
 805       void
 806   gui_x11_key_hit_cb(w, dud, event, dum)
 807 !     Widget    w UNUSED;
 808 !     XtPointer dud UNUSED;
 809       XEvent    *event;
 810 !     Boolean   *dum UNUSED;
 811   {
 812       XKeyPressedEvent  *ev_press;
 813   #ifdef FEAT_XIM
 814 ***************
 815 *** 1078,1090 ****
 816   #endif
 817   }
 818
 819 - /* ARGSUSED */
 820       static void
 821   gui_x11_mouse_cb(w, dud, event, dum)
 822 !     Widget    w;
 823 !     XtPointer dud;
 824       XEvent    *event;
 825 !     Boolean   *dum;
 826   {
 827       static XtIntervalId timer = (XtIntervalId)0;
 828       static int        timed_out = TRUE;
 829 --- 1070,1081 ----
 830   #endif
 831   }
 832
 833       static void
 834   gui_x11_mouse_cb(w, dud, event, dum)
 835 !     Widget    w UNUSED;
 836 !     XtPointer dud UNUSED;
 837       XEvent    *event;
 838 !     Boolean   *dum UNUSED;
 839   {
 840       static XtIntervalId timer = (XtIntervalId)0;
 841       static int        timed_out = TRUE;
 842 ***************
 843 *** 1210,1220 ****
 844       while (arg < *argc)
 845       {
 846         /* Look for argv[arg] in cmdline_options[] table */
 847 !       for (i = 0; i < XtNumber(cmdline_options); i++)
 848             if (strcmp(argv[arg], cmdline_options[i].option) == 0)
 849                 break;
 850
 851 !       if (i < XtNumber(cmdline_options))
 852         {
 853             /* Remember finding "-rv" or "-reverse" */
 854             if (strcmp("-rv", argv[arg]) == 0
 855 --- 1201,1211 ----
 856       while (arg < *argc)
 857       {
 858         /* Look for argv[arg] in cmdline_options[] table */
 859 !       for (i = 0; i < (int)XtNumber(cmdline_options); i++)
 860             if (strcmp(argv[arg], cmdline_options[i].option) == 0)
 861                 break;
 862
 863 !       if (i < (int)XtNumber(cmdline_options))
 864         {
 865             /* Remember finding "-rv" or "-reverse" */
 866             if (strcmp("-rv", argv[arg]) == 0
 867 ***************
 868 *** 1319,1330 ****
 869
 870   static void local_xsmp_handle_requests __ARGS((XtPointer c, int *s, XtInputId *i));
 871
 872 - /*ARGSUSED*/
 873       static void
 874   local_xsmp_handle_requests(c, s, i)
 875 !     XtPointer c;
 876 !     int               *s;
 877 !     XtInputId *i;
 878   {
 879       if (xsmp_handle_requests() == FAIL)
 880         XtRemoveInput(_xsmp_xtinputid);
 881 --- 1310,1320 ----
 882
 883   static void local_xsmp_handle_requests __ARGS((XtPointer c, int *s, XtInputId *i));
 884
 885       static void
 886   local_xsmp_handle_requests(c, s, i)
 887 !     XtPointer c UNUSED;
 888 !     int               *s UNUSED;
 889 !     XtInputId *i UNUSED;
 890   {
 891       if (xsmp_handle_requests() == FAIL)
 892         XtRemoveInput(_xsmp_xtinputid);
 893 ***************
 894 *** 1438,1444 ****
 895             Columns = w;
 896         if (mask & HeightValue)
 897         {
 898 !           if (p_window > h - 1 || !option_was_set((char_u *)"window"))
 899                 p_window = h - 1;
 900             Rows = h;
 901         }
 902 --- 1428,1434 ----
 903             Columns = w;
 904         if (mask & HeightValue)
 905         {
 906 !           if (p_window > (long)h - 1 || !option_was_set((char_u *)"window"))
 907                 p_window = h - 1;
 908             Rows = h;
 909         }
 910 ***************
 911 *** 1753,1762 ****
 912   }
 913   #endif
 914
 915 - /*ARGSUSED*/
 916       void
 917   gui_mch_exit(rc)
 918 !     int               rc;
 919   {
 920   #if 0
 921       /* Lesstif gives an error message here, and so does Solaris.  The man page
 922 --- 1743,1751 ----
 923   }
 924   #endif
 925
 926       void
 927   gui_mch_exit(rc)
 928 !     int               rc UNUSED;
 929   {
 930   #if 0
 931       /* Lesstif gives an error message here, and so does Solaris.  The man page
 932 ***************
 933 *** 1799,1805 ****
 934         NULL);
 935   }
 936
 937 - /*ARGSUSED*/
 938       void
 939   gui_mch_set_shellsize(width, height, min_width, min_height,
 940                     base_width, base_height, direction)
 941 --- 1788,1793 ----
 942 ***************
 943 *** 1809,1815 ****
 944       int               min_height;
 945       int               base_width;
 946       int               base_height;
 947 !     int               direction;
 948   {
 949   #ifdef FEAT_XIM
 950       height += xim_get_status_area_height(),
 951 --- 1797,1803 ----
 952       int               min_height;
 953       int               base_width;
 954       int               base_height;
 955 !     int               direction UNUSED;
 956   {
 957   #ifdef FEAT_XIM
 958       height += xim_get_status_area_height(),
 959 ***************
 960 *** 1847,1857 ****
 961    * If "fontset" is TRUE, load the "font_name" as a fontset.
 962    * Return FAIL if the font could not be loaded, OK otherwise.
 963    */
 964 - /*ARGSUSED*/
 965       int
 966   gui_mch_init_font(font_name, do_fontset)
 967       char_u    *font_name;
 968 !     int               do_fontset;
 969   {
 970       XFontStruct       *font = NULL;
 971
 972 --- 1835,1844 ----
 973    * If "fontset" is TRUE, load the "font_name" as a fontset.
 974    * Return FAIL if the font could not be loaded, OK otherwise.
 975    */
 976       int
 977   gui_mch_init_font(font_name, do_fontset)
 978       char_u    *font_name;
 979 !     int               do_fontset UNUSED;
 980   {
 981       XFontStruct       *font = NULL;
 982
 983 ***************
 984 *** 2029,2038 ****
 985    * Return the name of font "font" in allocated memory.
 986    * Don't know how to get the actual name, thus use the provided name.
 987    */
 988 - /*ARGSUSED*/
 989       char_u *
 990   gui_mch_get_fontname(font, name)
 991 !     GuiFont font;
 992       char_u  *name;
 993   {
 994       if (name == NULL)
 995 --- 2016,2024 ----
 996    * Return the name of font "font" in allocated memory.
 997    * Don't know how to get the actual name, thus use the provided name.
 998    */
 999       char_u *
1000   gui_mch_get_fontname(font, name)
1001 !     GuiFont font UNUSED;
1002       char_u  *name;
1003   {
1004       if (name == NULL)
1005 ***************
1006 *** 2521,2527 ****
1007   {
1008       int                       i;
1009       int                       offset;
1010 !     const static int  val[8] = {1, 0, 0, 0, 1, 2, 2, 2 };
1011
1012       XSetForeground(gui.dpy, gui.text_gc, prev_sp_color);
1013       for (i = FILL_X(col); i < FILL_X(col + cells); ++i)
1014 --- 2507,2513 ----
1015   {
1016       int                       i;
1017       int                       offset;
1018 !     static const int  val[8] = {1, 0, 0, 0, 1, 2, 2, 2 };
1019
1020       XSetForeground(gui.dpy, gui.text_gc, prev_sp_color);
1021       for (i = FILL_X(col); i < FILL_X(col + cells); ++i)
1022 ***************
1023 *** 2569,2576 ****
1024   # ifdef FEAT_XFONTSET
1025             if (current_fontset != NULL)
1026             {
1027 !               if (c >= 0x10000 && sizeof(wchar_t) <= 2)
1028                     c = 0xbf;           /* show chars > 0xffff as ? */
1029                 ((wchar_t *)buf)[wlen] = c;
1030             }
1031             else
1032 --- 2555,2564 ----
1033   # ifdef FEAT_XFONTSET
1034             if (current_fontset != NULL)
1035             {
1036 ! #  ifdef SMALL_WCHAR_T
1037 !               if (c >= 0x10000)
1038                     c = 0xbf;           /* show chars > 0xffff as ? */
1039 + #  endif
1040                 ((wchar_t *)buf)[wlen] = c;
1041             }
1042             else
1043 ***************
1044 *** 3136,3146 ****
1045       /* Nothing to do in X */
1046   }
1047
1048 - /* ARGSUSED */
1049       void
1050   gui_x11_menu_cb(w, client_data, call_data)
1051 !     Widget    w;
1052 !     XtPointer client_data, call_data;
1053   {
1054       gui_menu_cb((vimmenu_T *)client_data);
1055   }
1056 --- 3124,3134 ----
1057       /* Nothing to do in X */
1058   }
1059
1060       void
1061   gui_x11_menu_cb(w, client_data, call_data)
1062 !     Widget    w UNUSED;
1063 !     XtPointer client_data;
1064 !     XtPointer call_data UNUSED;
1065   {
1066       gui_menu_cb((vimmenu_T *)client_data);
1067   }
1068 ***************
1069 *** 3153,3165 ****
1070    * Function called when window closed.        Works like ":qa".
1071    * Should put up a requester!
1072    */
1073 - /*ARGSUSED*/
1074       static void
1075   gui_x11_wm_protocol_handler(w, client_data, event, dum)
1076 !     Widget    w;
1077 !     XtPointer client_data;
1078       XEvent    *event;
1079 !     Boolean   *dum;
1080   {
1081       /*
1082        * Only deal with Client messages.
1083 --- 3141,3152 ----
1084    * Function called when window closed.        Works like ":qa".
1085    * Should put up a requester!
1086    */
1087       static void
1088   gui_x11_wm_protocol_handler(w, client_data, event, dum)
1089 !     Widget    w UNUSED;
1090 !     XtPointer client_data UNUSED;
1091       XEvent    *event;
1092 !     Boolean   *dum UNUSED;
1093   {
1094       /*
1095        * Only deal with Client messages.
1096 ***************
1097 *** 3172,3178 ****
1098        * exit.  That can be cancelled though, thus Vim shouldn't exit here.
1099        * Just sync our swap files.
1100        */
1101 !     if (((XClientMessageEvent *)event)->data.l[0] ==
1102                                                   wm_atoms[SAVE_YOURSELF_IDX])
1103       {
1104         out_flush();
1105 --- 3159,3165 ----
1106        * exit.  That can be cancelled though, thus Vim shouldn't exit here.
1107        * Just sync our swap files.
1108        */
1109 !     if ((Atom)((XClientMessageEvent *)event)->data.l[0] ==
1110                                                   wm_atoms[SAVE_YOURSELF_IDX])
1111       {
1112         out_flush();
1113 ***************
1114 *** 3185,3191 ****
1115         return;
1116       }
1117
1118 !     if (((XClientMessageEvent *)event)->data.l[0] !=
1119                                                   wm_atoms[DELETE_WINDOW_IDX])
1120         return;
1121
1122 --- 3172,3178 ----
1123         return;
1124       }
1125
1126 !     if ((Atom)((XClientMessageEvent *)event)->data.l[0] !=
1127                                                   wm_atoms[DELETE_WINDOW_IDX])
1128         return;
1129
1130 ***************
1131 *** 3196,3208 ****
1132   /*
1133    * Function called when property changed. Check for incoming commands
1134    */
1135 - /*ARGSUSED*/
1136       static void
1137   gui_x11_send_event_handler(w, client_data, event, dum)
1138 !     Widget    w;
1139 !     XtPointer client_data;
1140       XEvent    *event;
1141 !     Boolean   *dum;
1142   {
1143       XPropertyEvent *e = (XPropertyEvent *) event;
1144
1145 --- 3183,3194 ----
1146   /*
1147    * Function called when property changed. Check for incoming commands
1148    */
1149       static void
1150   gui_x11_send_event_handler(w, client_data, event, dum)
1151 !     Widget    w UNUSED;
1152 !     XtPointer client_data UNUSED;
1153       XEvent    *event;
1154 !     Boolean   *dum UNUSED;
1155   {
1156       XPropertyEvent *e = (XPropertyEvent *) event;
1157
1158 ***************
1159 *** 3277,3287 ****
1160       }
1161   }
1162
1163 - /* ARGSUSED */
1164       static void
1165   gui_x11_blink_cb(timed_out, interval_id)
1166 !     XtPointer     timed_out;
1167 !     XtIntervalId    *interval_id;
1168   {
1169       if (blink_state == BLINK_ON)
1170       {
1171 --- 3263,3272 ----
1172       }
1173   }
1174
1175       static void
1176   gui_x11_blink_cb(timed_out, interval_id)
1177 !     XtPointer     timed_out UNUSED;
1178 !     XtIntervalId    *interval_id UNUSED;
1179   {
1180       if (blink_state == BLINK_ON)
1181       {
1182 *** ../vim-7.2.183/src/gui.c    2009-05-17 16:23:20.000000000 +0200
1183 --- src/gui.c   2009-05-21 16:37:39.000000000 +0200
1184 ***************
1185 *** 3119,3125 ****
1186    */
1187       void
1188   gui_init_which_components(oldval)
1189 !     char_u    *oldval;
1190   {
1191   #ifdef FEAT_MENU
1192       static int        prev_menu_is_active = -1;
1193 --- 3119,3125 ----
1194    */
1195       void
1196   gui_init_which_components(oldval)
1197 !     char_u    *oldval UNUSED;
1198   {
1199   #ifdef FEAT_MENU
1200       static int        prev_menu_is_active = -1;
1201 ***************
1202 *** 4668,4675 ****
1203    */
1204       static win_T *
1205   xy2win(x, y)
1206 !     int               x;
1207 !     int               y;
1208   {
1209   #ifdef FEAT_WINDOWS
1210       int               row;
1211 --- 4668,4675 ----
1212    */
1213       static win_T *
1214   xy2win(x, y)
1215 !     int               x UNUSED;
1216 !     int               y UNUSED;
1217   {
1218   #ifdef FEAT_WINDOWS
1219       int               row;
1220 ***************
1221 *** 5121,5128 ****
1222    */
1223       void
1224   gui_handle_drop(x, y, modifiers, fnames, count)
1225 !     int               x;
1226 !     int               y;
1227       int_u     modifiers;
1228       char_u    **fnames;
1229       int               count;
1230 --- 5121,5128 ----
1231    */
1232       void
1233   gui_handle_drop(x, y, modifiers, fnames, count)
1234 !     int               x UNUSED;
1235 !     int               y UNUSED;
1236       int_u     modifiers;
1237       char_u    **fnames;
1238       int               count;
1239 *** ../vim-7.2.183/src/gui_beval.c      2009-05-17 16:23:20.000000000 +0200
1240 --- src/gui_beval.c     2009-05-21 15:03:02.000000000 +0200
1241 ***************
1242 *** 18,24 ****
1243       void
1244   general_beval_cb(beval, state)
1245       BalloonEval *beval;
1246 !     int state;
1247   {
1248       win_T     *wp;
1249       int               col;
1250 --- 18,24 ----
1251       void
1252   general_beval_cb(beval, state)
1253       BalloonEval *beval;
1254 !     int               state UNUSED;
1255   {
1256       win_T     *wp;
1257       int               col;
1258 ***************
1259 *** 726,735 ****
1260    */
1261       static void
1262   pointerEventEH(w, client_data, event, unused)
1263 !     Widget    w;
1264       XtPointer client_data;
1265       XEvent    *event;
1266 !     Boolean   *unused;
1267   {
1268       BalloonEval *beval = (BalloonEval *)client_data;
1269       pointerEvent(beval, event);
1270 --- 726,735 ----
1271    */
1272       static void
1273   pointerEventEH(w, client_data, event, unused)
1274 !     Widget    w UNUSED;
1275       XtPointer client_data;
1276       XEvent    *event;
1277 !     Boolean   *unused UNUSED;
1278   {
1279       BalloonEval *beval = (BalloonEval *)client_data;
1280       pointerEvent(beval, event);
1281 ***************
1282 *** 877,883 ****
1283       static void
1284   timerRoutine(dx, id)
1285       XtPointer     dx;
1286 !     XtIntervalId    *id;
1287   {
1288       BalloonEval *beval = (BalloonEval *)dx;
1289
1290 --- 877,883 ----
1291       static void
1292   timerRoutine(dx, id)
1293       XtPointer     dx;
1294 !     XtIntervalId    *id UNUSED;
1295   {
1296       BalloonEval *beval = (BalloonEval *)dx;
1297
1298 *** ../vim-7.2.183/src/gui_at_sb.c      2008-11-28 21:26:50.000000000 +0100
1299 --- src/gui_at_sb.c     2009-05-21 16:38:53.000000000 +0200
1300 ***************
1301 *** 198,207 ****
1302       /* extension      */  NULL
1303     },
1304     { /* simple fields */
1305 !     /* change_sensitive       */  XtInheritChangeSensitive
1306     },
1307     { /* scrollbar fields */
1308 !     /* ignore     */  0
1309     }
1310   };
1311
1312 --- 198,210 ----
1313       /* extension      */  NULL
1314     },
1315     { /* simple fields */
1316 !     /* change_sensitive       */  XtInheritChangeSensitive,
1317 ! #ifndef OLDXAW
1318 !     /* extension */       NULL
1319 ! #endif
1320     },
1321     { /* scrollbar fields */
1322 !     /* empty      */      0
1323     }
1324   };
1325
1326 ***************
1327 *** 241,247 ****
1328
1329       if (bottom <= 0 || bottom <= top)
1330         return;
1331 !     if ((sw = sbw->scrollbar.shadow_width) < 0)
1332         sw = 0;
1333       margin = MARGIN (sbw);
1334       floor = sbw->scrollbar.length - margin + 2;
1335 --- 244,251 ----
1336
1337       if (bottom <= 0 || bottom <= top)
1338         return;
1339 !     sw = sbw->scrollbar.shadow_width;
1340 !     if (sw < 0)
1341         sw = 0;
1342       margin = MARGIN (sbw);
1343       floor = sbw->scrollbar.length - margin + 2;
1344 ***************
1345 *** 516,528 ****
1346       }
1347   }
1348
1349 - /* ARGSUSED */
1350       static void
1351   Initialize(request, new, args, num_args)
1352 !     Widget    request;        /* what the client asked for */
1353       Widget    new;            /* what we're going to give him */
1354 !     ArgList   args;
1355 !     Cardinal  *num_args;
1356   {
1357       ScrollbarWidget sbw = (ScrollbarWidget) new;
1358
1359 --- 520,531 ----
1360       }
1361   }
1362
1363       static void
1364   Initialize(request, new, args, num_args)
1365 !     Widget    request UNUSED; /* what the client asked for */
1366       Widget    new;            /* what we're going to give him */
1367 !     ArgList   args UNUSED;
1368 !     Cardinal  *num_args UNUSED;
1369   {
1370       ScrollbarWidget sbw = (ScrollbarWidget) new;
1371
1372 ***************
1373 *** 556,569 ****
1374         (w, valueMask, attributes);
1375   }
1376
1377 - /* ARGSUSED */
1378       static Boolean
1379   SetValues(current, request, desired, args, num_args)
1380 !     Widget  current,      /* what I am */
1381 !           request,        /* what he wants me to be */
1382 !           desired;        /* what I will become */
1383 !     ArgList args;
1384 !     Cardinal *num_args;
1385   {
1386       ScrollbarWidget   sbw = (ScrollbarWidget) current;
1387       ScrollbarWidget   dsbw = (ScrollbarWidget) desired;
1388 --- 559,571 ----
1389         (w, valueMask, attributes);
1390   }
1391
1392       static Boolean
1393   SetValues(current, request, desired, args, num_args)
1394 !     Widget  current;      /* what I am */
1395 !     Widget  request UNUSED; /* what he wants me to be */
1396 !     Widget  desired;      /* what I will become */
1397 !     ArgList args UNUSED;
1398 !     Cardinal *num_args UNUSED;
1399   {
1400       ScrollbarWidget   sbw = (ScrollbarWidget) current;
1401       ScrollbarWidget   dsbw = (ScrollbarWidget) desired;
1402 ***************
1403 *** 609,615 ****
1404   }
1405
1406
1407 - /* ARGSUSED */
1408       static void
1409   Redisplay(w, event, region)
1410       Widget w;
1411 --- 611,616 ----
1412 ***************
1413 *** 789,799 ****
1414       }
1415   }
1416
1417 - /* ARGSUSED */
1418       static void
1419   RepeatNotify(client_data, idp)
1420       XtPointer client_data;
1421 !     XtIntervalId *idp;
1422   {
1423       ScrollbarWidget sbw = (ScrollbarWidget) client_data;
1424       int                   call_data;
1425 --- 790,799 ----
1426       }
1427   }
1428
1429       static void
1430   RepeatNotify(client_data, idp)
1431       XtPointer client_data;
1432 !     XtIntervalId *idp UNUSED;
1433   {
1434       ScrollbarWidget sbw = (ScrollbarWidget) client_data;
1435       int                   call_data;
1436 ***************
1437 *** 839,884 ****
1438       return (num < small) ? small : ((num > big) ? big : num);
1439   }
1440
1441 - /* ARGSUSED */
1442       static void
1443   ScrollOneLineUp(w, event, params, num_params)
1444       Widget    w;
1445       XEvent    *event;
1446 !     String    *params;
1447 !     Cardinal  *num_params;
1448   {
1449       ScrollSome(w, event, -ONE_LINE_DATA);
1450   }
1451
1452 - /* ARGSUSED */
1453       static void
1454   ScrollOneLineDown(w, event, params, num_params)
1455       Widget    w;
1456       XEvent    *event;
1457 !     String    *params;
1458 !     Cardinal  *num_params;
1459   {
1460       ScrollSome(w, event, ONE_LINE_DATA);
1461   }
1462
1463 - /* ARGSUSED */
1464       static void
1465   ScrollPageDown(w, event, params, num_params)
1466       Widget    w;
1467       XEvent    *event;
1468 !     String    *params;
1469 !     Cardinal  *num_params;
1470   {
1471       ScrollSome(w, event, ONE_PAGE_DATA);
1472   }
1473
1474 - /* ARGSUSED */
1475       static void
1476   ScrollPageUp(w, event, params, num_params)
1477       Widget    w;
1478       XEvent    *event;
1479 !     String    *params;
1480 !     Cardinal  *num_params;
1481   {
1482       ScrollSome(w, event, -ONE_PAGE_DATA);
1483   }
1484 --- 839,880 ----
1485       return (num < small) ? small : ((num > big) ? big : num);
1486   }
1487
1488       static void
1489   ScrollOneLineUp(w, event, params, num_params)
1490       Widget    w;
1491       XEvent    *event;
1492 !     String    *params UNUSED;
1493 !     Cardinal  *num_params UNUSED;
1494   {
1495       ScrollSome(w, event, -ONE_LINE_DATA);
1496   }
1497
1498       static void
1499   ScrollOneLineDown(w, event, params, num_params)
1500       Widget    w;
1501       XEvent    *event;
1502 !     String    *params UNUSED;
1503 !     Cardinal  *num_params UNUSED;
1504   {
1505       ScrollSome(w, event, ONE_LINE_DATA);
1506   }
1507
1508       static void
1509   ScrollPageDown(w, event, params, num_params)
1510       Widget    w;
1511       XEvent    *event;
1512 !     String    *params UNUSED;
1513 !     Cardinal  *num_params UNUSED;
1514   {
1515       ScrollSome(w, event, ONE_PAGE_DATA);
1516   }
1517
1518       static void
1519   ScrollPageUp(w, event, params, num_params)
1520       Widget    w;
1521       XEvent    *event;
1522 !     String    *params UNUSED;
1523 !     Cardinal  *num_params UNUSED;
1524   {
1525       ScrollSome(w, event, -ONE_PAGE_DATA);
1526   }
1527 ***************
1528 *** 901,913 ****
1529       XtCallCallbacks(w, XtNscrollProc, (XtPointer)call_data);
1530   }
1531
1532 - /* ARGSUSED */
1533       static void
1534   NotifyScroll(w, event, params, num_params)
1535       Widget    w;
1536       XEvent    *event;
1537 !     String    *params;
1538 !     Cardinal  *num_params;
1539   {
1540       ScrollbarWidget sbw = (ScrollbarWidget) w;
1541       Position      x, y, loc;
1542 --- 897,908 ----
1543       XtCallCallbacks(w, XtNscrollProc, (XtPointer)call_data);
1544   }
1545
1546       static void
1547   NotifyScroll(w, event, params, num_params)
1548       Widget    w;
1549       XEvent    *event;
1550 !     String    *params UNUSED;
1551 !     Cardinal  *num_params UNUSED;
1552   {
1553       ScrollbarWidget sbw = (ScrollbarWidget) w;
1554       Position      x, y, loc;
1555 ***************
1556 *** 991,1003 ****
1557                                            delay, RepeatNotify, (XtPointer)w);
1558   }
1559
1560 - /* ARGSUSED */
1561       static void
1562   EndScroll(w, event, params, num_params)
1563       Widget w;
1564 !     XEvent *event;    /* unused */
1565 !     String *params;   /* unused */
1566 !     Cardinal *num_params;   /* unused */
1567   {
1568       ScrollbarWidget sbw = (ScrollbarWidget) w;
1569
1570 --- 986,997 ----
1571                                            delay, RepeatNotify, (XtPointer)w);
1572   }
1573
1574       static void
1575   EndScroll(w, event, params, num_params)
1576       Widget w;
1577 !     XEvent *event UNUSED;
1578 !     String *params UNUSED;
1579 !     Cardinal *num_params UNUSED;
1580   {
1581       ScrollbarWidget sbw = (ScrollbarWidget) w;
1582
1583 ***************
1584 *** 1023,1035 ****
1585       return PICKLENGTH(sbw, x / width, y / height);
1586   }
1587
1588 - /* ARGSUSED */
1589       static void
1590   MoveThumb(w, event, params, num_params)
1591       Widget    w;
1592       XEvent    *event;
1593 !     String    *params;        /* unused */
1594 !     Cardinal  *num_params;    /* unused */
1595   {
1596       ScrollbarWidget   sbw = (ScrollbarWidget)w;
1597       Position          x, y;
1598 --- 1017,1028 ----
1599       return PICKLENGTH(sbw, x / width, y / height);
1600   }
1601
1602       static void
1603   MoveThumb(w, event, params, num_params)
1604       Widget    w;
1605       XEvent    *event;
1606 !     String    *params UNUSED;
1607 !     Cardinal  *num_params UNUSED;
1608   {
1609       ScrollbarWidget   sbw = (ScrollbarWidget)w;
1610       Position          x, y;
1611 ***************
1612 *** 1069,1081 ****
1613   }
1614
1615
1616 - /* ARGSUSED */
1617       static void
1618   NotifyThumb(w, event, params, num_params)
1619       Widget    w;
1620       XEvent    *event;
1621 !     String    *params;        /* unused */
1622 !     Cardinal  *num_params;    /* unused */
1623   {
1624       ScrollbarWidget sbw = (ScrollbarWidget)w;
1625       /* Use a union to avoid a warning for the weird conversion from float to
1626 --- 1062,1073 ----
1627   }
1628
1629
1630       static void
1631   NotifyThumb(w, event, params, num_params)
1632       Widget    w;
1633       XEvent    *event;
1634 !     String    *params UNUSED;
1635 !     Cardinal  *num_params UNUSED;
1636   {
1637       ScrollbarWidget sbw = (ScrollbarWidget)w;
1638       /* Use a union to avoid a warning for the weird conversion from float to
1639 ***************
1640 *** 1096,1102 ****
1641       XtCallCallbacks(w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top);
1642   }
1643
1644 - /* ARGSUSED */
1645       static void
1646   AllocTopShadowGC(w)
1647       Widget w;
1648 --- 1088,1093 ----
1649 ***************
1650 *** 1110,1116 ****
1651       sbw->scrollbar.top_shadow_GC = XtGetGC(w, valuemask, &myXGCV);
1652   }
1653
1654 - /* ARGSUSED */
1655       static void
1656   AllocBotShadowGC(w)
1657       Widget w;
1658 --- 1101,1106 ----
1659 ***************
1660 *** 1124,1134 ****
1661       sbw->scrollbar.bot_shadow_GC = XtGetGC(w, valuemask, &myXGCV);
1662   }
1663
1664 - /* ARGSUSED */
1665       static void
1666   _Xaw3dDrawShadows(gw, event, region, out)
1667       Widget  gw;
1668 !     XEvent  *event;
1669       Region  region;
1670       int           out;
1671   {
1672 --- 1114,1123 ----
1673       sbw->scrollbar.bot_shadow_GC = XtGetGC(w, valuemask, &myXGCV);
1674   }
1675
1676       static void
1677   _Xaw3dDrawShadows(gw, event, region, out)
1678       Widget  gw;
1679 !     XEvent  *event UNUSED;
1680       Region  region;
1681       int           out;
1682   {
1683 *** ../vim-7.2.183/src/gui_at_fs.c      2006-05-13 15:51:07.000000000 +0200
1684 --- src/gui_at_fs.c     2009-05-21 16:38:36.000000000 +0200
1685 ***************
1686 *** 829,835 ****
1687       text.format = FMT8BIT;
1688
1689   #ifdef XtNinternational
1690 !     if (_XawTextFormat((TextWidget)selFileField) == XawFmtWide)
1691       {
1692         XawTextReplace(selFileField, (XawTextPosition)0,
1693                                     (XawTextPosition)WcsLen((wchar_t *)&SFtextBuffer[0]), &text);
1694 --- 829,835 ----
1695       text.format = FMT8BIT;
1696
1697   #ifdef XtNinternational
1698 !     if ((unsigned long)_XawTextFormat((TextWidget)selFileField) == XawFmtWide)
1699       {
1700         XawTextReplace(selFileField, (XawTextPosition)0,
1701                                     (XawTextPosition)WcsLen((wchar_t *)&SFtextBuffer[0]), &text);
1702 ***************
1703 *** 851,867 ****
1704   #endif
1705   }
1706
1707 - /* ARGSUSED */
1708       static void
1709   SFbuttonPressList(w, n, event)
1710 !     Widget            w;
1711 !     int                       n;
1712 !     XButtonPressedEvent       *event;
1713   {
1714       SFbuttonPressed = 1;
1715   }
1716
1717 - /* ARGSUSED */
1718       static void
1719   SFbuttonReleaseList(w, n, event)
1720       Widget             w;
1721 --- 851,865 ----
1722   #endif
1723   }
1724
1725       static void
1726   SFbuttonPressList(w, n, event)
1727 !     Widget            w UNUSED;
1728 !     int                       n UNUSED;
1729 !     XButtonPressedEvent       *event UNUSED;
1730   {
1731       SFbuttonPressed = 1;
1732   }
1733
1734       static void
1735   SFbuttonReleaseList(w, n, event)
1736       Widget             w;
1737 ***************
1738 *** 989,999 ****
1739       return result;
1740   }
1741
1742 - /* ARGSUSED */
1743       static void
1744   SFdirModTimer(cl, id)
1745 !     XtPointer         cl;
1746 !     XtIntervalId      *id;
1747   {
1748       static int                n = -1;
1749       static int                f = 0;
1750 --- 987,996 ----
1751       return result;
1752   }
1753
1754       static void
1755   SFdirModTimer(cl, id)
1756 !     XtPointer         cl UNUSED;
1757 !     XtIntervalId      *id UNUSED;
1758   {
1759       static int                n = -1;
1760       static int                f = 0;
1761 ***************
1762 *** 1596,1606 ****
1763
1764   static void SFscrollTimer __ARGS((XtPointer p, XtIntervalId *id));
1765
1766 - /* ARGSUSED */
1767       static void
1768   SFscrollTimer(p, id)
1769       XtPointer         p;
1770 !     XtIntervalId      *id;
1771   {
1772       SFDir     *dir;
1773       int               save;
1774 --- 1593,1602 ----
1775
1776   static void SFscrollTimer __ARGS((XtPointer p, XtIntervalId *id));
1777
1778       static void
1779   SFscrollTimer(p, id)
1780       XtPointer         p;
1781 !     XtIntervalId      *id UNUSED;
1782   {
1783       SFDir     *dir;
1784       int               save;
1785 ***************
1786 *** 1695,1704 ****
1787       }
1788   }
1789
1790 - /* ARGSUSED */
1791       static void
1792   SFenterList(w, n, event)
1793 !     Widget            w;
1794       int                       n;
1795       XEnterWindowEvent *event;
1796   {
1797 --- 1691,1699 ----
1798       }
1799   }
1800
1801       static void
1802   SFenterList(w, n, event)
1803 !     Widget            w UNUSED;
1804       int                       n;
1805       XEnterWindowEvent *event;
1806   {
1807 ***************
1808 *** 1719,1730 ****
1809       }
1810   }
1811
1812 - /* ARGSUSED */
1813       static void
1814   SFleaveList(w, n, event)
1815 !     Widget    w;
1816       int               n;
1817 !     XEvent    *event;
1818   {
1819       if (SFcurrentInvert[n] != -1)
1820       {
1821 --- 1714,1724 ----
1822       }
1823   }
1824
1825       static void
1826   SFleaveList(w, n, event)
1827 !     Widget    w UNUSED;
1828       int               n;
1829 !     XEvent    *event UNUSED;
1830   {
1831       if (SFcurrentInvert[n] != -1)
1832       {
1833 ***************
1834 *** 1733,1742 ****
1835       }
1836   }
1837
1838 - /* ARGSUSED */
1839       static void
1840   SFmotionList(w, n, event)
1841 !     Widget            w;
1842       int                       n;
1843       XMotionEvent      *event;
1844   {
1845 --- 1727,1735 ----
1846       }
1847   }
1848
1849       static void
1850   SFmotionList(w, n, event)
1851 !     Widget            w UNUSED;
1852       int                       n;
1853       XMotionEvent      *event;
1854   {
1855 ***************
1856 *** 1754,1760 ****
1857       }
1858   }
1859
1860 - /* ARGSUSED */
1861       static void
1862   SFvFloatSliderMovedCallback(w, n, fnew)
1863       Widget    w;
1864 --- 1747,1752 ----
1865 ***************
1866 *** 1767,1776 ****
1867       SFvSliderMovedCallback(w, (int)(long)n, nw);
1868   }
1869
1870 - /* ARGSUSED */
1871       static void
1872   SFvSliderMovedCallback(w, n, nw)
1873 !     Widget    w;
1874       int               n;
1875       int               nw;
1876   {
1877 --- 1759,1767 ----
1878       SFvSliderMovedCallback(w, (int)(long)n, nw);
1879   }
1880
1881       static void
1882   SFvSliderMovedCallback(w, n, nw)
1883 !     Widget    w UNUSED;
1884       int               n;
1885       int               nw;
1886   {
1887 ***************
1888 *** 1853,1862 ****
1889       }
1890   }
1891
1892 - /* ARGSUSED */
1893       static void
1894   SFvAreaSelectedCallback(w, n, pnew)
1895 !     Widget            w;
1896       XtPointer n;
1897       XtPointer pnew;
1898   {
1899 --- 1844,1852 ----
1900       }
1901   }
1902
1903       static void
1904   SFvAreaSelectedCallback(w, n, pnew)
1905 !     Widget    w;
1906       XtPointer n;
1907       XtPointer pnew;
1908   {
1909 ***************
1910 *** 1914,1923 ****
1911       SFvSliderMovedCallback(w, (int)(long)n, nw);
1912   }
1913
1914 - /* ARGSUSED */
1915       static void
1916   SFhSliderMovedCallback(w, n, nw)
1917 !     Widget    w;
1918       XtPointer n;
1919       XtPointer nw;
1920   {
1921 --- 1904,1912 ----
1922       SFvSliderMovedCallback(w, (int)(long)n, nw);
1923   }
1924
1925       static void
1926   SFhSliderMovedCallback(w, n, nw)
1927 !     Widget    w UNUSED;
1928       XtPointer n;
1929       XtPointer nw;
1930   {
1931 ***************
1932 *** 1933,1942 ****
1933       SFdrawList((int)(long)n, SF_DO_NOT_SCROLL);
1934   }
1935
1936 - /* ARGSUSED */
1937       static void
1938   SFhAreaSelectedCallback(w, n, pnew)
1939 !     Widget            w;
1940       XtPointer n;
1941       XtPointer pnew;
1942   {
1943 --- 1922,1930 ----
1944       SFdrawList((int)(long)n, SF_DO_NOT_SCROLL);
1945   }
1946
1947       static void
1948   SFhAreaSelectedCallback(w, n, pnew)
1949 !     Widget    w;
1950       XtPointer n;
1951       XtPointer pnew;
1952   {
1953 ***************
1954 *** 1994,2004 ****
1955       }
1956   }
1957
1958 - /* ARGSUSED */
1959       static void
1960   SFpathSliderMovedCallback(w, client_data, nw)
1961 !     Widget            w;
1962 !     XtPointer client_data;
1963       XtPointer nw;
1964   {
1965       SFDir             *dir;
1966 --- 1982,1991 ----
1967       }
1968   }
1969
1970       static void
1971   SFpathSliderMovedCallback(w, client_data, nw)
1972 !     Widget    w UNUSED;
1973 !     XtPointer client_data UNUSED;
1974       XtPointer nw;
1975   {
1976       SFDir             *dir;
1977 ***************
1978 *** 2031,2041 ****
1979       XawTextSetInsertionPoint(selFileField, pos);
1980   }
1981
1982 - /* ARGSUSED */
1983       static void
1984   SFpathAreaSelectedCallback(w, client_data, pnew)
1985       Widget    w;
1986 !     XtPointer client_data;
1987       XtPointer pnew;
1988   {
1989       int               nw = (int)(long)pnew;
1990 --- 2018,2027 ----
1991       XawTextSetInsertionPoint(selFileField, pos);
1992   }
1993
1994       static void
1995   SFpathAreaSelectedCallback(w, client_data, pnew)
1996       Widget    w;
1997 !     XtPointer client_data UNUSED;
1998       XtPointer pnew;
1999   {
2000       int               nw = (int)(long)pnew;
2001 ***************
2002 *** 2206,2218 ****
2003
2004   static void SFexposeList __ARGS((Widget w, XtPointer n, XEvent *event, Boolean *cont));
2005
2006 - /* ARGSUSED */
2007       static void
2008   SFexposeList(w, n, event, cont)
2009 !     Widget    w;
2010       XtPointer n;
2011       XEvent    *event;
2012 !     Boolean   *cont;
2013   {
2014       if ((event->type == NoExpose) || event->xexpose.count)
2015         return;
2016 --- 2192,2203 ----
2017
2018   static void SFexposeList __ARGS((Widget w, XtPointer n, XEvent *event, Boolean *cont));
2019
2020       static void
2021   SFexposeList(w, n, event, cont)
2022 !     Widget    w UNUSED;
2023       XtPointer n;
2024       XEvent    *event;
2025 !     Boolean   *cont UNUSED;
2026   {
2027       if ((event->type == NoExpose) || event->xexpose.count)
2028         return;
2029 ***************
2030 *** 2222,2234 ****
2031
2032   static void SFmodVerifyCallback __ARGS((Widget w, XtPointer client_data, XEvent *event, Boolean *cont));
2033
2034 - /* ARGSUSED */
2035       static void
2036   SFmodVerifyCallback(w, client_data, event, cont)
2037 !     Widget            w;
2038 !     XtPointer         client_data;
2039       XEvent            *event;
2040 !     Boolean           *cont;
2041   {
2042       char      buf[2];
2043
2044 --- 2207,2218 ----
2045
2046   static void SFmodVerifyCallback __ARGS((Widget w, XtPointer client_data, XEvent *event, Boolean *cont));
2047
2048       static void
2049   SFmodVerifyCallback(w, client_data, event, cont)
2050 !     Widget            w UNUSED;
2051 !     XtPointer         client_data UNUSED;
2052       XEvent            *event;
2053 !     Boolean           *cont UNUSED;
2054   {
2055       char      buf[2];
2056
2057 ***************
2058 *** 2241,2251 ****
2059
2060   static void SFokCallback __ARGS((Widget w, XtPointer cl, XtPointer cd));
2061
2062 - /* ARGSUSED */
2063       static void
2064   SFokCallback(w, cl, cd)
2065 !     Widget    w;
2066 !     XtPointer cl, cd;
2067   {
2068       SFstatus = SEL_FILE_OK;
2069   }
2070 --- 2225,2235 ----
2071
2072   static void SFokCallback __ARGS((Widget w, XtPointer cl, XtPointer cd));
2073
2074       static void
2075   SFokCallback(w, cl, cd)
2076 !     Widget    w UNUSED;
2077 !     XtPointer cl UNUSED;
2078 !     XtPointer cd UNUSED;
2079   {
2080       SFstatus = SEL_FILE_OK;
2081   }
2082 ***************
2083 *** 2258,2268 ****
2084
2085   static void SFcancelCallback __ARGS((Widget w, XtPointer cl, XtPointer cd));
2086
2087 - /* ARGSUSED */
2088       static void
2089   SFcancelCallback(w, cl, cd)
2090 !     Widget    w;
2091 !     XtPointer cl, cd;
2092   {
2093       SFstatus = SEL_FILE_CANCEL;
2094   }
2095 --- 2242,2252 ----
2096
2097   static void SFcancelCallback __ARGS((Widget w, XtPointer cl, XtPointer cd));
2098
2099       static void
2100   SFcancelCallback(w, cl, cd)
2101 !     Widget    w UNUSED;
2102 !     XtPointer cl UNUSED;
2103 !     XtPointer cd UNUSED;
2104   {
2105       SFstatus = SEL_FILE_CANCEL;
2106   }
2107 ***************
2108 *** 2275,2290 ****
2109
2110   static void SFdismissAction __ARGS((Widget w, XEvent *event, String *params, Cardinal *num_params));
2111
2112 - /* ARGSUSED */
2113       static void
2114   SFdismissAction(w, event, params, num_params)
2115 !     Widget    w;
2116 !     XEvent *event;
2117 !     String *params;
2118 !     Cardinal *num_params;
2119   {
2120 !     if (event->type == ClientMessage &&
2121 !           event->xclient.data.l[0] != SFwmDeleteWindow)
2122         return;
2123
2124       SFstatus = SEL_FILE_CANCEL;
2125 --- 2259,2273 ----
2126
2127   static void SFdismissAction __ARGS((Widget w, XEvent *event, String *params, Cardinal *num_params));
2128
2129       static void
2130   SFdismissAction(w, event, params, num_params)
2131 !     Widget    w UNUSED;
2132 !     XEvent    *event;
2133 !     String    *params UNUSED;
2134 !     Cardinal  *num_params UNUSED;
2135   {
2136 !     if (event->type == ClientMessage
2137 !           && (Atom)event->xclient.data.l[0] != SFwmDeleteWindow)
2138         return;
2139
2140       SFstatus = SEL_FILE_CANCEL;
2141 ***************
2142 *** 2703,2709 ****
2143   SFtextChanged()
2144   {
2145   #if defined(FEAT_XFONTSET) && defined(XtNinternational)
2146 !     if (_XawTextFormat((TextWidget)selFileField) == XawFmtWide)
2147       {
2148         wchar_t *wcbuf=(wchar_t *)SFtextBuffer;
2149
2150 --- 2686,2692 ----
2151   SFtextChanged()
2152   {
2153   #if defined(FEAT_XFONTSET) && defined(XtNinternational)
2154 !     if ((unsigned long)_XawTextFormat((TextWidget)selFileField) == XawFmtWide)
2155       {
2156         wchar_t *wcbuf=(wchar_t *)SFtextBuffer;
2157
2158 ***************
2159 *** 2749,2755 ****
2160   #if defined(FEAT_XFONTSET) && defined(XtNinternational)
2161       char *buf;
2162
2163 !     if (_XawTextFormat((TextWidget)selFileField) == XawFmtWide)
2164       {
2165         wchar_t *wcbuf;
2166         int mbslength;
2167 --- 2732,2738 ----
2168   #if defined(FEAT_XFONTSET) && defined(XtNinternational)
2169       char *buf;
2170
2171 !     if ((unsigned long)_XawTextFormat((TextWidget)selFileField) == XawFmtWide)
2172       {
2173         wchar_t *wcbuf;
2174         int mbslength;
2175 *** ../vim-7.2.183/src/gui_motif.c      2008-06-20 11:39:30.000000000 +0200
2176 --- src/gui_motif.c     2009-05-21 17:15:05.000000000 +0200
2177 ***************
2178 *** 117,126 ****
2179    * Call-back routines.
2180    */
2181
2182 - /* ARGSUSED */
2183       static void
2184   scroll_cb(w, client_data, call_data)
2185 !     Widget    w;
2186       XtPointer client_data, call_data;
2187   {
2188       scrollbar_T *sb;
2189 --- 117,125 ----
2190    * Call-back routines.
2191    */
2192
2193       static void
2194   scroll_cb(w, client_data, call_data)
2195 !     Widget    w UNUSED;
2196       XtPointer client_data, call_data;
2197   {
2198       scrollbar_T *sb;
2199 ***************
2200 *** 136,146 ****
2201   }
2202
2203   #ifdef FEAT_GUI_TABLINE
2204 - /*ARGSUSED*/
2205       static void
2206   tabline_cb(w, client_data, call_data)
2207 !     Widget    w;
2208 !     XtPointer client_data, call_data;
2209   {
2210       XmNotebookCallbackStruct *nptr;
2211
2212 --- 135,145 ----
2213   }
2214
2215   #ifdef FEAT_GUI_TABLINE
2216       static void
2217   tabline_cb(w, client_data, call_data)
2218 !     Widget    w UNUSED;
2219 !     XtPointer client_data UNUSED;
2220 !     XtPointer call_data;
2221   {
2222       XmNotebookCallbackStruct *nptr;
2223
2224 ***************
2225 *** 149,159 ****
2226         send_tabline_event(nptr->page_number);
2227   }
2228
2229 - /*ARGSUSED*/
2230       static void
2231   tabline_button_cb(w, client_data, call_data)
2232       Widget    w;
2233 !     XtPointer client_data, call_data;
2234   {
2235       int               cmd, tab_idx;
2236
2237 --- 148,158 ----
2238         send_tabline_event(nptr->page_number);
2239   }
2240
2241       static void
2242   tabline_button_cb(w, client_data, call_data)
2243       Widget    w;
2244 !     XtPointer client_data UNUSED;
2245 !     XtPointer call_data UNUSED;
2246   {
2247       int               cmd, tab_idx;
2248
2249 ***************
2250 *** 166,176 ****
2251   /*
2252    * Tabline single mouse click timeout handler
2253    */
2254 - /*ARGSUSED*/
2255       static void
2256   motif_tabline_timer_cb (timed_out, interval_id)
2257       XtPointer         timed_out;
2258 !     XtIntervalId      *interval_id;
2259   {
2260       *((int *)timed_out) = TRUE;
2261   }
2262 --- 165,174 ----
2263   /*
2264    * Tabline single mouse click timeout handler
2265    */
2266       static void
2267   motif_tabline_timer_cb (timed_out, interval_id)
2268       XtPointer         timed_out;
2269 !     XtIntervalId      *interval_id UNUSED;
2270   {
2271       *((int *)timed_out) = TRUE;
2272   }
2273 ***************
2274 *** 203,215 ****
2275       return FALSE;
2276   }
2277
2278 - /*ARGSUSED*/
2279       static void
2280   tabline_menu_cb(w, closure, e, continue_dispatch)
2281       Widget    w;
2282 !     XtPointer closure;
2283       XEvent    *e;
2284 !     Boolean   *continue_dispatch;
2285   {
2286       Widget                    tab_w;
2287       XButtonPressedEvent               *event;
2288 --- 201,212 ----
2289       return FALSE;
2290   }
2291
2292       static void
2293   tabline_menu_cb(w, closure, e, continue_dispatch)
2294       Widget    w;
2295 !     XtPointer closure UNUSED;
2296       XEvent    *e;
2297 !     Boolean   *continue_dispatch UNUSED;
2298   {
2299       Widget                    tab_w;
2300       XButtonPressedEvent               *event;
2301 ***************
2302 *** 277,287 ****
2303       XtManageChild(tabLine_menu);
2304   }
2305
2306 - /*ARGSUSED*/
2307       static void
2308   tabline_balloon_cb(beval, state)
2309       BalloonEval       *beval;
2310 !     int               state;
2311   {
2312       int               nr;
2313       tabpage_T *tp;
2314 --- 274,283 ----
2315       XtManageChild(tabLine_menu);
2316   }
2317
2318       static void
2319   tabline_balloon_cb(beval, state)
2320       BalloonEval       *beval;
2321 !     int               state UNUSED;
2322   {
2323       int               nr;
2324       tabpage_T *tp;
2325 ***************
2326 *** 642,654 ****
2327   #endif
2328   }
2329
2330 - /*ARGSUSED*/
2331       void
2332   gui_mch_set_text_area_pos(x, y, w, h)
2333 !     int           x;
2334 !     int           y;
2335 !     int           w;
2336 !     int           h;
2337   {
2338   #ifdef FEAT_TOOLBAR
2339       /* Give keyboard focus to the textArea instead of the toolbar. */
2340 --- 638,649 ----
2341   #endif
2342   }
2343
2344       void
2345   gui_mch_set_text_area_pos(x, y, w, h)
2346 !     int           x UNUSED;
2347 !     int           y UNUSED;
2348 !     int           w UNUSED;
2349 !     int           h UNUSED;
2350   {
2351   #ifdef FEAT_TOOLBAR
2352       /* Give keyboard focus to the textArea instead of the toolbar. */
2353 ***************
2354 *** 1261,1267 ****
2355       if (menu->icon_builtin || gui_find_bitmap(menu->name, buf, "xpm") == FAIL)
2356       {
2357         if (menu->iconidx >= 0 && menu->iconidx
2358 !                  < (sizeof(built_in_pixmaps) / sizeof(built_in_pixmaps[0])))
2359             xpm = built_in_pixmaps[menu->iconidx];
2360         else
2361             xpm = tb_blank_xpm;
2362 --- 1256,1262 ----
2363       if (menu->icon_builtin || gui_find_bitmap(menu->name, buf, "xpm") == FAIL)
2364       {
2365         if (menu->iconidx >= 0 && menu->iconidx
2366 !              < (int)(sizeof(built_in_pixmaps) / sizeof(built_in_pixmaps[0])))
2367             xpm = built_in_pixmaps[menu->iconidx];
2368         else
2369             xpm = tb_blank_xpm;
2370 ***************
2371 *** 1716,1725 ****
2372       }
2373   }
2374
2375 - /* ARGSUSED */
2376       void
2377   gui_mch_show_popupmenu(menu)
2378 !     vimmenu_T *menu;
2379   {
2380   #ifdef MOTIF_POPUP
2381       XmMenuPosition(menu->submenu_id, gui_x11_get_last_mouse_event());
2382 --- 1711,1719 ----
2383       }
2384   }
2385
2386       void
2387   gui_mch_show_popupmenu(menu)
2388 !     vimmenu_T *menu UNUSED;
2389   {
2390   #ifdef MOTIF_POPUP
2391       XmMenuPosition(menu->submenu_id, gui_x11_get_last_mouse_event());
2392 ***************
2393 *** 2046,2054 ****
2394   /*
2395    * Callback routine for dialog mnemonic processing.
2396    */
2397 - /*ARGSUSED*/
2398       static void
2399 ! mnemonic_event(Widget w, XtPointer call_data, XKeyEvent *event)
2400   {
2401       do_mnemonic(w, event->keycode);
2402   }
2403 --- 2040,2047 ----
2404   /*
2405    * Callback routine for dialog mnemonic processing.
2406    */
2407       static void
2408 ! mnemonic_event(Widget w, XtPointer call_data UNUSED, XKeyEvent *event)
2409   {
2410       do_mnemonic(w, event->keycode);
2411   }
2412 ***************
2413 *** 2287,2299 ****
2414    * Put up a file requester.
2415    * Returns the selected name in allocated memory, or NULL for Cancel.
2416    */
2417 - /* ARGSUSED */
2418       char_u *
2419   gui_mch_browse(saving, title, dflt, ext, initdir, filter)
2420 !     int               saving;         /* select file to write */
2421       char_u    *title;         /* title for the window */
2422       char_u    *dflt;          /* default name */
2423 !     char_u    *ext;           /* not used (extension added) */
2424       char_u    *initdir;       /* initial directory, NULL for current dir */
2425       char_u    *filter;        /* file name filter */
2426   {
2427 --- 2280,2291 ----
2428    * Put up a file requester.
2429    * Returns the selected name in allocated memory, or NULL for Cancel.
2430    */
2431       char_u *
2432   gui_mch_browse(saving, title, dflt, ext, initdir, filter)
2433 !     int               saving UNUSED;  /* select file to write */
2434       char_u    *title;         /* title for the window */
2435       char_u    *dflt;          /* default name */
2436 !     char_u    *ext UNUSED;    /* not used (extension added) */
2437       char_u    *initdir;       /* initial directory, NULL for current dir */
2438       char_u    *filter;        /* file name filter */
2439   {
2440 ***************
2441 *** 2413,2424 ****
2442   /*
2443    * Process callback from Dialog cancel actions.
2444    */
2445 - /* ARGSUSED */
2446       static void
2447   DialogCancelCB(w, client_data, call_data)
2448 !     Widget    w;              /*  widget id           */
2449 !     XtPointer client_data;    /*  data from application   */
2450 !     XtPointer call_data;      /*  data from widget class  */
2451   {
2452       if (browse_fname != NULL)
2453       {
2454 --- 2405,2415 ----
2455   /*
2456    * Process callback from Dialog cancel actions.
2457    */
2458       static void
2459   DialogCancelCB(w, client_data, call_data)
2460 !     Widget    w UNUSED;               /*  widget id           */
2461 !     XtPointer client_data UNUSED;     /*  data from application   */
2462 !     XtPointer call_data UNUSED;       /*  data from widget class  */
2463   {
2464       if (browse_fname != NULL)
2465       {
2466 ***************
2467 *** 2431,2442 ****
2468   /*
2469    * Process callback from Dialog actions.
2470    */
2471 - /* ARGSUSED */
2472       static void
2473   DialogAcceptCB(w, client_data, call_data)
2474 !     Widget    w;              /*  widget id           */
2475 !     XtPointer client_data;    /*  data from application   */
2476 !     XtPointer call_data;      /*  data from widget class  */
2477   {
2478       XmFileSelectionBoxCallbackStruct *fcb;
2479
2480 --- 2422,2432 ----
2481   /*
2482    * Process callback from Dialog actions.
2483    */
2484       static void
2485   DialogAcceptCB(w, client_data, call_data)
2486 !     Widget    w UNUSED;               /*  widget id           */
2487 !     XtPointer client_data UNUSED;     /*  data from application   */
2488 !     XtPointer call_data;              /*  data from widget class  */
2489   {
2490       XmFileSelectionBoxCallbackStruct *fcb;
2491
2492 ***************
2493 *** 2467,2479 ****
2494    * Callback function for the textfield.  When CR is hit this works like
2495    * hitting the "OK" button, ESC like "Cancel".
2496    */
2497 - /* ARGSUSED */
2498       static void
2499   keyhit_callback(w, client_data, event, cont)
2500       Widget            w;
2501 !     XtPointer         client_data;
2502       XEvent            *event;
2503 !     Boolean           *cont;
2504   {
2505       char      buf[2];
2506       KeySym    key_sym;
2507 --- 2457,2468 ----
2508    * Callback function for the textfield.  When CR is hit this works like
2509    * hitting the "OK" button, ESC like "Cancel".
2510    */
2511       static void
2512   keyhit_callback(w, client_data, event, cont)
2513       Widget            w;
2514 !     XtPointer         client_data UNUSED;
2515       XEvent            *event;
2516 !     Boolean           *cont UNUSED;
2517   {
2518       char      buf[2];
2519       KeySym    key_sym;
2520 ***************
2521 *** 2490,2501 ****
2522         XmTextFieldClearSelection(w, XtLastTimestampProcessed(gui.dpy));
2523   }
2524
2525 - /* ARGSUSED */
2526       static void
2527   butproc(w, client_data, call_data)
2528 !     Widget    w;
2529       XtPointer client_data;
2530 !     XtPointer call_data;
2531   {
2532       dialogStatus = (int)(long)client_data + 1;
2533   }
2534 --- 2479,2489 ----
2535         XmTextFieldClearSelection(w, XtLastTimestampProcessed(gui.dpy));
2536   }
2537
2538       static void
2539   butproc(w, client_data, call_data)
2540 !     Widget    w UNUSED;
2541       XtPointer client_data;
2542 !     XtPointer call_data UNUSED;
2543   {
2544       dialogStatus = (int)(long)client_data + 1;
2545   }
2546 ***************
2547 *** 2567,2576 ****
2548   }
2549   #endif
2550
2551 - /* ARGSUSED */
2552       int
2553   gui_mch_dialog(type, title, message, button_names, dfltbutton, textfield)
2554 !     int               type;
2555       char_u    *title;
2556       char_u    *message;
2557       char_u    *button_names;
2558 --- 2555,2563 ----
2559   }
2560   #endif
2561
2562       int
2563   gui_mch_dialog(type, title, message, button_names, dfltbutton, textfield)
2564 !     int               type UNUSED;
2565       char_u    *title;
2566       char_u    *message;
2567       char_u    *button_names;
2568 ***************
2569 *** 3197,3203 ****
2570                 XmNchildren, &children,
2571                 XmNnumChildren, &numChildren, NULL);
2572         borders += tst + tmh;
2573 !       for (i = 0; i < numChildren; i++)
2574         {
2575             whgt = 0;
2576             XtVaGetValues(children[i], XmNheight, &whgt, NULL);
2577 --- 3184,3190 ----
2578                 XmNchildren, &children,
2579                 XmNnumChildren, &numChildren, NULL);
2580         borders += tst + tmh;
2581 !       for (i = 0; i < (int)numChildren; i++)
2582         {
2583             whgt = 0;
2584             XtVaGetValues(children[i], XmNheight, &whgt, NULL);
2585 ***************
2586 *** 3237,3249 ****
2587    * I have to use footer help for backwards compatability.  Hopefully both will
2588    * get implemented and the user will have a choice.
2589    */
2590 - /*ARGSUSED*/
2591       static void
2592   toolbarbutton_enter_cb(w, client_data, event, cont)
2593 !     Widget    w;
2594       XtPointer client_data;
2595 !     XEvent    *event;
2596 !     Boolean   *cont;
2597   {
2598       vimmenu_T *menu = (vimmenu_T *) client_data;
2599
2600 --- 3224,3235 ----
2601    * I have to use footer help for backwards compatability.  Hopefully both will
2602    * get implemented and the user will have a choice.
2603    */
2604       static void
2605   toolbarbutton_enter_cb(w, client_data, event, cont)
2606 !     Widget    w UNUSED;
2607       XtPointer client_data;
2608 !     XEvent    *event UNUSED;
2609 !     Boolean   *cont UNUSED;
2610   {
2611       vimmenu_T *menu = (vimmenu_T *) client_data;
2612
2613 ***************
2614 *** 3254,3266 ****
2615       }
2616   }
2617
2618 - /*ARGSUSED*/
2619       static void
2620   toolbarbutton_leave_cb(w, client_data, event, cont)
2621 !     Widget    w;
2622 !     XtPointer client_data;
2623 !     XEvent    *event;
2624 !     Boolean   *cont;
2625   {
2626       gui_mch_set_footer((char_u *) "");
2627   }
2628 --- 3240,3251 ----
2629       }
2630   }
2631
2632       static void
2633   toolbarbutton_leave_cb(w, client_data, event, cont)
2634 !     Widget    w UNUSED;
2635 !     XtPointer client_data UNUSED;
2636 !     XEvent    *event UNUSED;
2637 !     Boolean   *cont UNUSED;
2638   {
2639       gui_mch_set_footer((char_u *) "");
2640   }
2641 ***************
2642 *** 3492,3501 ****
2643   /*
2644    * Set the fontlist for Widget "id" to use gui.menu_fontset or gui.menu_font.
2645    */
2646 - /*ARGSUSED*/
2647       void
2648   gui_motif_menu_fontlist(id)
2649 !     Widget  id;
2650   {
2651   #ifdef FEAT_MENU
2652   #ifdef FONTSET_ALWAYS
2653 --- 3477,3485 ----
2654   /*
2655    * Set the fontlist for Widget "id" to use gui.menu_fontset or gui.menu_font.
2656    */
2657       void
2658   gui_motif_menu_fontlist(id)
2659 !     Widget  id UNUSED;
2660   {
2661   #ifdef FEAT_MENU
2662   #ifdef FONTSET_ALWAYS
2663 ***************
2664 *** 3566,3573 ****
2665       Widget cancel;
2666   } SharedFindReplace;
2667
2668 ! static SharedFindReplace find_widgets = { NULL };
2669 ! static SharedFindReplace repl_widgets = { NULL };
2670
2671   static void find_replace_destroy_callback __ARGS((Widget w, XtPointer client_data, XtPointer call_data));
2672   static void find_replace_dismiss_callback __ARGS((Widget w, XtPointer client_data, XtPointer call_data));
2673 --- 3550,3557 ----
2674       Widget cancel;
2675   } SharedFindReplace;
2676
2677 ! static SharedFindReplace find_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
2678 ! static SharedFindReplace repl_widgets = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
2679
2680   static void find_replace_destroy_callback __ARGS((Widget w, XtPointer client_data, XtPointer call_data));
2681   static void find_replace_dismiss_callback __ARGS((Widget w, XtPointer client_data, XtPointer call_data));
2682 ***************
2683 *** 3576,3587 ****
2684   static void find_replace_keypress __ARGS((Widget w, SharedFindReplace * frdp, XKeyEvent * event));
2685   static void find_replace_dialog_create __ARGS((char_u *entry_text, int do_replace));
2686
2687 - /*ARGSUSED*/
2688       static void
2689   find_replace_destroy_callback(w, client_data, call_data)
2690 !     Widget    w;
2691       XtPointer client_data;
2692 !     XtPointer call_data;
2693   {
2694       SharedFindReplace *cd = (SharedFindReplace *)client_data;
2695
2696 --- 3560,3570 ----
2697   static void find_replace_keypress __ARGS((Widget w, SharedFindReplace * frdp, XKeyEvent * event));
2698   static void find_replace_dialog_create __ARGS((char_u *entry_text, int do_replace));
2699
2700       static void
2701   find_replace_destroy_callback(w, client_data, call_data)
2702 !     Widget    w UNUSED;
2703       XtPointer client_data;
2704 !     XtPointer call_data UNUSED;
2705   {
2706       SharedFindReplace *cd = (SharedFindReplace *)client_data;
2707
2708 ***************
2709 *** 3590,3601 ****
2710         cd->dialog = (Widget)0;
2711   }
2712
2713 - /*ARGSUSED*/
2714       static void
2715   find_replace_dismiss_callback(w, client_data, call_data)
2716 !     Widget    w;
2717       XtPointer client_data;
2718 !     XtPointer call_data;
2719   {
2720       SharedFindReplace *cd = (SharedFindReplace *)client_data;
2721
2722 --- 3573,3583 ----
2723         cd->dialog = (Widget)0;
2724   }
2725
2726       static void
2727   find_replace_dismiss_callback(w, client_data, call_data)
2728 !     Widget    w UNUSED;
2729       XtPointer client_data;
2730 !     XtPointer call_data UNUSED;
2731   {
2732       SharedFindReplace *cd = (SharedFindReplace *)client_data;
2733
2734 ***************
2735 *** 3603,3624 ****
2736         XtUnmanageChild(cd->dialog);
2737   }
2738
2739 - /*ARGSUSED*/
2740       static void
2741   entry_activate_callback(w, client_data, call_data)
2742 !     Widget    w;
2743       XtPointer client_data;
2744 !     XtPointer call_data;
2745   {
2746       XmProcessTraversal((Widget)client_data, XmTRAVERSE_CURRENT);
2747   }
2748
2749 - /*ARGSUSED*/
2750       static void
2751   find_replace_callback(w, client_data, call_data)
2752 !     Widget    w;
2753       XtPointer client_data;
2754 !     XtPointer call_data;
2755   {
2756       long_u    flags = (long_u)client_data;
2757       char      *find_text, *repl_text;
2758 --- 3585,3604 ----
2759         XtUnmanageChild(cd->dialog);
2760   }
2761
2762       static void
2763   entry_activate_callback(w, client_data, call_data)
2764 !     Widget    w UNUSED;
2765       XtPointer client_data;
2766 !     XtPointer call_data UNUSED;
2767   {
2768       XmProcessTraversal((Widget)client_data, XmTRAVERSE_CURRENT);
2769   }
2770
2771       static void
2772   find_replace_callback(w, client_data, call_data)
2773 !     Widget    w UNUSED;
2774       XtPointer client_data;
2775 !     XtPointer call_data UNUSED;
2776   {
2777       long_u    flags = (long_u)client_data;
2778       char      *find_text, *repl_text;
2779 ***************
2780 *** 3668,3677 ****
2781         XtFree(repl_text);
2782   }
2783
2784 - /*ARGSUSED*/
2785       static void
2786   find_replace_keypress(w, frdp, event)
2787 !     Widget            w;
2788       SharedFindReplace *frdp;
2789       XKeyEvent         *event;
2790   {
2791 --- 3648,3656 ----
2792         XtFree(repl_text);
2793   }
2794
2795       static void
2796   find_replace_keypress(w, frdp, event)
2797 !     Widget            w UNUSED;
2798       SharedFindReplace *frdp;
2799       XKeyEvent         *event;
2800   {
2801 *** ../vim-7.2.183/src/gui_xmdlg.c      2008-11-28 21:26:50.000000000 +0100
2802 --- src/gui_xmdlg.c     2009-05-21 17:01:52.000000000 +0200
2803 ***************
2804 *** 448,454 ****
2805
2806             items[i] = XmStringCreateLocalized(list[ENCODING][i]);
2807
2808 !           if (i < n_items)
2809             {
2810                 /* recycle old button */
2811                 XtVaSetValues(children[i],
2812 --- 448,454 ----
2813
2814             items[i] = XmStringCreateLocalized(list[ENCODING][i]);
2815
2816 !           if (i < (int)n_items)
2817             {
2818                 /* recycle old button */
2819                 XtVaSetValues(children[i],
2820 ***************
2821 *** 481,487 ****
2822
2823         /* Destroy all the outstanding menu items.
2824          */
2825 !       for (i = count[ENCODING]; i < n_items; ++i)
2826         {
2827             XtUnmanageChild(children[i]);
2828             XtDestroyWidget(children[i]);
2829 --- 481,487 ----
2830
2831         /* Destroy all the outstanding menu items.
2832          */
2833 !       for (i = count[ENCODING]; i < (int)n_items; ++i)
2834         {
2835             XtUnmanageChild(children[i]);
2836             XtDestroyWidget(children[i]);
2837 ***************
2838 *** 544,552 ****
2839       }
2840   }
2841
2842 - /*ARGSUSED*/
2843       static void
2844 ! stoggle_callback(Widget w,
2845         SharedFontSelData *data,
2846         XmToggleButtonCallbackStruct *call_data)
2847   {
2848 --- 544,551 ----
2849       }
2850   }
2851
2852       static void
2853 ! stoggle_callback(Widget w UNUSED,
2854         SharedFontSelData *data,
2855         XmToggleButtonCallbackStruct *call_data)
2856   {
2857 ***************
2858 *** 709,719 ****
2859       }
2860   }
2861
2862 - /*ARGSUSED*/
2863       static void
2864   encoding_callback(Widget w,
2865         SharedFontSelData *data,
2866 !       XtPointer dummy)
2867   {
2868       XmString str;
2869       XmListCallbackStruct fake_data;
2870 --- 708,717 ----
2871       }
2872   }
2873
2874       static void
2875   encoding_callback(Widget w,
2876         SharedFontSelData *data,
2877 !       XtPointer dummy UNUSED)
2878   {
2879       XmString str;
2880       XmListCallbackStruct fake_data;
2881 ***************
2882 *** 752,762 ****
2883       do_choice(w, data, call_data, SIZE);
2884   }
2885
2886 - /*ARGSUSED*/
2887       static void
2888 ! cancel_callback(Widget w,
2889         SharedFontSelData *data,
2890 !       XmListCallbackStruct *call_data)
2891   {
2892       if (data->sel[ENCODING])
2893       {
2894 --- 750,759 ----
2895       do_choice(w, data, call_data, SIZE);
2896   }
2897
2898       static void
2899 ! cancel_callback(Widget w UNUSED,
2900         SharedFontSelData *data,
2901 !       XmListCallbackStruct *call_data UNUSED)
2902   {
2903       if (data->sel[ENCODING])
2904       {
2905 ***************
2906 *** 789,799 ****
2907       data->exit = True;
2908   }
2909
2910 - /*ARGSUSED*/
2911       static void
2912 ! ok_callback(Widget w,
2913         SharedFontSelData *data,
2914 !       XmPushButtonCallbackStruct *call_data)
2915   {
2916       char    *pattern;
2917       char    **name;
2918 --- 786,795 ----
2919       data->exit = True;
2920   }
2921
2922       static void
2923 ! ok_callback(Widget w UNUSED,
2924         SharedFontSelData *data,
2925 !       XmPushButtonCallbackStruct *call_data UNUSED)
2926   {
2927       char    *pattern;
2928       char    **name;
2929 *** ../vim-7.2.183/src/gui_xmebw.c      2008-11-28 21:26:50.000000000 +0100
2930 --- src/gui_xmebw.c     2009-05-21 17:06:17.000000000 +0200
2931 ***************
2932 *** 235,247 ****
2933       return tmp;
2934   }
2935
2936 - /*ARGSUSED*/
2937       static int
2938   alloc_color(Display   *display,
2939         Colormap        colormap,
2940         char            *colorname,
2941         XColor          *xcolor,
2942 !       void            *closure)
2943   {
2944       int status;
2945
2946 --- 235,246 ----
2947       return tmp;
2948   }
2949
2950       static int
2951   alloc_color(Display   *display,
2952         Colormap        colormap,
2953         char            *colorname,
2954         XColor          *xcolor,
2955 !       void            *closure UNUSED)
2956   {
2957       int status;
2958
2959 ***************
2960 *** 595,603 ****
2961                        XtHeight(eb), eb->primitive.highlight_thickness);
2962   }
2963
2964 - /*ARGSUSED*/
2965       static void
2966 ! draw_pixmap(XmEnhancedButtonWidget eb, XEvent *event, Region region)
2967   {
2968       Pixmap    pix;
2969       GC                gc = eb->label.normal_GC;
2970 --- 594,603 ----
2971                        XtHeight(eb), eb->primitive.highlight_thickness);
2972   }
2973
2974       static void
2975 ! draw_pixmap(XmEnhancedButtonWidget eb,
2976 !           XEvent *event UNUSED,
2977 !           Region region UNUSED)
2978   {
2979       Pixmap    pix;
2980       GC                gc = eb->label.normal_GC;
2981 ***************
2982 *** 641,647 ****
2983       height = eb->core.height - 2 * y;
2984       if (h < height)
2985         height = h;
2986 !     if (depth == eb->core.depth)
2987         XCopyArea(XtDisplay(eb), pix, XtWindow(eb), gc, 0, 0,
2988                 width, height, x, y);
2989       else if (depth == 1)
2990 --- 641,647 ----
2991       height = eb->core.height - 2 * y;
2992       if (h < height)
2993         height = h;
2994 !     if (depth == (int)eb->core.depth)
2995         XCopyArea(XtDisplay(eb), pix, XtWindow(eb), gc, 0, 0,
2996                 width, height, x, y);
2997       else if (depth == 1)
2998 ***************
2999 *** 731,739 ****
3000         eb->label.normal_GC = tmp_gc;
3001   }
3002
3003 - /*ARGSUSED*/
3004       static void
3005 ! Enter(Widget wid, XEvent *event, String *params, Cardinal *num_params)
3006   {
3007       XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget) wid;
3008       XmPushButtonCallbackStruct call_value;
3009 --- 731,741 ----
3010         eb->label.normal_GC = tmp_gc;
3011   }
3012
3013       static void
3014 ! Enter(Widget wid,
3015 !       XEvent *event,
3016 !       String *params UNUSED,
3017 !       Cardinal *num_params UNUSED)
3018   {
3019       XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget) wid;
3020       XmPushButtonCallbackStruct call_value;
3021 ***************
3022 *** 818,826 ****
3023       }
3024   }
3025
3026 - /*ARGSUSED*/
3027       static void
3028 ! Leave(Widget wid, XEvent *event, String *params, Cardinal *num_params)
3029   {
3030       XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget)wid;
3031       XmPushButtonCallbackStruct call_value;
3032 --- 820,830 ----
3033       }
3034   }
3035
3036       static void
3037 ! Leave(Widget wid,
3038 !       XEvent *event,
3039 !       String *params UNUSED,
3040 !       Cardinal *num_params UNUSED)
3041   {
3042       XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget)wid;
3043       XmPushButtonCallbackStruct call_value;
3044 ***************
3045 *** 976,984 ****
3046       }
3047   }
3048
3049 - /*ARGSUSED*/
3050       static void
3051 ! Initialize(Widget rq, Widget ebw, ArgList args, Cardinal *n)
3052   {
3053       XmEnhancedButtonWidget  request = (XmEnhancedButtonWidget)rq;
3054       XmEnhancedButtonWidget  eb = (XmEnhancedButtonWidget)ebw;
3055 --- 980,987 ----
3056       }
3057   }
3058
3059       static void
3060 ! Initialize(Widget rq, Widget ebw, ArgList args UNUSED, Cardinal *n UNUSED)
3061   {
3062       XmEnhancedButtonWidget  request = (XmEnhancedButtonWidget)rq;
3063       XmEnhancedButtonWidget  eb = (XmEnhancedButtonWidget)ebw;
3064 ***************
3065 *** 1056,1064 ****
3066       free_pixmaps((XmEnhancedButtonWidget)w);
3067   }
3068
3069 - /*ARGSUSED*/
3070       static Boolean
3071 ! SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *n)
3072   {
3073       XmEnhancedButtonWidget  cur = (XmEnhancedButtonWidget) current;
3074       XmEnhancedButtonWidget  eb = (XmEnhancedButtonWidget) new;
3075 --- 1059,1070 ----
3076       free_pixmaps((XmEnhancedButtonWidget)w);
3077   }
3078
3079       static Boolean
3080 ! SetValues(Widget current,
3081 !         Widget request UNUSED,
3082 !         Widget new,
3083 !         ArgList args UNUSED,
3084 !         Cardinal *n UNUSED)
3085   {
3086       XmEnhancedButtonWidget  cur = (XmEnhancedButtonWidget) current;
3087       XmEnhancedButtonWidget  eb = (XmEnhancedButtonWidget) new;
3088 ***************
3089 *** 1108,1114 ****
3090                 if ((win_x < 0) || (win_y < 0))
3091                     return False;
3092
3093 !               if ((win_x > r_width) || (win_y > r_height))
3094                     return False;
3095                 draw_highlight(eb);
3096                 draw_shadows(eb);
3097 --- 1114,1120 ----
3098                 if ((win_x < 0) || (win_y < 0))
3099                     return False;
3100
3101 !               if ((win_x > (int)r_width) || (win_y > (int)r_height))
3102                     return False;
3103                 draw_highlight(eb);
3104                 draw_shadows(eb);
3105 *** ../vim-7.2.183/src/if_python.c      2009-01-13 18:10:21.000000000 +0100
3106 --- src/if_python.c     2009-05-21 17:27:50.000000000 +0200
3107 ***************
3108 *** 1096,1104 ****
3109
3110   /* Vim module - Implementation
3111    */
3112 - /*ARGSUSED*/
3113       static PyObject *
3114 ! VimCommand(PyObject *self, PyObject *args)
3115   {
3116       char *cmd;
3117       PyObject *result;
3118 --- 1096,1103 ----
3119
3120   /* Vim module - Implementation
3121    */
3122       static PyObject *
3123 ! VimCommand(PyObject *self UNUSED, PyObject *args)
3124   {
3125       char *cmd;
3126       PyObject *result;
3127 ***************
3128 *** 1242,1250 ****
3129   }
3130   #endif
3131
3132 - /*ARGSUSED*/
3133       static PyObject *
3134 ! VimEval(PyObject *self, PyObject *args)
3135   {
3136   #ifdef FEAT_EVAL
3137       char      *expr;
3138 --- 1241,1248 ----
3139   }
3140   #endif
3141
3142       static PyObject *
3143 ! VimEval(PyObject *self UNUSED, PyObject *args)
3144   {
3145   #ifdef FEAT_EVAL
3146       char      *expr;
3147 ***************
3148 *** 1894,1902 ****
3149   /* Buffer list object - Implementation
3150    */
3151
3152 - /*ARGSUSED*/
3153       static PyInt
3154 ! BufListLength(PyObject *self)
3155   {
3156       buf_T     *b = firstbuf;
3157       PyInt     n = 0;
3158 --- 1892,1899 ----
3159   /* Buffer list object - Implementation
3160    */
3161
3162       static PyInt
3163 ! BufListLength(PyObject *self UNUSED)
3164   {
3165       buf_T     *b = firstbuf;
3166       PyInt     n = 0;
3167 ***************
3168 *** 1910,1918 ****
3169       return n;
3170   }
3171
3172 - /*ARGSUSED*/
3173       static PyObject *
3174 ! BufListItem(PyObject *self, PyInt n)
3175   {
3176       buf_T *b;
3177
3178 --- 1907,1914 ----
3179       return n;
3180   }
3181
3182       static PyObject *
3183 ! BufListItem(PyObject *self UNUSED, PyInt n)
3184   {
3185       buf_T *b;
3186
3187 ***************
3188 *** 2210,2218 ****
3189
3190   /* Window list object - Implementation
3191    */
3192 - /*ARGSUSED*/
3193       static PyInt
3194 ! WinListLength(PyObject *self)
3195   {
3196       win_T     *w = firstwin;
3197       PyInt     n = 0;
3198 --- 2206,2213 ----
3199
3200   /* Window list object - Implementation
3201    */
3202       static PyInt
3203 ! WinListLength(PyObject *self UNUSED)
3204   {
3205       win_T     *w = firstwin;
3206       PyInt     n = 0;
3207 ***************
3208 *** 2226,2234 ****
3209       return n;
3210   }
3211
3212 - /*ARGSUSED*/
3213       static PyObject *
3214 ! WinListItem(PyObject *self, PyInt n)
3215   {
3216       win_T *w;
3217
3218 --- 2221,2228 ----
3219       return n;
3220   }
3221
3222       static PyObject *
3223 ! WinListItem(PyObject *self UNUSED, PyInt n)
3224   {
3225       win_T *w;
3226
3227 ***************
3228 *** 2274,2282 ****
3229
3230   /* Current items object - Implementation
3231    */
3232 - /*ARGSUSED*/
3233       static PyObject *
3234 ! CurrentGetattr(PyObject *self, char *name)
3235   {
3236       if (strcmp(name, "buffer") == 0)
3237         return (PyObject *)BufferNew(curbuf);
3238 --- 2268,2275 ----
3239
3240   /* Current items object - Implementation
3241    */
3242       static PyObject *
3243 ! CurrentGetattr(PyObject *self UNUSED, char *name)
3244   {
3245       if (strcmp(name, "buffer") == 0)
3246         return (PyObject *)BufferNew(curbuf);
3247 ***************
3248 *** 2295,2303 ****
3249       }
3250   }
3251
3252 - /*ARGSUSED*/
3253       static int
3254 ! CurrentSetattr(PyObject *self, char *name, PyObject *value)
3255   {
3256       if (strcmp(name, "line") == 0)
3257       {
3258 --- 2288,2295 ----
3259       }
3260   }
3261
3262       static int
3263 ! CurrentSetattr(PyObject *self UNUSED, char *name, PyObject *value)
3264   {
3265       if (strcmp(name, "line") == 0)
3266       {
3267 *** ../vim-7.2.183/src/window.c 2009-02-22 02:36:36.000000000 +0100
3268 --- src/window.c        2009-05-21 15:14:54.000000000 +0200
3269 ***************
3270 *** 1163,1174 ****
3271    * WSP_NEWLOC may be specified in flags to prevent the location list from
3272    * being copied.
3273    */
3274 - /*ARGSUSED*/
3275       static void
3276   win_init(newp, oldp, flags)
3277       win_T     *newp;
3278       win_T     *oldp;
3279 !     int                flags;
3280   {
3281       int               i;
3282
3283 --- 1163,1173 ----
3284    * WSP_NEWLOC may be specified in flags to prevent the location list from
3285    * being copied.
3286    */
3287       static void
3288   win_init(newp, oldp, flags)
3289       win_T     *newp;
3290       win_T     *oldp;
3291 !     int                flags UNUSED;
3292   {
3293       int               i;
3294
3295 ***************
3296 *** 1268,1278 ****
3297    * Must be called when there is just one window, filling the whole screen
3298    * (excluding the command line).
3299    */
3300 - /*ARGSUSED*/
3301       int
3302   make_windows(count, vertical)
3303       int               count;
3304 !     int               vertical;       /* split windows vertically if TRUE */
3305   {
3306       int               maxcount;
3307       int               todo;
3308 --- 1267,1276 ----
3309    * Must be called when there is just one window, filling the whole screen
3310    * (excluding the command line).
3311    */
3312       int
3313   make_windows(count, vertical)
3314       int               count;
3315 !     int               vertical UNUSED;  /* split windows vertically if TRUE */
3316   {
3317       int               maxcount;
3318       int               todo;
3319 ***************
3320 *** 2353,2363 ****
3321    * Remove a window and its frame from the tree of frames.
3322    * Returns a pointer to the window that got the freed up space.
3323    */
3324 - /*ARGSUSED*/
3325       static win_T *
3326   winframe_remove(win, dirp, tp)
3327       win_T     *win;
3328 !     int               *dirp;          /* set to 'v' or 'h' for direction if 'ea' */
3329       tabpage_T *tp;            /* tab page "win" is in, NULL for current */
3330   {
3331       frame_T   *frp, *frp2, *frp3;
3332 --- 2351,2360 ----
3333    * Remove a window and its frame from the tree of frames.
3334    * Returns a pointer to the window that got the freed up space.
3335    */
3336       static win_T *
3337   winframe_remove(win, dirp, tp)
3338       win_T     *win;
3339 !     int               *dirp UNUSED;   /* set to 'v' or 'h' for direction if 'ea' */
3340       tabpage_T *tp;            /* tab page "win" is in, NULL for current */
3341   {
3342       frame_T   *frp, *frp2, *frp3;
3343 ***************
3344 *** 3500,3509 ****
3345    * FAIL.
3346    * Careful: When OK is returned need to get a new tab page very very soon!
3347    */
3348 - /*ARGSUSED*/
3349       static int
3350   leave_tabpage(new_curbuf)
3351 !     buf_T     *new_curbuf;        /* what is going to be the new curbuf,
3352                                        NULL if unknown */
3353   {
3354       tabpage_T *tp = curtab;
3355 --- 3497,3505 ----
3356    * FAIL.
3357    * Careful: When OK is returned need to get a new tab page very very soon!
3358    */
3359       static int
3360   leave_tabpage(new_curbuf)
3361 !     buf_T     *new_curbuf UNUSED;    /* what is going to be the new curbuf,
3362                                        NULL if unknown */
3363   {
3364       tabpage_T *tp = curtab;
3365 ***************
3366 *** 3545,3555 ****
3367    * Start using tab page "tp".
3368    * Only to be used after leave_tabpage() or freeing the current tab page.
3369    */
3370 - /*ARGSUSED*/
3371       static void
3372   enter_tabpage(tp, old_curbuf)
3373       tabpage_T *tp;
3374 !     buf_T     *old_curbuf;
3375   {
3376       int               old_off = tp->tp_firstwin->w_winrow;
3377       win_T     *next_prevwin = tp->tp_prevwin;
3378 --- 3541,3550 ----
3379    * Start using tab page "tp".
3380    * Only to be used after leave_tabpage() or freeing the current tab page.
3381    */
3382       static void
3383   enter_tabpage(tp, old_curbuf)
3384       tabpage_T *tp;
3385 !     buf_T     *old_curbuf UNUSED;
3386   {
3387       int               old_off = tp->tp_firstwin->w_winrow;
3388       win_T     *next_prevwin = tp->tp_prevwin;
3389 ***************
3390 *** 4157,4166 ****
3391   /*
3392    * allocate a window structure and link it in the window list
3393    */
3394 - /*ARGSUSED*/
3395       static win_T *
3396   win_alloc(after)
3397 !     win_T     *after;
3398   {
3399       win_T     *newwin;
3400
3401 --- 4152,4160 ----
3402   /*
3403    * allocate a window structure and link it in the window list
3404    */
3405       static win_T *
3406   win_alloc(after)
3407 !     win_T     *after UNUSED;
3408   {
3409       win_T     *newwin;
3410
3411 *** ../vim-7.2.183/src/workshop.c       2008-11-28 11:47:14.000000000 +0100
3412 --- src/workshop.c      2009-05-21 17:12:55.000000000 +0200
3413 ***************
3414 *** 204,215 ****
3415    * Function:
3416    *    Load a given file into the WorkShop buffer.
3417    */
3418 - /*ARGSUSED*/
3419       void
3420   workshop_load_file(
3421         char    *filename,              /* the file to load */
3422         int      line,                  /* an optional line number (or 0) */
3423 !       char    *frameid)               /* used for multi-frame support */
3424   {
3425   #ifdef WSDEBUG_TRACE
3426       if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
3427 --- 204,214 ----
3428    * Function:
3429    *    Load a given file into the WorkShop buffer.
3430    */
3431       void
3432   workshop_load_file(
3433         char    *filename,              /* the file to load */
3434         int      line,                  /* an optional line number (or 0) */
3435 !       char    *frameid UNUSED)        /* used for multi-frame support */
3436   {
3437   #ifdef WSDEBUG_TRACE
3438       if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
3439 ***************
3440 *** 263,272 ****
3441       load_window(filename, lineno);
3442   }
3443
3444 - /*ARGSUSED*/
3445       void
3446   workshop_front_file(
3447 !       char    *filename)
3448   {
3449   #ifdef WSDEBUG_TRACE
3450       if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
3451 --- 262,270 ----
3452       load_window(filename, lineno);
3453   }
3454
3455       void
3456   workshop_front_file(
3457 !       char    *filename UNUSED)
3458   {
3459   #ifdef WSDEBUG_TRACE
3460       if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
3461 ***************
3462 *** 538,546 ****
3463    * breakpoints have moved when a program has been recompiled and
3464    * reloaded into dbx.
3465    */
3466 - /*ARGSUSED*/
3467       void
3468 ! workshop_moved_marks(char *filename)
3469   {
3470   #ifdef WSDEBUG_TRACE
3471       if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
3472 --- 536,543 ----
3473    * breakpoints have moved when a program has been recompiled and
3474    * reloaded into dbx.
3475    */
3476       void
3477 ! workshop_moved_marks(char *filename UNUSED)
3478   {
3479   #ifdef WSDEBUG_TRACE
3480       if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
3481 ***************
3482 *** 575,585 ****
3483       return (int)h;
3484   }
3485
3486 - /*ARGSUSED*/
3487       void
3488   workshop_footer_message(
3489 !       char            *message,
3490 !       int              severity)      /* severity is currently unused */
3491   {
3492   #ifdef WSDEBUG_TRACE
3493       if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
3494 --- 572,581 ----
3495       return (int)h;
3496   }
3497
3498       void
3499   workshop_footer_message(
3500 !       char    *message,
3501 !       int     severity UNUSED)        /* severity is currently unused */
3502   {
3503   #ifdef WSDEBUG_TRACE
3504       if (WSDLEVEL(WS_TRACE_VERBOSE | WS_TRACE))
3505 ***************
3506 *** 687,701 ****
3507    * command. The globals curMenuName and curMenuPriority contain the name and
3508    * priority of the parent menu tree.
3509    */
3510 - /*ARGSUSED*/
3511       void
3512   workshop_menu_item(
3513         char            *label,
3514         char            *verb,
3515 !       char            *accelerator,
3516         char            *acceleratorText,
3517 !       char            *name,
3518 !       char            *filepos,
3519         char            *sensitive)
3520   {
3521       char               cbuf[BUFSIZ];
3522 --- 683,696 ----
3523    * command. The globals curMenuName and curMenuPriority contain the name and
3524    * priority of the parent menu tree.
3525    */
3526       void
3527   workshop_menu_item(
3528         char            *label,
3529         char            *verb,
3530 !       char            *accelerator UNUSED,
3531         char            *acceleratorText,
3532 !       char            *name UNUSED,
3533 !       char            *filepos UNUSED,
3534         char            *sensitive)
3535   {
3536       char               cbuf[BUFSIZ];
3537 ***************
3538 *** 810,822 ****
3539       workshopInitDone = True;
3540   }
3541
3542 - /*ARGSUSED*/
3543       void
3544   workshop_toolbar_button(
3545         char    *label,
3546         char    *verb,
3547 !       char    *senseVerb,
3548 !       char    *filepos,
3549         char    *help,
3550         char    *sense,
3551         char    *file,
3552 --- 805,816 ----
3553       workshopInitDone = True;
3554   }
3555
3556       void
3557   workshop_toolbar_button(
3558         char    *label,
3559         char    *verb,
3560 !       char    *senseVerb UNUSED,
3561 !       char    *filepos UNUSED,
3562         char    *help,
3563         char    *sense,
3564         char    *file,
3565 ***************
3566 *** 968,974 ****
3567             if (strcmp(option, "syntax") == 0)
3568                 vim_snprintf(cbuf, sizeof(cbuf), "syntax %s", value);
3569             else if (strcmp(option, "savefiles") == 0)
3570 !               ; /* XXX - Not yet implemented */
3571             break;
3572
3573         case 'l':
3574 --- 962,970 ----
3575             if (strcmp(option, "syntax") == 0)
3576                 vim_snprintf(cbuf, sizeof(cbuf), "syntax %s", value);
3577             else if (strcmp(option, "savefiles") == 0)
3578 !           {
3579 !               /* XXX - Not yet implemented */
3580 !           }
3581             break;
3582
3583         case 'l':
3584 ***************
3585 *** 1098,1107 ****
3586   /*
3587    * A button in the toolbar has been pushed.
3588    */
3589 - /*ARGSUSED*/
3590       int
3591   workshop_get_positions(
3592 !       void            *clientData,    /* unused */
3593         char           **filename,      /* output data */
3594         int             *curLine,       /* output data */
3595         int             *curCol,        /* output data */
3596 --- 1094,1102 ----
3597   /*
3598    * A button in the toolbar has been pushed.
3599    */
3600       int
3601   workshop_get_positions(
3602 !       void            *clientData UNUSED,
3603         char           **filename,      /* output data */
3604         int             *curLine,       /* output data */
3605         int             *curCol,        /* output data */
3606 ***************
3607 *** 1526,1534 ****
3608         return NULL;
3609   }
3610
3611 - /*ARGSUSED*/
3612       void
3613 ! workshop_save_sensitivity(char *filename)
3614   {
3615   }
3616
3617 --- 1521,1528 ----
3618         return NULL;
3619   }
3620
3621       void
3622 ! workshop_save_sensitivity(char *filename UNUSED)
3623   {
3624   }
3625
3626 *** ../vim-7.2.183/src/version.c        2009-05-21 15:19:59.000000000 +0200
3627 --- src/version.c       2009-05-21 23:19:40.000000000 +0200
3628 ***************
3629 *** 678,679 ****
3630 --- 678,681 ----
3631   {   /* Add new patch number below this line */
3632 + /**/
3633 +     184,
3634   /**/
3635
3636 --
3637 CART DRIVER: Bring out your dead!
3638 LARGE MAN:   Here's one!
3639 CART DRIVER: Ninepence.
3640 BODY:        I'm not dead!
3641                  "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
3642
3643  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
3644 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
3645 \\\        download, build and distribute -- http://www.A-A-P.org        ///
3646  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///