summaryrefslogtreecommitdiff
path: root/source/ap/vim/patches/7.3.075
blob: 91cbb51616c1996584342a8e9eb983d85932a068 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
To: vim_dev@googlegroups.com
Subject: Patch 7.3.075
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.3.075 (after 7.3.072)
Problem:    Missing part of 'wildignorecase'
Solution:   Also adjust expand()
Files:	    src/eval.c


*** ../vim-7.3.074/src/eval.c	2010-12-02 21:43:10.000000000 +0100
--- src/eval.c	2010-12-02 17:30:23.000000000 +0100
***************
*** 9876,9882 ****
      char_u	*s;
      int		len;
      char_u	*errormsg;
!     int		flags = WILD_SILENT|WILD_USE_NL|WILD_LIST_NOTFOUND;
      expand_T	xpc;
      int		error = FALSE;
  
--- 9876,9882 ----
      char_u	*s;
      int		len;
      char_u	*errormsg;
!     int		options = WILD_SILENT|WILD_USE_NL|WILD_LIST_NOTFOUND;
      expand_T	xpc;
      int		error = FALSE;
  
***************
*** 9894,9905 ****
  	 * for 'wildignore' and don't put matches for 'suffixes' at the end. */
  	if (argvars[1].v_type != VAR_UNKNOWN
  				    && get_tv_number_chk(&argvars[1], &error))
! 	    flags |= WILD_KEEP_ALL;
  	if (!error)
  	{
  	    ExpandInit(&xpc);
  	    xpc.xp_context = EXPAND_FILES;
! 	    rettv->vval.v_string = ExpandOne(&xpc, s, NULL, flags, WILD_ALL);
  	}
  	else
  	    rettv->vval.v_string = NULL;
--- 9894,9907 ----
  	 * for 'wildignore' and don't put matches for 'suffixes' at the end. */
  	if (argvars[1].v_type != VAR_UNKNOWN
  				    && get_tv_number_chk(&argvars[1], &error))
! 	    options |= WILD_KEEP_ALL;
  	if (!error)
  	{
  	    ExpandInit(&xpc);
  	    xpc.xp_context = EXPAND_FILES;
! 	    if (p_wic)
! 		options += WILD_ICASE;
! 	    rettv->vval.v_string = ExpandOne(&xpc, s, NULL, options, WILD_ALL);
  	}
  	else
  	    rettv->vval.v_string = NULL;
***************
*** 11672,11678 ****
      typval_T	*argvars;
      typval_T	*rettv;
  {
!     int		flags = WILD_SILENT|WILD_USE_NL;
      expand_T	xpc;
      int		error = FALSE;
  
--- 11674,11680 ----
      typval_T	*argvars;
      typval_T	*rettv;
  {
!     int		options = WILD_SILENT|WILD_USE_NL;
      expand_T	xpc;
      int		error = FALSE;
  
***************
*** 11680,11693 ****
      * for 'wildignore' and don't put matches for 'suffixes' at the end. */
      if (argvars[1].v_type != VAR_UNKNOWN
  				&& get_tv_number_chk(&argvars[1], &error))
! 	flags |= WILD_KEEP_ALL;
      rettv->v_type = VAR_STRING;
      if (!error)
      {
  	ExpandInit(&xpc);
  	xpc.xp_context = EXPAND_FILES;
  	rettv->vval.v_string = ExpandOne(&xpc, get_tv_string(&argvars[0]),
! 						       NULL, flags, WILD_ALL);
      }
      else
  	rettv->vval.v_string = NULL;
--- 11682,11697 ----
      * for 'wildignore' and don't put matches for 'suffixes' at the end. */
      if (argvars[1].v_type != VAR_UNKNOWN
  				&& get_tv_number_chk(&argvars[1], &error))
! 	options |= WILD_KEEP_ALL;
      rettv->v_type = VAR_STRING;
      if (!error)
      {
  	ExpandInit(&xpc);
  	xpc.xp_context = EXPAND_FILES;
+ 	if (p_wic)
+ 	    options += WILD_ICASE;
  	rettv->vval.v_string = ExpandOne(&xpc, get_tv_string(&argvars[0]),
! 						     NULL, options, WILD_ALL);
      }
      else
  	rettv->vval.v_string = NULL;
*** ../vim-7.3.074/src/version.c	2010-12-02 21:43:10.000000000 +0100
--- src/version.c	2010-12-02 21:43:59.000000000 +0100
***************
*** 716,717 ****
--- 716,719 ----
  {   /* Add new patch number below this line */
+ /**/
+     75,
  /**/

-- 
Engineers will go without food and hygiene for days to solve a problem.
(Other times just because they forgot.)
				(Scott Adams - The Dilbert principle)

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///