vim/patches/vim-7.3.425.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.425
   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.425 (after 7.3.265)
  11 Problem:    Search history lines are duplicated. (Edwin Steiner)
  12 Solution:   Convert separator character from space to NUL.
  13 Files:      src/ex_getln.c
  14
  15
  16 *** ../vim-7.3.424/src/ex_getln.c       2012-01-26 13:01:54.000000000 +0100
  17 --- src/ex_getln.c      2012-02-04 22:27:43.000000000 +0100
  18 ***************
  19 *** 6027,6034 ****
  20         val = viminfo_readstring(virp, 1, TRUE);
  21         if (val != NULL && *val != NUL)
  22         {
  23             if (!in_history(type, val + (type == HIST_SEARCH),
  24 !                                                 viminfo_add_at_front, *val))
  25             {
  26                 /* Need to re-allocate to append the separator byte. */
  27                 len = STRLEN(val);
  28 --- 6027,6036 ----
  29         val = viminfo_readstring(virp, 1, TRUE);
  30         if (val != NULL && *val != NUL)
  31         {
  32 +           int sep = (*val == ' ' ? NUL : *val);
  33 +
  34             if (!in_history(type, val + (type == HIST_SEARCH),
  35 !                                                  viminfo_add_at_front, sep))
  36             {
  37                 /* Need to re-allocate to append the separator byte. */
  38                 len = STRLEN(val);
  39 ***************
  40 *** 6040,6046 ****
  41                         /* Search entry: Move the separator from the first
  42                          * column to after the NUL. */
  43                         mch_memmove(p, val + 1, (size_t)len);
  44 !                       p[len] = (*val == ' ' ? NUL : *val);
  45                     }
  46                     else
  47                     {
  48 --- 6042,6048 ----
  49                         /* Search entry: Move the separator from the first
  50                          * column to after the NUL. */
  51                         mch_memmove(p, val + 1, (size_t)len);
  52 !                       p[len] = sep;
  53                     }
  54                     else
  55                     {
  56 *** ../vim-7.3.424/src/version.c        2012-02-04 22:01:44.000000000 +0100
  57 --- src/version.c       2012-02-04 22:30:36.000000000 +0100
  58 ***************
  59 *** 716,717 ****
  60 --- 716,719 ----
  61   {   /* Add new patch number below this line */
  62 + /**/
  63 +     425,
  64   /**/
  65
  66 --
  67 "So this is it," said Arthur, "we are going to die."
  68 "Yes," said Ford, "except...no!  Wait a minute!"  He suddenly lunged across
  69 the chamber at something behind Arthur's line of vision.  "What's this
  70 switch?" he cried.
  71 "What?   Where?" cried Arthur, twisting around.
  72 "No, I was only fooling," said Ford, "we are going to die after all."
  73                 -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"
  74
  75  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  76 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  77 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  78  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///