4 From: Bram Moolenaar <Bram@moolenaar.net>
6 Content-Type: text/plain; charset=ISO-8859-1
7 Content-Transfer-Encoding: 8bit
11 Problem: Non-extra part for 7.1.282.
12 Solution: Various changes.
13 Files: src/ex_docmd.c, src/globals.h, src/if_cscope.c, src/main.c,
14 src/mark.c, src/netbeans.c, src/popupmnu.c, src/vim.h,
18 *** ../vim-7.1.282/src/ex_docmd.c Mon Mar 10 21:33:52 2008
19 --- src/ex_docmd.c Wed Mar 12 14:53:18 2008
23 if (!isalpha(p[j]) && j >= cmdmods[i].minlen
24 && (p == cmd || cmdmods[i].has_count))
25 ! return j + (p - cmd);
31 if (!isalpha(p[j]) && j >= cmdmods[i].minlen
32 && (p == cmd || cmdmods[i].has_count))
33 ! return j + (int)(p - cmd);
37 *** ../vim-7.1.282/src/globals.h Tue Jan 1 14:16:42 2008
38 --- src/globals.h Wed Mar 12 14:54:00 2008
41 * The value of the --windowid argument.
42 * For embedding gvim inside another application.
44 ! EXTERN int win_socket_id INIT(= 0);
47 #if defined(FEAT_CLIENTSERVER) || defined(FEAT_EVAL)
49 * The value of the --windowid argument.
50 * For embedding gvim inside another application.
52 ! EXTERN long_u win_socket_id INIT(= 0);
55 #if defined(FEAT_CLIENTSERVER) || defined(FEAT_EVAL)
56 *** ../vim-7.1.282/src/if_cscope.c Sun Mar 16 13:09:14 2008
57 --- src/if_cscope.c Sun Mar 16 13:05:51 2008
62 /* Store length of eap->arg before it gets modified by strtok(). */
63 ! eap_arg_len = STRLEN(eap->arg);
65 if ((stok = strtok((char *)(eap->arg), (const char *)" ")) == NULL)
70 /* Store length of eap->arg before it gets modified by strtok(). */
71 ! eap_arg_len = (int)STRLEN(eap->arg);
73 if ((stok = strtok((char *)(eap->arg), (const char *)" ")) == NULL)
75 *** ../vim-7.1.282/src/main.c Sun Jan 13 16:17:02 2008
76 --- src/main.c Wed Mar 12 15:04:30 2008
79 else if (STRICMP(argv[i], "--socketid") == 0)
86 mainerr_arg_missing((char_u *)argv[i]);
87 if (STRNICMP(argv[i+1], "0x", 2) == 0)
88 ! count = sscanf(&(argv[i + 1][2]), "%x", &id);
90 ! count = sscanf(argv[i+1], "%u", &id);
92 mainerr(ME_INVALID_ARG, (char_u *)argv[i]);
95 else if (STRICMP(argv[i], "--socketid") == 0)
102 mainerr_arg_missing((char_u *)argv[i]);
103 if (STRNICMP(argv[i+1], "0x", 2) == 0)
104 ! count = sscanf(&(argv[i + 1][2]), SCANF_HEX_LONG_U, &id);
106 ! count = sscanf(argv[i + 1], SCANF_DECIMAL_LONG_U, &id);
108 mainerr(ME_INVALID_ARG, (char_u *)argv[i]);
110 *** ../vim-7.1.282/src/mark.c Wed Feb 13 12:41:30 2008
111 --- src/mark.c Wed Mar 12 15:10:14 2008
116 expand_env((char_u *)"~/", NameBuff, MAXPATHL);
117 ! len = STRLEN(NameBuff);
118 vim_strncpy(NameBuff + len, fm->fname + 2, MAXPATHL - len - 1);
124 expand_env((char_u *)"~/", NameBuff, MAXPATHL);
125 ! len = (int)STRLEN(NameBuff);
126 vim_strncpy(NameBuff + len, fm->fname + 2, MAXPATHL - len - 1);
129 *** ../vim-7.1.282/src/netbeans.c Fri Jan 18 11:40:02 2008
130 --- src/netbeans.c Wed Mar 12 15:11:42 2008
135 oldtext = ml_get(lnum);
136 ! oldlen = STRLEN(oldtext);
137 if (first >= (colnr_T)oldlen || oldlen == 0) /* just in case */
139 if (lastbyte >= oldlen)
143 oldtext = ml_get(lnum);
144 ! oldlen = (int)STRLEN(oldtext);
145 if (first >= (colnr_T)oldlen || oldlen == 0) /* just in case */
147 if (lastbyte >= oldlen)
150 int len_first, len_other;
153 ! len_first = STRLEN(ml_get(first));
154 ! len_other = STRLEN(ml_get(other));
155 p = alloc((unsigned)(len_first + len_other + 1));
159 int len_first, len_other;
162 ! len_first = (int)STRLEN(ml_get(first));
163 ! len_other = (int)STRLEN(ml_get(other));
164 p = alloc((unsigned)(len_first + len_other + 1));
167 *** ../vim-7.1.282/src/popupmnu.c Wed Aug 8 22:48:16 2007
168 --- src/popupmnu.c Wed Mar 12 15:17:21 2008
177 for (j = pum_width; j < len; ++j)
182 ! len = (int)STRLEN(rt);
185 for (j = pum_width; j < len; ++j)
186 *** ../vim-7.1.282/src/vim.h Sat Mar 15 13:10:57 2008
187 --- src/vim.h Thu Mar 13 23:39:21 2008
190 * On Win64 longs are 32 bit and pointers 64 bit.
191 * For printf() and scanf() we need to take care of long_u specifically. */
193 ! typedef unsigned __int64 long_u;
194 ! typedef __int64 long_i;
195 ! # define SCANF_HEX_LONG_U "%Ix"
196 ! # define PRINTF_HEX_LONG_U "0x%Ix"
198 ! typedef unsigned long long_u;
199 ! typedef long long_i;
200 ! # define SCANF_HEX_LONG_U "%lx"
201 ! # define PRINTF_HEX_LONG_U "0x%lx"
205 * The characters and attributes cached for the screen.
207 * On Win64 longs are 32 bit and pointers 64 bit.
208 * For printf() and scanf() we need to take care of long_u specifically. */
210 ! typedef unsigned __int64 long_u;
211 ! typedef __int64 long_i;
212 ! # define SCANF_HEX_LONG_U "%Ix"
213 ! # define SCANF_DECIMAL_LONG_U "%Iu"
214 ! # define PRINTF_HEX_LONG_U "0x%Ix"
216 ! typedef unsigned long long_u;
217 ! typedef long long_i;
218 ! # define SCANF_HEX_LONG_U "%lx"
219 ! # define SCANF_DECIMAL_LONG_U "%lu"
220 ! # define PRINTF_HEX_LONG_U "0x%lx"
222 + #define PRINTF_DECIMAL_LONG_U SCANF_DECIMAL_LONG_U
225 * The characters and attributes cached for the screen.
226 *** ../vim-7.1.282/src/window.c Sat Sep 29 14:15:00 2007
227 --- src/window.c Wed Mar 12 15:22:10 2008
233 ! if ((hlg_id = syn_namen2id(grp, STRLEN(grp))) == 0)
235 EMSG2(_(e_nogroup), grp);
241 ! if ((hlg_id = syn_namen2id(grp, (int)STRLEN(grp))) == 0)
243 EMSG2(_(e_nogroup), grp);
245 *** ../vim-7.1.282/src/version.c Sun Mar 16 14:52:53 2008
246 --- src/version.c Sun Mar 16 16:00:17 2008
250 { /* Add new patch number below this line */
256 hundred-and-one symptoms of being an internet addict:
257 139. You down your lunch in five minutes, at your desk, so you can
258 spend the rest of the hour surfing the Net.
260 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
261 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
262 \\\ download, build and distribute -- http://www.A-A-P.org ///
263 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///