1 To: vim_dev@googlegroups.com
4 From: Bram Moolenaar <Bram@moolenaar.net>
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
11 Problem: Using integer like a boolean.
12 Solution: Nicer check for integer being non-zero.
16 *** ../vim-7.3.128/src/tag.c 2010-12-17 18:06:00.000000000 +0100
17 --- src/tag.c 2010-12-17 17:49:35.000000000 +0100
22 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
23 ! if (g_do_tagpreview)
30 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
31 ! if (g_do_tagpreview != 0)
39 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
40 ! if (g_do_tagpreview)
42 if (ptag_entry.tagname != NULL
43 && STRCMP(ptag_entry.tagname, tag) == 0)
47 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
48 ! if (g_do_tagpreview != 0)
50 if (ptag_entry.tagname != NULL
51 && STRCMP(ptag_entry.tagname, tag) == 0)
56 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
57 ! g_do_tagpreview ? ptag_entry.tagname == NULL :
64 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
65 ! g_do_tagpreview != 0 ? ptag_entry.tagname == NULL :
73 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
74 ! if (g_do_tagpreview)
76 cur_match = ptag_entry.cur_match;
77 cur_fnum = ptag_entry.cur_fnum;
81 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
82 ! if (g_do_tagpreview != 0)
84 cur_match = ptag_entry.cur_match;
85 cur_fnum = ptag_entry.cur_fnum;
88 prevtagstackidx = tagstackidx;
90 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
91 ! if (g_do_tagpreview)
93 cur_match = ptag_entry.cur_match;
94 cur_fnum = ptag_entry.cur_fnum;
96 prevtagstackidx = tagstackidx;
98 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
99 ! if (g_do_tagpreview != 0)
101 cur_match = ptag_entry.cur_match;
102 cur_fnum = ptag_entry.cur_fnum;
107 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
108 ! if (g_do_tagpreview)
110 if (type != DT_SELECT && type != DT_JUMP)
115 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
116 ! if (g_do_tagpreview != 0)
118 if (type != DT_SELECT && type != DT_JUMP)
123 name = tagstack[tagstackidx].tagname;
124 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
125 ! else if (g_do_tagpreview)
126 name = ptag_entry.tagname;
131 name = tagstack[tagstackidx].tagname;
132 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
133 ! else if (g_do_tagpreview != 0)
134 name = ptag_entry.tagname;
139 parse_match(matches[i], &tagp);
141 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
143 && i == ptag_entry.cur_match) ||
147 parse_match(matches[i], &tagp);
149 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
150 ! (g_do_tagpreview != 0
151 && i == ptag_entry.cur_match) ||
158 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
159 ! else if (g_do_tagpreview)
161 ptag_entry.cur_match = cur_match;
162 ptag_entry.cur_fnum = cur_fnum;
166 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
167 ! else if (g_do_tagpreview != 0)
169 ptag_entry.cur_match = cur_match;
170 ptag_entry.cur_fnum = cur_fnum;
175 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
176 ! if (g_do_tagpreview)
178 postponed_split = 0; /* don't split again below */
179 curwin_save = curwin; /* Save current window */
183 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
184 ! if (g_do_tagpreview != 0)
186 postponed_split = 0; /* don't split again below */
187 curwin_save = curwin; /* Save current window */
190 /* A :ta from a help file will keep the b_help flag set. For ":ptag"
191 * we need to use the flag from the window where we came from. */
192 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
193 ! if (g_do_tagpreview)
194 keep_help_flag = curwin_save->w_buffer->b_help;
198 /* A :ta from a help file will keep the b_help flag set. For ":ptag"
199 * we need to use the flag from the window where we came from. */
200 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
201 ! if (g_do_tagpreview != 0)
202 keep_help_flag = curwin_save->w_buffer->b_help;
209 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
210 ! if (g_do_tagpreview && curwin != curwin_save && win_valid(curwin_save))
212 /* Return cursor to where we were */
217 #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
218 ! if (g_do_tagpreview != 0
219 ! && curwin != curwin_save && win_valid(curwin_save))
221 /* Return cursor to where we were */
223 *** ../vim-7.3.128/src/version.c 2011-02-25 15:11:17.000000000 +0100
224 --- src/version.c 2011-02-25 15:12:25.000000000 +0100
228 { /* Add new patch number below this line */
234 PRINCE: He's come to rescue me, father.
235 LAUNCELOT: (embarrassed) Well, let's not jump to conclusions ...
236 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
238 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
239 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
240 \\\ an exciting new programming language -- http://www.Zimbu.org ///
241 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///