vim/patches/vim-7.3.066.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.066
   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.066
  11 Problem:    Crash when changing to another window while in a :vimgrep command.
  12             (Christian Brabandt)
  13 Solution:   When wiping out the dummy before, remove it from aucmd_win.
  14 Files:      src/quickfix.c
  15
  16
  17 *** ../vim-7.3.065/src/quickfix.c       2010-09-21 16:56:29.000000000 +0200
  18 --- src/quickfix.c      2010-11-24 16:27:40.000000000 +0100
  19 ***************
  20 *** 3432,3437 ****
  21 --- 3432,3438 ----
  22       char_u    *fname;
  23   {
  24       buf_T     *newbuf;
  25 +     buf_T     *newbuf_to_wipe = NULL;
  26       int               failed = TRUE;
  27       aco_save_T        aco;
  28
  29 ***************
  30 *** 3468,3482 ****
  31             failed = FALSE;
  32             if (curbuf != newbuf)
  33             {
  34 !               /* Bloody autocommands changed the buffer! */
  35 !               if (buf_valid(newbuf))
  36 !                   wipe_buffer(newbuf, FALSE);
  37                 newbuf = curbuf;
  38             }
  39         }
  40
  41         /* restore curwin/curbuf and a few other things */
  42         aucmd_restbuf(&aco);
  43       }
  44
  45       if (!buf_valid(newbuf))
  46 --- 3469,3487 ----
  47             failed = FALSE;
  48             if (curbuf != newbuf)
  49             {
  50 !               /* Bloody autocommands changed the buffer!  Can happen when
  51 !                * using netrw and editing a remote file.  Use the current
  52 !                * buffer instead, delete the dummy one after restoring the
  53 !                * window stuff. */
  54 !               newbuf_to_wipe = newbuf;
  55                 newbuf = curbuf;
  56             }
  57         }
  58
  59         /* restore curwin/curbuf and a few other things */
  60         aucmd_restbuf(&aco);
  61 +       if (newbuf_to_wipe != NULL && buf_valid(newbuf_to_wipe))
  62 +           wipe_buffer(newbuf_to_wipe, FALSE);
  63       }
  64
  65       if (!buf_valid(newbuf))
  66 *** ../vim-7.3.065/src/version.c        2010-11-24 15:50:54.000000000 +0100
  67 --- src/version.c       2010-11-24 16:30:44.000000000 +0100
  68 ***************
  69 *** 716,717 ****
  70 --- 716,719 ----
  71   {   /* Add new patch number below this line */
  72 + /**/
  73 +     66,
  74   /**/
  75
  76 --
  77 CART DRIVER: Bring out your dead!
  78    We follow the cart through a wretched, impoverished plague-ridden village.
  79    A few starved mongrels run about in the mud scavenging.  In the open
  80    doorway of one house perhaps we jug glimpse a pair of legs dangling from
  81    the ceiling.  In another doorway an OLD WOMAN is beating a cat against a
  82    wall rather like one does with a mat.  The cart passes round a dead donkey
  83    or cow in the mud.  And a MAN tied to a cart is being hammered to death by
  84    four NUNS with huge mallets.
  85                  "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
  86
  87  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  88 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  89 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  90  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///