vim/patches/vim-7.3.287.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.287
   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.287
  11 Problem:    Can't compile with MSVC and tiny options.
  12 Solution:   Move variables and #ifdefs. (Sergey Khorev)
  13 Files:      src/os_win32.c
  14
  15
  16 *** ../vim-7.3.286/src/os_win32.c       2011-08-10 17:07:56.000000000 +0200
  17 --- src/os_win32.c      2011-08-27 15:07:28.000000000 +0200
  18 ***************
  19 *** 3419,3426 ****
  20   {
  21       DWORD     availableBytes = 0;
  22       DWORD     i;
  23 -     int               c;
  24 -     char_u    *p;
  25       int               ret;
  26       DWORD     len;
  27       DWORD     toRead;
  28 --- 3419,3424 ----
  29 ***************
  30 *** 3479,3484 ****
  31 --- 3477,3484 ----
  32         else if (has_mbyte)
  33         {
  34             int         l;
  35 +           int         c;
  36 +           char_u      *p;
  37
  38             len += *buffer_off;
  39             buffer[len] = NUL;
  40 ***************
  41 *** 3558,3566 ****
  42       int               noread_cnt = 0;
  43       garray_T  ga;
  44       int           delay = 1;
  45 - # ifdef FEAT_MBYTE
  46       DWORD     buffer_off = 0; /* valid bytes in buffer[] */
  47 - # endif
  48
  49       SECURITY_ATTRIBUTES saAttr;
  50
  51 --- 3558,3564 ----
  52 ***************
  53 *** 3777,3790 ****
  54
  55         if (WaitForSingleObject(pi.hProcess, delay) != WAIT_TIMEOUT)
  56         {
  57 !           dump_pipe(options, g_hChildStd_OUT_Rd,
  58 !                       &ga, buffer, &buffer_off);
  59             break;
  60         }
  61
  62         ++noread_cnt;
  63 !       dump_pipe(options, g_hChildStd_OUT_Rd,
  64 !                   &ga, buffer, &buffer_off);
  65
  66         /* We start waiting for a very short time and then increase it, so
  67          * that we respond quickly when the process is quick, and don't
  68 --- 3775,3786 ----
  69
  70         if (WaitForSingleObject(pi.hProcess, delay) != WAIT_TIMEOUT)
  71         {
  72 !           dump_pipe(options, g_hChildStd_OUT_Rd, &ga, buffer, &buffer_off);
  73             break;
  74         }
  75
  76         ++noread_cnt;
  77 !       dump_pipe(options, g_hChildStd_OUT_Rd, &ga, buffer, &buffer_off);
  78
  79         /* We start waiting for a very short time and then increase it, so
  80          * that we respond quickly when the process is quick, and don't
  81 *** ../vim-7.3.286/src/version.c        2011-08-26 16:12:55.000000000 +0200
  82 --- src/version.c       2011-08-27 15:08:27.000000000 +0200
  83 ***************
  84 *** 711,712 ****
  85 --- 711,714 ----
  86   {   /* Add new patch number below this line */
  87 + /**/
  88 +     287,
  89   /**/
  90
  91 --
  92 SUPERIMPOSE "England AD 787".  After a few more seconds we hear hoofbeats in
  93 the distance.  They come slowly closer.  Then out of the mist comes KING
  94 ARTHUR followed by a SERVANT who is banging two half coconuts together.
  95                  "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
  96
  97  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  98 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  99 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
 100  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///