7.3.075

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.075
   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.075 (after 7.3.072)
  11 Problem:    Missing part of 'wildignorecase'
  12 Solution:   Also adjust expand()
  13 Files:      src/eval.c
  14
  15
  16 *** ../vim-7.3.074/src/eval.c   2010-12-02 21:43:10.000000000 +0100
  17 --- src/eval.c  2010-12-02 17:30:23.000000000 +0100
  18 ***************
  19 *** 9876,9882 ****
  20       char_u    *s;
  21       int               len;
  22       char_u    *errormsg;
  23 !     int               flags = WILD_SILENT|WILD_USE_NL|WILD_LIST_NOTFOUND;
  24       expand_T  xpc;
  25       int               error = FALSE;
  26
  27 --- 9876,9882 ----
  28       char_u    *s;
  29       int               len;
  30       char_u    *errormsg;
  31 !     int               options = WILD_SILENT|WILD_USE_NL|WILD_LIST_NOTFOUND;
  32       expand_T  xpc;
  33       int               error = FALSE;
  34
  35 ***************
  36 *** 9894,9905 ****
  37          * for 'wildignore' and don't put matches for 'suffixes' at the end. */
  38         if (argvars[1].v_type != VAR_UNKNOWN
  39                                     && get_tv_number_chk(&argvars[1], &error))
  40 !           flags |= WILD_KEEP_ALL;
  41         if (!error)
  42         {
  43             ExpandInit(&xpc);
  44             xpc.xp_context = EXPAND_FILES;
  45 !           rettv->vval.v_string = ExpandOne(&xpc, s, NULL, flags, WILD_ALL);
  46         }
  47         else
  48             rettv->vval.v_string = NULL;
  49 --- 9894,9907 ----
  50          * for 'wildignore' and don't put matches for 'suffixes' at the end. */
  51         if (argvars[1].v_type != VAR_UNKNOWN
  52                                     && get_tv_number_chk(&argvars[1], &error))
  53 !           options |= WILD_KEEP_ALL;
  54         if (!error)
  55         {
  56             ExpandInit(&xpc);
  57             xpc.xp_context = EXPAND_FILES;
  58 !           if (p_wic)
  59 !               options += WILD_ICASE;
  60 !           rettv->vval.v_string = ExpandOne(&xpc, s, NULL, options, WILD_ALL);
  61         }
  62         else
  63             rettv->vval.v_string = NULL;
  64 ***************
  65 *** 11672,11678 ****
  66       typval_T  *argvars;
  67       typval_T  *rettv;
  68   {
  69 !     int               flags = WILD_SILENT|WILD_USE_NL;
  70       expand_T  xpc;
  71       int               error = FALSE;
  72
  73 --- 11674,11680 ----
  74       typval_T  *argvars;
  75       typval_T  *rettv;
  76   {
  77 !     int               options = WILD_SILENT|WILD_USE_NL;
  78       expand_T  xpc;
  79       int               error = FALSE;
  80
  81 ***************
  82 *** 11680,11693 ****
  83       * for 'wildignore' and don't put matches for 'suffixes' at the end. */
  84       if (argvars[1].v_type != VAR_UNKNOWN
  85                                 && get_tv_number_chk(&argvars[1], &error))
  86 !       flags |= WILD_KEEP_ALL;
  87       rettv->v_type = VAR_STRING;
  88       if (!error)
  89       {
  90         ExpandInit(&xpc);
  91         xpc.xp_context = EXPAND_FILES;
  92         rettv->vval.v_string = ExpandOne(&xpc, get_tv_string(&argvars[0]),
  93 !                                                      NULL, flags, WILD_ALL);
  94       }
  95       else
  96         rettv->vval.v_string = NULL;
  97 --- 11682,11697 ----
  98       * for 'wildignore' and don't put matches for 'suffixes' at the end. */
  99       if (argvars[1].v_type != VAR_UNKNOWN
 100                                 && get_tv_number_chk(&argvars[1], &error))
 101 !       options |= WILD_KEEP_ALL;
 102       rettv->v_type = VAR_STRING;
 103       if (!error)
 104       {
 105         ExpandInit(&xpc);
 106         xpc.xp_context = EXPAND_FILES;
 107 +       if (p_wic)
 108 +           options += WILD_ICASE;
 109         rettv->vval.v_string = ExpandOne(&xpc, get_tv_string(&argvars[0]),
 110 !                                                    NULL, options, WILD_ALL);
 111       }
 112       else
 113         rettv->vval.v_string = NULL;
 114 *** ../vim-7.3.074/src/version.c        2010-12-02 21:43:10.000000000 +0100
 115 --- src/version.c       2010-12-02 21:43:59.000000000 +0100
 116 ***************
 117 *** 716,717 ****
 118 --- 716,719 ----
 119   {   /* Add new patch number below this line */
 120 + /**/
 121 +     75,
 122   /**/
 123
 124 --
 125 Engineers will go without food and hygiene for days to solve a problem.
 126 (Other times just because they forgot.)
 127                                 (Scott Adams - The Dilbert principle)
 128
 129  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 130 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 131 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
 132  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///