6.2.486

   1 To: vim-dev@vim.org
   2 Subject: Patch 6.2.486
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=ISO-8859-1
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 6.2.486 (6.2.482)
  11 Problem:    Diff for eval.c is missing.
  12 Solution:   Addition to patch 6.2.482.
  13 Files:      src/eval.c
  14
  15
  16 *** ../vim-6.2.485/src/eval.c   Tue Apr 20 12:52:53 2004
  17 --- src/eval.c  Tue Apr 20 10:37:31 2004
  18 ***************
  19 *** 817,823 ****
  20             /* If the result is a string, check if there is a non-digit before
  21              * the number. */
  22             s = retvar.var_val.var_string;
  23 !           if (!isdigit(*s) && *s != '-')
  24                 *cp = *s++;
  25             retval = atol((char *)s);
  26         }
  27 --- 817,823 ----
  28             /* If the result is a string, check if there is a non-digit before
  29              * the number. */
  30             s = retvar.var_val.var_string;
  31 !           if (!VIM_ISDIGIT(*s) && *s != '-')
  32                 *cp = *s++;
  33             retval = atol((char *)s);
  34         }
  35 ***************
  36 *** 1148,1154 ****
  37             /*
  38              * ":let var = expr": Set internal variable.
  39              */
  40 !           else if (eval_isnamec(*arg) && !isdigit(*arg))
  41             {
  42                 /* Find the end of the name. */
  43                 p = find_name_end(arg, &expr_start, &expr_end);
  44 --- 1148,1154 ----
  45             /*
  46              * ":let var = expr": Set internal variable.
  47              */
  48 !           else if (eval_isnamec(*arg) && !VIM_ISDIGIT(*arg))
  49             {
  50                 /* Find the end of the name. */
  51                 p = find_name_end(arg, &expr_start, &expr_end);
  52 ***************
  53 *** 2589,2595 ****
  54                 case 'x':
  55                 case 'u': /* Unicode: "\u0023" */
  56                 case 'U':
  57 !                         if (isxdigit(p[1]))
  58                           {
  59                               int       n, nr;
  60                               int       c = toupper(*p);
  61 --- 2589,2595 ----
  62                 case 'x':
  63                 case 'u': /* Unicode: "\u0023" */
  64                 case 'U':
  65 !                         if (vim_isxdigit(p[1]))
  66                           {
  67                               int       n, nr;
  68                               int       c = toupper(*p);
  69 ***************
  70 *** 2599,2605 ****
  71                               else
  72                                   n = 4;
  73                               nr = 0;
  74 !                             while (--n >= 0 && isxdigit(p[1]))
  75                               {
  76                                   ++p;
  77                                   nr = (nr << 4) + hex2nr(*p);
  78 --- 2599,2605 ----
  79                               else
  80                                   n = 4;
  81                               nr = 0;
  82 !                             while (--n >= 0 && vim_isxdigit(p[1]))
  83                               {
  84                                   ++p;
  85                                   nr = (nr << 4) + hex2nr(*p);
  86 ***************
  87 *** 6463,6481 ****
  88         for (stropt = get_var_string(&argvars[2]); *stropt != NUL; ++stropt)
  89             switch (*stropt)
  90             {
  91 !               case 'a': case 'A': /* append */
  92                     append = TRUE;
  93                     break;
  94 !               case 'v': case 'c': /* character-wise selection */
  95                     yank_type = MCHAR;
  96                     break;
  97 !               case 'V': case 'l': /*line-wise selection */
  98                     yank_type = MLINE;
  99                     break;
 100   #ifdef FEAT_VISUAL
 101 !               case 'b': case Ctrl_V: /*block-wise selection*/
 102                     yank_type = MBLOCK;
 103 !                   if (isdigit(stropt[1]))
 104                     {
 105                         ++stropt;
 106                         block_len = getdigits(&stropt) - 1;
 107 --- 6463,6481 ----
 108         for (stropt = get_var_string(&argvars[2]); *stropt != NUL; ++stropt)
 109             switch (*stropt)
 110             {
 111 !               case 'a': case 'A':     /* append */
 112                     append = TRUE;
 113                     break;
 114 !               case 'v': case 'c':     /* character-wise selection */
 115                     yank_type = MCHAR;
 116                     break;
 117 !               case 'V': case 'l':     /* line-wise selection */
 118                     yank_type = MLINE;
 119                     break;
 120   #ifdef FEAT_VISUAL
 121 !               case 'b': case Ctrl_V:  /* block-wise selection */
 122                     yank_type = MBLOCK;
 123 !                   if (VIM_ISDIGIT(stropt[1]))
 124                     {
 125                         ++stropt;
 126                         block_len = getdigits(&stropt) - 1;
 127 ***************
 128 *** 8243,8249 ****
 129         name += 2;
 130         if (current_funccal == NULL)
 131             return NULL;
 132 !       if (isdigit(*name))
 133         {
 134             i = atol((char *)name);
 135             if (i == 0)                                 /* a:0 */
 136 --- 8243,8249 ----
 137         name += 2;
 138         if (current_funccal == NULL)
 139             return NULL;
 140 !       if (VIM_ISDIGIT(*name))
 141         {
 142             i = atol((char *)name);
 143             if (i == 0)                                 /* a:0 */
 144 *** ../vim-6.2.485/src/version.c        Tue Apr 20 12:52:53 2004
 145 --- src/version.c       Tue Apr 20 12:59:38 2004
 146 ***************
 147 *** 639,640 ****
 148 --- 639,642 ----
 149   {   /* Add new patch number below this line */
 150 + /**/
 151 +     486,
 152   /**/
 153
 154 --
 155 We apologise again for the fault in the subtitles.  Those responsible for
 156 sacking the people who have just been sacked have been sacked.
 157                  "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
 158
 159  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 160 ///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 161 \\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 162  \\\  Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html ///