7.1.209

   1 To: vim-dev@vim.org
   2 Subject: Patch 7.1.209
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=ISO-8859-1
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.1.209
  11 Problem:    GTK: When using the netrw plugin and doing ":gui" Vim hangs.
  12 Solution:   Stop getting a selection after three seconds.  This is a hack.
  13 Files:      src/gui_gtk_x11.c
  14
  15
  16 *** ../vim-7.1.208/src/gui_gtk_x11.c    Fri Oct 19 14:32:50 2007
  17 --- src/gui_gtk_x11.c   Sun Jan  6 15:15:52 2008
  18 ***************
  19 *** 6660,6665 ****
  20 --- 6660,6666 ----
  21       unsigned  i;
  22       int               nbytes;
  23       char_u    *buffer;
  24 +     time_t    start;
  25
  26       for (i = 0; i < N_SELECTION_TARGETS; ++i)
  27       {
  28 ***************
  29 *** 6670,6676 ****
  30                               cbd->gtk_sel_atom, target,
  31                               (guint32)GDK_CURRENT_TIME);
  32
  33 !       while (received_selection == RS_NONE)
  34             gtk_main(); /* wait for selection_received_cb */
  35
  36         if (received_selection != RS_FAIL)
  37 --- 6671,6681 ----
  38                               cbd->gtk_sel_atom, target,
  39                               (guint32)GDK_CURRENT_TIME);
  40
  41 !       /* Hack: Wait up to three seconds for the selection.  A hang was
  42 !        * noticed here when using the netrw plugin combined with ":gui"
  43 !        * during the FocusGained event. */
  44 !       start = time(NULL);
  45 !       while (received_selection == RS_NONE && time(NULL) < start + 3)
  46             gtk_main(); /* wait for selection_received_cb */
  47
  48         if (received_selection != RS_FAIL)
  49 *** ../vim-7.1.208/src/version.c        Sat Jan  5 22:15:21 2008
  50 --- src/version.c       Sun Jan  6 15:14:48 2008
  51 ***************
  52 *** 668,669 ****
  53 --- 668,671 ----
  54   {   /* Add new patch number below this line */
  55 + /**/
  56 +     209,
  57   /**/
  58
  59 --
  60 BLACK KNIGHT:  I move for no man.
  61 ARTHUR:        So be it!
  62     [hah] [parry thrust]
  63     [ARTHUR chops the BLACK KNIGHT's left arm off]
  64 ARTHUR:        Now stand aside, worthy adversary.
  65 BLACK KNIGHT:  'Tis but a scratch.
  66                                   The Quest for the Holy Grail (Monty Python)
  67
  68  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  69 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  70 \\\        download, build and distribute -- http://www.A-A-P.org        ///
  71  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///