7.3.102

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.102
   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.3.102
  11 Problem:    When using ":make", typing the next command and then getting the
  12             "reload" prompt the next command is (partly) eaten by the reload
  13             prompt.
  14 Solution:   Accept ':' as a special character at the reload prompt to accept
  15             the default choice and execute the command.
  16 Files:      src/eval.c, src/fileio.c, src/gui.c, src/gui_xmdlg.c,
  17             src/memline.c, src/message.c, src/proto/message.pro,
  18             src/gui_athena.c, src/gui_gtk.c, src/gui_mac.c, src/gui_motif.c,
  19             src/gui_photon.c, src/gui_w16.c, src/gui_w32.c, src/os_mswin.c
  20             src/proto/gui_athena.pro, src/proto/gui_gtk.pro,
  21             src/proto/gui_mac.pro, src/proto/gui_motif.pro,
  22             src/proto/gui_photon.pro, src/proto/gui_w16.pro,
  23             src/proto/gui_w32.pro
  24
  25
  26 *** ../vim-7.3.101/src/eval.c   2011-01-04 19:03:22.000000000 +0100
  27 --- src/eval.c  2011-01-16 00:14:21.000000000 +0100
  28 ***************
  29 *** 9323,9329 ****
  30
  31       if (!error)
  32         rettv->vval.v_number = do_dialog(type, NULL, message, buttons,
  33 !                                                                  def, NULL);
  34   #endif
  35   }
  36
  37 --- 9323,9329 ----
  38
  39       if (!error)
  40         rettv->vval.v_number = do_dialog(type, NULL, message, buttons,
  41 !                                                           def, NULL, FALSE);
  42   #endif
  43   }
  44
  45 ***************
  46 *** 12744,12750 ****
  47             IObuff[0] = NUL;
  48         if (message != NULL && defstr != NULL
  49                 && do_dialog(VIM_QUESTION, NULL, message,
  50 !                               (char_u *)_("&OK\n&Cancel"), 1, IObuff) == 1)
  51             rettv->vval.v_string = vim_strsave(IObuff);
  52         else
  53         {
  54 --- 12744,12750 ----
  55             IObuff[0] = NUL;
  56         if (message != NULL && defstr != NULL
  57                 && do_dialog(VIM_QUESTION, NULL, message,
  58 !                         (char_u *)_("&OK\n&Cancel"), 1, IObuff, FALSE) == 1)
  59             rettv->vval.v_string = vim_strsave(IObuff);
  60         else
  61         {
  62 *** ../vim-7.3.101/src/fileio.c 2010-12-17 18:06:00.000000000 +0100
  63 --- src/fileio.c        2011-01-16 00:14:37.000000000 +0100
  64 ***************
  65 *** 7008,7014 ****
  66                     STRCAT(tbuf, mesg2);
  67                 }
  68                 if (do_dialog(VIM_WARNING, (char_u *)_("Warning"), tbuf,
  69 !                               (char_u *)_("&OK\n&Load File"), 1, NULL) == 2)
  70                     reload = TRUE;
  71             }
  72             else
  73 --- 7008,7014 ----
  74                     STRCAT(tbuf, mesg2);
  75                 }
  76                 if (do_dialog(VIM_WARNING, (char_u *)_("Warning"), tbuf,
  77 !                         (char_u *)_("&OK\n&Load File"), 1, NULL, TRUE) == 2)
  78                     reload = TRUE;
  79             }
  80             else
  81 *** ../vim-7.3.101/src/gui.c    2010-10-20 19:17:43.000000000 +0200
  82 --- src/gui.c   2011-01-16 00:14:56.000000000 +0100
  83 ***************
  84 *** 4903,4909 ****
  85                 if (STRLEN(p) > 2000)
  86                     STRCPY(p + 2000 - 14, "...(truncated)");
  87                 (void)do_dialog(VIM_ERROR, (char_u *)_("Error"),
  88 !                                             p, (char_u *)_("&Ok"), 1, NULL);
  89                 break;
  90             }
  91         ga_clear(&error_ga);
  92 --- 4903,4909 ----
  93                 if (STRLEN(p) > 2000)
  94                     STRCPY(p + 2000 - 14, "...(truncated)");
  95                 (void)do_dialog(VIM_ERROR, (char_u *)_("Error"),
  96 !                                      p, (char_u *)_("&Ok"), 1, NULL, FALSE);
  97                 break;
  98             }
  99         ga_clear(&error_ga);
 100 *** ../vim-7.3.101/src/gui_xmdlg.c      2010-08-15 21:57:32.000000000 +0200
 101 --- src/gui_xmdlg.c     2011-01-16 00:15:33.000000000 +0100
 102 ***************
 103 *** 688,694 ****
 104             do_dialog(VIM_ERROR,
 105                     (char_u *)_("Error"),
 106                     (char_u *)_("Invalid font specification"),
 107 !                   (char_u *)_("&Dismiss"), 1, NULL);
 108
 109         return True;
 110       }
 111 --- 688,694 ----
 112             do_dialog(VIM_ERROR,
 113                     (char_u *)_("Error"),
 114                     (char_u *)_("Invalid font specification"),
 115 !                   (char_u *)_("&Dismiss"), 1, NULL, FALSE);
 116
 117         return True;
 118       }
 119 ***************
 120 *** 807,813 ****
 121         do_dialog(VIM_ERROR,
 122                 (char_u *)_("Error"),
 123                 (char_u *)_("Invalid font specification"),
 124 !               (char_u *)_("&Dismiss"), 1, NULL);
 125         XFreeFontNames(name);
 126       }
 127       else
 128 --- 807,813 ----
 129         do_dialog(VIM_ERROR,
 130                 (char_u *)_("Error"),
 131                 (char_u *)_("Invalid font specification"),
 132 !               (char_u *)_("&Dismiss"), 1, NULL, FALSE);
 133         XFreeFontNames(name);
 134       }
 135       else
 136 *** ../vim-7.3.101/src/memline.c        2010-12-17 20:23:56.000000000 +0100
 137 --- src/memline.c       2011-01-16 00:15:47.000000000 +0100
 138 ***************
 139 *** 4516,4522 ****
 140                                     process_still_running
 141                                         ? (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Quit\n&Abort") :
 142   # endif
 143 !                                       (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Delete it\n&Quit\n&Abort"), 1, NULL);
 144
 145   # if defined(UNIX) || defined(__EMX__) || defined(VMS)
 146                         if (process_still_running && choice >= 4)
 147 --- 4516,4522 ----
 148                                     process_still_running
 149                                         ? (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Quit\n&Abort") :
 150   # endif
 151 !                                       (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Delete it\n&Quit\n&Abort"), 1, NULL, FALSE);
 152
 153   # if defined(UNIX) || defined(__EMX__) || defined(VMS)
 154                         if (process_still_running && choice >= 4)
 155 *** ../vim-7.3.101/src/message.c        2011-01-04 19:25:46.000000000 +0100
 156 --- src/message.c       2011-01-17 19:57:30.000000000 +0100
 157 ***************
 158 *** 3315,3321 ****
 159    * different letter.
 160    */
 161       int
 162 ! do_dialog(type, title, message, buttons, dfltbutton, textfield)
 163       int               type UNUSED;
 164       char_u    *title UNUSED;
 165       char_u    *message;
 166 --- 3315,3321 ----
 167    * different letter.
 168    */
 169       int
 170 ! do_dialog(type, title, message, buttons, dfltbutton, textfield, ex_cmd)
 171       int               type UNUSED;
 172       char_u    *title UNUSED;
 173       char_u    *message;
 174 ***************
 175 *** 3323,3328 ****
 176 --- 3323,3330 ----
 177       int               dfltbutton;
 178       char_u    *textfield UNUSED;      /* IObuff for inputdialog(), NULL
 179                                            otherwise */
 180 +     int               ex_cmd;     /* when TRUE pressing : accepts default and starts
 181 +                              Ex command */
 182   {
 183       int               oldState;
 184       int               retval = 0;
 185 ***************
 186 *** 3341,3347 ****
 187       if (gui.in_use && vim_strchr(p_go, GO_CONDIALOG) == NULL)
 188       {
 189         c = gui_mch_dialog(type, title, message, buttons, dfltbutton,
 190 !                                                                  textfield);
 191         /* avoid a hit-enter prompt without clearing the cmdline */
 192         need_wait_return = FALSE;
 193         emsg_on_display = FALSE;
 194 --- 3343,3349 ----
 195       if (gui.in_use && vim_strchr(p_go, GO_CONDIALOG) == NULL)
 196       {
 197         c = gui_mch_dialog(type, title, message, buttons, dfltbutton,
 198 !                                                          textfield, ex_cmd);
 199         /* avoid a hit-enter prompt without clearing the cmdline */
 200         need_wait_return = FALSE;
 201         emsg_on_display = FALSE;
 202 ***************
 203 *** 3388,3393 ****
 204 --- 3390,3402 ----
 205             default:            /* Could be a hotkey? */
 206                 if (c < 0)      /* special keys are ignored here */
 207                     continue;
 208 +               if (c == ':' && ex_cmd)
 209 +               {
 210 +                   retval = dfltbutton;
 211 +                   ins_char_typebuf(':');
 212 +                   break;
 213 +               }
 214 +
 215                 /* Make the character lowercase, as chars in "hotkeys" are. */
 216                 c = MB_TOLOWER(c);
 217                 retval = 1;
 218 ***************
 219 *** 3661,3667 ****
 220       if (do_dialog(type,
 221                 title == NULL ? (char_u *)_("Question") : title,
 222                 message,
 223 !               (char_u *)_("&Yes\n&No"), dflt, NULL) == 1)
 224         return VIM_YES;
 225       return VIM_NO;
 226   }
 227 --- 3670,3676 ----
 228       if (do_dialog(type,
 229                 title == NULL ? (char_u *)_("Question") : title,
 230                 message,
 231 !               (char_u *)_("&Yes\n&No"), dflt, NULL, FALSE) == 1)
 232         return VIM_YES;
 233       return VIM_NO;
 234   }
 235 ***************
 236 *** 3676,3682 ****
 237       switch (do_dialog(type,
 238                 title == NULL ? (char_u *)_("Question") : title,
 239                 message,
 240 !               (char_u *)_("&Yes\n&No\n&Cancel"), dflt, NULL))
 241       {
 242         case 1: return VIM_YES;
 243         case 2: return VIM_NO;
 244 --- 3685,3691 ----
 245       switch (do_dialog(type,
 246                 title == NULL ? (char_u *)_("Question") : title,
 247                 message,
 248 !               (char_u *)_("&Yes\n&No\n&Cancel"), dflt, NULL, FALSE))
 249       {
 250         case 1: return VIM_YES;
 251         case 2: return VIM_NO;
 252 ***************
 253 *** 3695,3701 ****
 254                 title == NULL ? (char_u *)"Question" : title,
 255                 message,
 256                 (char_u *)_("&Yes\n&No\nSave &All\n&Discard All\n&Cancel"),
 257 !                                                                 dflt, NULL))
 258       {
 259         case 1: return VIM_YES;
 260         case 2: return VIM_NO;
 261 --- 3704,3710 ----
 262                 title == NULL ? (char_u *)"Question" : title,
 263                 message,
 264                 (char_u *)_("&Yes\n&No\nSave &All\n&Discard All\n&Cancel"),
 265 !                                                          dflt, NULL, FALSE))
 266       {
 267         case 1: return VIM_YES;
 268         case 2: return VIM_NO;
 269 *** ../vim-7.3.101/src/proto/message.pro        2010-10-20 21:22:17.000000000 +0200
 270 --- src/proto/message.pro       2011-01-16 00:22:36.000000000 +0100
 271 ***************
 272 *** 64,70 ****
 273   int verbose_open __ARGS((void));
 274   void give_warning __ARGS((char_u *message, int hl));
 275   void msg_advance __ARGS((int col));
 276 ! int do_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield));
 277   void display_confirm_msg __ARGS((void));
 278   int vim_dialog_yesno __ARGS((int type, char_u *title, char_u *message, int dflt));
 279   int vim_dialog_yesnocancel __ARGS((int type, char_u *title, char_u *message, int dflt));
 280 --- 64,70 ----
 281   int verbose_open __ARGS((void));
 282   void give_warning __ARGS((char_u *message, int hl));
 283   void msg_advance __ARGS((int col));
 284 ! int do_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd));
 285   void display_confirm_msg __ARGS((void));
 286   int vim_dialog_yesno __ARGS((int type, char_u *title, char_u *message, int dflt));
 287   int vim_dialog_yesnocancel __ARGS((int type, char_u *title, char_u *message, int dflt));
 288 *** ../vim-7.3.101/src/gui_athena.c     2010-08-15 21:57:25.000000000 +0200
 289 --- src/gui_athena.c    2011-01-16 00:18:47.000000000 +0100
 290 ***************
 291 *** 2117,2129 ****
 292   }
 293
 294       int
 295 ! gui_mch_dialog(type, title, message, buttons, dfltbutton, textfield)
 296       int               type UNUSED;
 297       char_u    *title;
 298       char_u    *message;
 299       char_u    *buttons;
 300       int               dfltbutton UNUSED;
 301       char_u    *textfield;
 302   {
 303       char_u            *buts;
 304       char_u            *p, *next;
 305 --- 2117,2130 ----
 306   }
 307
 308       int
 309 ! gui_mch_dialog(type, title, message, buttons, dfltbutton, textfield, ex_cmd)
 310       int               type UNUSED;
 311       char_u    *title;
 312       char_u    *message;
 313       char_u    *buttons;
 314       int               dfltbutton UNUSED;
 315       char_u    *textfield;
 316 +     int               ex_cmd UNUSED;
 317   {
 318       char_u            *buts;
 319       char_u            *p, *next;
 320 *** ../vim-7.3.101/src/gui_gtk.c        2010-12-08 13:11:15.000000000 +0100
 321 --- src/gui_gtk.c       2011-01-16 00:24:44.000000000 +0100
 322 ***************
 323 *** 1268,1274 ****
 324                char_u   *message,   /* message text */
 325                char_u   *buttons,   /* names of buttons */
 326                int      def_but,    /* default button */
 327 !              char_u   *textfield) /* text for textfield or NULL */
 328   {
 329       GtkWidget *dialog;
 330       GtkWidget *entry = NULL;
 331 --- 1268,1275 ----
 332                char_u   *message,   /* message text */
 333                char_u   *buttons,   /* names of buttons */
 334                int      def_but,    /* default button */
 335 !              char_u   *textfield, /* text for textfield or NULL */
 336 !              int      ex_cmd UNUSED)
 337   {
 338       GtkWidget *dialog;
 339       GtkWidget *entry = NULL;
 340 *** ../vim-7.3.101/src/gui_mac.c        2010-09-21 17:34:26.000000000 +0200
 341 --- src/gui_mac.c       2011-01-16 00:19:52.000000000 +0100
 342 ***************
 343 *** 5583,5589 ****
 344       char_u    *message,
 345       char_u    *buttons,
 346       int               dfltbutton,
 347 !     char_u    *textfield)
 348   {
 349       Handle    buttonDITL;
 350       Handle    iconDITL;
 351 --- 5583,5590 ----
 352       char_u    *message,
 353       char_u    *buttons,
 354       int               dfltbutton,
 355 !     char_u    *textfield,
 356 !     int               ex_cmd)
 357   {
 358       Handle    buttonDITL;
 359       Handle    iconDITL;
 360 *** ../vim-7.3.101/src/gui_motif.c      2010-08-15 21:57:28.000000000 +0200
 361 --- src/gui_motif.c     2011-01-16 00:20:14.000000000 +0100
 362 ***************
 363 *** 2549,2561 ****
 364   #endif
 365
 366       int
 367 ! gui_mch_dialog(type, title, message, button_names, dfltbutton, textfield)
 368       int               type UNUSED;
 369       char_u    *title;
 370       char_u    *message;
 371       char_u    *button_names;
 372       int               dfltbutton;
 373       char_u    *textfield;             /* buffer of size IOSIZE */
 374   {
 375       char_u            *buts;
 376       char_u            *p, *next;
 377 --- 2549,2562 ----
 378   #endif
 379
 380       int
 381 ! gui_mch_dialog(type, title, message, button_names, dfltbutton, textfield, ex_cmd)
 382       int               type UNUSED;
 383       char_u    *title;
 384       char_u    *message;
 385       char_u    *button_names;
 386       int               dfltbutton;
 387       char_u    *textfield;             /* buffer of size IOSIZE */
 388 +     int               ex_cmd UNUSED;
 389   {
 390       char_u            *buts;
 391       char_u            *p, *next;
 392 *** ../vim-7.3.101/src/gui_photon.c     2010-08-15 21:57:27.000000000 +0200
 393 --- src/gui_photon.c    2011-01-16 00:20:28.000000000 +0100
 394 ***************
 395 *** 1502,1508 ****
 396         char_u  *message,
 397         char_u  *buttons,
 398         int     default_button,
 399 !       char_u  *textfield)
 400   {
 401       char_u    *str;
 402       char_u    **button_array;
 403 --- 1502,1509 ----
 404         char_u  *message,
 405         char_u  *buttons,
 406         int     default_button,
 407 !       char_u  *textfield,
 408 !       int     ex_cmd)
 409   {
 410       char_u    *str;
 411       char_u    **button_array;
 412 *** ../vim-7.3.101/src/gui_w16.c        2010-08-15 21:57:28.000000000 +0200
 413 --- src/gui_w16.c       2011-01-16 00:20:48.000000000 +0100
 414 ***************
 415 *** 1098,1104 ****
 416       char_u    *message,
 417       char_u    *buttons,
 418       int                dfltbutton,
 419 !     char_u    *textfield)
 420   {
 421       FARPROC   dp;
 422       LPWORD    p, pnumitems;
 423 --- 1098,1105 ----
 424       char_u    *message,
 425       char_u    *buttons,
 426       int                dfltbutton,
 427 !     char_u    *textfield,
 428 !     int               ex_cmd)
 429   {
 430       FARPROC   dp;
 431       LPWORD    p, pnumitems;
 432 *** ../vim-7.3.101/src/gui_w32.c        2010-10-27 12:33:12.000000000 +0200
 433 --- src/gui_w32.c       2011-01-16 00:21:08.000000000 +0100
 434 ***************
 435 *** 3005,3011 ****
 436       char_u    *message,
 437       char_u    *buttons,
 438       int                dfltbutton,
 439 !     char_u    *textfield)
 440   {
 441       WORD      *p, *pdlgtemplate, *pnumitems;
 442       DWORD     *dwp;
 443 --- 3005,3012 ----
 444       char_u    *message,
 445       char_u    *buttons,
 446       int                dfltbutton,
 447 !     char_u    *textfield,
 448 !     int               ex_cmd)
 449   {
 450       WORD      *p, *pdlgtemplate, *pnumitems;
 451       DWORD     *dwp;
 452 *** ../vim-7.3.101/src/os_mswin.c       2010-12-17 20:23:56.000000000 +0100
 453 --- src/os_mswin.c      2011-01-16 00:21:41.000000000 +0100
 454 ***************
 455 *** 593,599 ****
 456                                      gui.starting ? (char_u *)_("Message") :
 457   #endif
 458                                              (char_u *)_("Error"),
 459 !                                    p, (char_u *)_("&Ok"), 1, NULL);
 460                 break;
 461             }
 462         ga_clear(&error_ga);
 463 --- 593,599 ----
 464                                      gui.starting ? (char_u *)_("Message") :
 465   #endif
 466                                              (char_u *)_("Error"),
 467 !                                    p, (char_u *)_("&Ok"), 1, NULL, FALSE);
 468                 break;
 469             }
 470         ga_clear(&error_ga);
 471 *** ../vim-7.3.101/src/proto/gui_athena.pro     2010-08-15 21:57:28.000000000 +0200
 472 --- src/proto/gui_athena.pro    2011-01-16 00:23:00.000000000 +0100
 473 ***************
 474 *** 27,31 ****
 475   void gui_mch_set_scrollbar_colors __ARGS((scrollbar_T *sb));
 476   Window gui_x11_get_wid __ARGS((void));
 477   char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
 478 ! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield));
 479   /* vim: set ft=c : */
 480 --- 27,31 ----
 481   void gui_mch_set_scrollbar_colors __ARGS((scrollbar_T *sb));
 482   Window gui_x11_get_wid __ARGS((void));
 483   char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
 484 ! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd));
 485   /* vim: set ft=c : */
 486 *** ../vim-7.3.101/src/proto/gui_gtk.pro        2010-08-15 21:57:28.000000000 +0200
 487 --- src/proto/gui_gtk.pro       2011-01-16 00:22:57.000000000 +0100
 488 ***************
 489 *** 13,19 ****
 490   void gui_mch_destroy_scrollbar __ARGS((scrollbar_T *sb));
 491   char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
 492   char_u *gui_mch_browsedir __ARGS((char_u *title, char_u *initdir));
 493 ! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int def_but, char_u *textfield));
 494   void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
 495   void gui_make_popup __ARGS((char_u *path_name, int mouse_pos));
 496   void gui_mch_find_dialog __ARGS((exarg_T *eap));
 497 --- 13,19 ----
 498   void gui_mch_destroy_scrollbar __ARGS((scrollbar_T *sb));
 499   char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
 500   char_u *gui_mch_browsedir __ARGS((char_u *title, char_u *initdir));
 501 ! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int def_but, char_u *textfield, int ex_cmd));
 502   void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
 503   void gui_make_popup __ARGS((char_u *path_name, int mouse_pos));
 504   void gui_mch_find_dialog __ARGS((exarg_T *eap));
 505 *** ../vim-7.3.101/src/proto/gui_mac.pro        2010-08-15 21:57:28.000000000 +0200
 506 --- src/proto/gui_mac.pro       2011-01-16 00:31:46.000000000 +0100
 507 ***************
 508 *** 81,87 ****
 509   int gui_mch_get_mouse_y __ARGS((void));
 510   void gui_mch_setmouse __ARGS((int x, int y));
 511   void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
 512 ! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield));
 513   char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
 514   void gui_mch_set_foreground __ARGS((void));
 515   void gui_mch_show_tabline __ARGS((int showit));
 516 --- 81,87 ----
 517   int gui_mch_get_mouse_y __ARGS((void));
 518   void gui_mch_setmouse __ARGS((int x, int y));
 519   void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
 520 ! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd));
 521   char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
 522   void gui_mch_set_foreground __ARGS((void));
 523   void gui_mch_show_tabline __ARGS((int showit));
 524 *** ../vim-7.3.101/src/proto/gui_motif.pro      2010-08-15 21:57:28.000000000 +0200
 525 --- src/proto/gui_motif.pro     2011-01-16 00:22:58.000000000 +0100
 526 ***************
 527 *** 29,35 ****
 528   void gui_mch_set_scrollbar_colors __ARGS((scrollbar_T *sb));
 529   Window gui_x11_get_wid __ARGS((void));
 530   char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
 531 ! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *button_names, int dfltbutton, char_u *textfield));
 532   void gui_mch_enable_footer __ARGS((int showit));
 533   void gui_mch_set_footer __ARGS((char_u *s));
 534   void gui_mch_show_toolbar __ARGS((int showit));
 535 --- 29,35 ----
 536   void gui_mch_set_scrollbar_colors __ARGS((scrollbar_T *sb));
 537   Window gui_x11_get_wid __ARGS((void));
 538   char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
 539 ! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *button_names, int dfltbutton, char_u *textfield, int ex_cmd));
 540   void gui_mch_enable_footer __ARGS((int showit));
 541   void gui_mch_set_footer __ARGS((char_u *s));
 542   void gui_mch_show_toolbar __ARGS((int showit));
 543 *** ../vim-7.3.101/src/proto/gui_photon.pro     2010-08-15 21:57:28.000000000 +0200
 544 --- src/proto/gui_photon.pro    2011-01-16 00:32:33.000000000 +0100
 545 ***************
 546 *** 8,14 ****
 547   void gui_mch_update __ARGS((void));
 548   int gui_mch_wait_for_chars __ARGS((int wtime));
 549   char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *default_name, char_u *ext, char_u *initdir, char_u *filter));
 550 ! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int default_button, char_u *textfield));
 551   int gui_mch_get_winpos __ARGS((int *x, int *y));
 552   void gui_mch_set_winpos __ARGS((int x, int y));
 553   void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction));
 554 --- 8,14 ----
 555   void gui_mch_update __ARGS((void));
 556   int gui_mch_wait_for_chars __ARGS((int wtime));
 557   char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *default_name, char_u *ext, char_u *initdir, char_u *filter));
 558 ! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int default_button, char_u *textfield, int ex_cmd));
 559   int gui_mch_get_winpos __ARGS((int *x, int *y));
 560   void gui_mch_set_winpos __ARGS((int x, int y));
 561   void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction));
 562 *** ../vim-7.3.101/src/proto/gui_w16.pro        2010-08-15 21:57:28.000000000 +0200
 563 --- src/proto/gui_w16.pro       2011-01-16 00:34:36.000000000 +0100
 564 ***************
 565 *** 74,79 ****
 566   void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
 567   void gui_mch_destroy_menu __ARGS((vimmenu_T *menu));
 568   void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey));
 569 ! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield));
 570   void gui_mch_set_foreground __ARGS((void));
 571   /* vim: set ft=c : */
 572 --- 74,79 ----
 573   void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
 574   void gui_mch_destroy_menu __ARGS((vimmenu_T *menu));
 575   void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey));
 576 ! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd));
 577   void gui_mch_set_foreground __ARGS((void));
 578   /* vim: set ft=c : */
 579 *** ../vim-7.3.101/src/proto/gui_w32.pro        2010-08-15 21:57:28.000000000 +0200
 580 --- src/proto/gui_w32.pro       2011-01-16 00:33:12.000000000 +0100
 581 ***************
 582 *** 81,87 ****
 583   void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
 584   void gui_mch_destroy_menu __ARGS((vimmenu_T *menu));
 585   void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey));
 586 ! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield));
 587   void gui_mch_set_foreground __ARGS((void));
 588   void gui_mch_drawsign __ARGS((int row, int col, int typenr));
 589   void *gui_mch_register_sign __ARGS((char_u *signfile));
 590 --- 81,87 ----
 591   void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
 592   void gui_mch_destroy_menu __ARGS((vimmenu_T *menu));
 593   void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey));
 594 ! int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd));
 595   void gui_mch_set_foreground __ARGS((void));
 596   void gui_mch_drawsign __ARGS((int row, int col, int typenr));
 597   void *gui_mch_register_sign __ARGS((char_u *signfile));
 598 *** ../vim-7.3.101/src/version.c        2011-01-17 19:53:20.000000000 +0100
 599 --- src/version.c       2011-01-17 20:05:02.000000000 +0100
 600 ***************
 601 *** 716,717 ****
 602 --- 716,719 ----
 603   {   /* Add new patch number below this line */
 604 + /**/
 605 +     102,
 606   /**/
 607
 608 --
 609 hundred-and-one symptoms of being an internet addict:
 610 110. You actually volunteer to become your employer's webmaster.
 611
 612  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 613 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 614 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
 615  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///