vim/patches/vim-7.3.342.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.342
   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.342
  11 Problem:    Code not in Vim style.
  12 Solution:   Fix the style. (Elias Diem)
  13 Files:      src/os_amiga.c, src/os_mac_conv.c, src/os_win16.c
  14
  15
  16 *** ../vim-7.3.341/src/os_amiga.c       2010-08-15 21:57:27.000000000 +0200
  17 --- src/os_amiga.c      2011-10-20 18:19:45.000000000 +0200
  18 ***************
  19 *** 1022,1028 ****
  20
  21       /* insure longword alignment */
  22   #ifdef __amigaos4__
  23 !     if(!(id = AllocDosObject(DOS_INFODATA, 0)))
  24         goto out;
  25   #else
  26       id = (struct InfoData *)(((long)id_a + 3L) & ~3L);
  27 --- 1022,1028 ----
  28
  29       /* insure longword alignment */
  30   #ifdef __amigaos4__
  31 !     if (!(id = AllocDosObject(DOS_INFODATA, 0)))
  32         goto out;
  33   #else
  34       id = (struct InfoData *)(((long)id_a + 3L) & ~3L);
  35 *** ../vim-7.3.341/src/os_mac_conv.c    2011-06-13 02:03:55.000000000 +0200
  36 --- src/os_mac_conv.c   2011-10-20 18:19:45.000000000 +0200
  37 ***************
  38 *** 77,83 ****
  39         *unconvlenp = 0;
  40       cfstr = CFStringCreateWithBytes(NULL, ptr, len, from, 0);
  41
  42 !     if(cfstr == NULL)
  43         fprintf(stderr, "Encoding failed\n");
  44       /* When conversion failed, try excluding bytes from the end, helps when
  45        * there is an incomplete byte sequence.  Only do up to 6 bytes to avoid
  46 --- 77,83 ----
  47         *unconvlenp = 0;
  48       cfstr = CFStringCreateWithBytes(NULL, ptr, len, from, 0);
  49
  50 !     if (cfstr == NULL)
  51         fprintf(stderr, "Encoding failed\n");
  52       /* When conversion failed, try excluding bytes from the end, helps when
  53        * there is an incomplete byte sequence.  Only do up to 6 bytes to avoid
  54 *** ../vim-7.3.341/src/os_win16.c       2010-12-17 20:23:56.000000000 +0100
  55 --- src/os_win16.c      2011-10-20 18:19:45.000000000 +0200
  56 ***************
  57 *** 243,251 ****
  58         /* Wait for the command to terminate before continuing */
  59         while (GetModuleUsage((HINSTANCE)h_module) > 0 && again )
  60         {
  61 !           while( PeekMessage( &msg, NULL, 0, 0, PM_REMOVE ) && again )
  62             {
  63 !               if(msg.message == WM_QUIT)
  64
  65                 {
  66                     PostQuitMessage(msg.wParam);
  67 --- 243,251 ----
  68         /* Wait for the command to terminate before continuing */
  69         while (GetModuleUsage((HINSTANCE)h_module) > 0 && again )
  70         {
  71 !           while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE) && again)
  72             {
  73 !               if (msg.message == WM_QUIT)
  74
  75                 {
  76                     PostQuitMessage(msg.wParam);
  77 *** ../vim-7.3.341/src/version.c        2011-10-20 18:17:38.000000000 +0200
  78 --- src/version.c       2011-10-20 18:21:43.000000000 +0200
  79 ***************
  80 *** 711,712 ****
  81 --- 711,714 ----
  82   {   /* Add new patch number below this line */
  83 + /**/
  84 +     342,
  85   /**/
  86
  87 --
  88 You are only young once, but you can stay immature indefinitely.
  89
  90  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  91 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  92 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  93  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///