7.2.351

   1 To: vim-dev@vim.org
   2 Subject: Patch 7.2.351 (after 7.2.347)
   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.2.351 (after 7.2.347)
  11 Problem:    Can't build with some compilers.
  12 Solution:   Move the #ifdef outside of a macro.  Cleanup the code.
  13 Files:      src/getchar.c
  14
  15
  16 *** ../vim-7.2.350/src/getchar.c        2010-01-27 17:31:38.000000000 +0100
  17 --- src/getchar.c       2010-01-28 22:42:22.000000000 +0100
  18 ***************
  19 *** 2492,2508 ****
  20                             i = FAIL;
  21                         else
  22                         {
  23 !                           i = ins_typebuf(s,
  24 !                                   save_m_noremap != REMAP_YES
  25 !                                           ? save_m_noremap
  26 !                                           : STRNCMP(s,
  27   #ifdef FEAT_EVAL
  28 !                                          save_m_keys != NULL ? save_m_keys :
  29   #endif
  30 !                                                     mp->m_keys,
  31 !                                                         (size_t)keylen) != 0
  32 !                                                    ? REMAP_YES : REMAP_SKIP,
  33 !                               0, TRUE, cmd_silent || save_m_silent);
  34   #ifdef FEAT_EVAL
  35                             if (save_m_expr)
  36                                 vim_free(s);
  37 --- 2492,2515 ----
  38                             i = FAIL;
  39                         else
  40                         {
  41 !                           int noremap;
  42 !
  43 !                           if (save_m_noremap != REMAP_YES)
  44 !                               noremap = save_m_noremap;
  45 !                           else if (
  46   #ifdef FEAT_EVAL
  47 !                               STRNCMP(s, save_m_keys != NULL
  48 !                                                  ? save_m_keys : mp->m_keys,
  49 !                                                        (size_t)keylen)
  50 ! #else
  51 !                               STRNCMP(s, mp->m_keys, (size_t)keylen)
  52   #endif
  53 !                                  != 0)
  54 !                               noremap = REMAP_YES;
  55 !                           else
  56 !                               noremap = REMAP_SKIP;
  57 !                           i = ins_typebuf(s, noremap,
  58 !                                       0, TRUE, cmd_silent || save_m_silent);
  59   #ifdef FEAT_EVAL
  60                             if (save_m_expr)
  61                                 vim_free(s);
  62 *** ../vim-7.2.350/src/version.c        2010-01-27 21:04:58.000000000 +0100
  63 --- src/version.c       2010-01-28 22:50:53.000000000 +0100
  64 ***************
  65 *** 683,684 ****
  66 --- 683,686 ----
  67   {   /* Add new patch number below this line */
  68 + /**/
  69 +     351,
  70   /**/
  71
  72 --
  73 "Hit any key to continue" it said, but nothing happened after F sharp.
  74
  75  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  76 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  77 \\\        download, build and distribute -- http://www.A-A-P.org        ///
  78  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///