| To: vim-dev@vim.org |
| Subject: Patch 7.1.283 |
| Fcc: outbox |
| From: Bram Moolenaar <Bram@moolenaar.net> |
| Mime-Version: 1.0 |
| Content-Type: text/plain; charset=ISO-8859-1 |
| Content-Transfer-Encoding: 8bit |
| |
| |
| Patch 7.1.283 |
| Problem: Non-extra part for 7.1.282. |
| Solution: Various changes. |
| Files: src/ex_docmd.c, src/globals.h, src/if_cscope.c, src/main.c, |
| src/mark.c, src/netbeans.c, src/popupmnu.c, src/vim.h, |
| src/window.c |
| |
| |
| |
| |
| |
| *** 3009,3015 **** |
| break; |
| if (!isalpha(p[j]) && j >= cmdmods[i].minlen |
| && (p == cmd || cmdmods[i].has_count)) |
| ! return j + (p - cmd); |
| } |
| return 0; |
| } |
| --- 3009,3015 ---- |
| break; |
| if (!isalpha(p[j]) && j >= cmdmods[i].minlen |
| && (p == cmd || cmdmods[i].has_count)) |
| ! return j + (int)(p - cmd); |
| } |
| return 0; |
| } |
| |
| |
| |
| *** 1263,1269 **** |
| * The value of the --windowid argument. |
| * For embedding gvim inside another application. |
| */ |
| ! EXTERN int win_socket_id INIT(= 0); |
| #endif |
| |
| #if defined(FEAT_CLIENTSERVER) || defined(FEAT_EVAL) |
| --- 1263,1269 ---- |
| * The value of the --windowid argument. |
| * For embedding gvim inside another application. |
| */ |
| ! EXTERN long_u win_socket_id INIT(= 0); |
| #endif |
| |
| #if defined(FEAT_CLIENTSERVER) || defined(FEAT_EVAL) |
| |
| |
| |
| *** 1400,1406 **** |
| return NULL; |
| |
| /* Store length of eap->arg before it gets modified by strtok(). */ |
| ! eap_arg_len = STRLEN(eap->arg); |
| |
| if ((stok = strtok((char *)(eap->arg), (const char *)" ")) == NULL) |
| return NULL; |
| --- 1400,1406 ---- |
| return NULL; |
| |
| /* Store length of eap->arg before it gets modified by strtok(). */ |
| ! eap_arg_len = (int)STRLEN(eap->arg); |
| |
| if ((stok = strtok((char *)(eap->arg), (const char *)" ")) == NULL) |
| return NULL; |
| |
| |
| |
| *** 1552,1566 **** |
| else if (STRICMP(argv[i], "--socketid") == 0) |
| # endif |
| { |
| ! unsigned int id; |
| ! int count; |
| |
| if (i == argc - 1) |
| mainerr_arg_missing((char_u *)argv[i]); |
| if (STRNICMP(argv[i+1], "0x", 2) == 0) |
| ! count = sscanf(&(argv[i + 1][2]), "%x", &id); |
| else |
| ! count = sscanf(argv[i+1], "%u", &id); |
| if (count != 1) |
| mainerr(ME_INVALID_ARG, (char_u *)argv[i]); |
| else |
| --- 1552,1566 ---- |
| else if (STRICMP(argv[i], "--socketid") == 0) |
| # endif |
| { |
| ! long_u id; |
| ! int count; |
| |
| if (i == argc - 1) |
| mainerr_arg_missing((char_u *)argv[i]); |
| if (STRNICMP(argv[i+1], "0x", 2) == 0) |
| ! count = sscanf(&(argv[i + 1][2]), SCANF_HEX_LONG_U, &id); |
| else |
| ! count = sscanf(argv[i + 1], SCANF_DECIMAL_LONG_U, &id); |
| if (count != 1) |
| mainerr(ME_INVALID_ARG, (char_u *)argv[i]); |
| else |
| |
| |
| |
| *** 522,528 **** |
| int len; |
| |
| expand_env((char_u *)"~/", NameBuff, MAXPATHL); |
| ! len = STRLEN(NameBuff); |
| vim_strncpy(NameBuff + len, fm->fname + 2, MAXPATHL - len - 1); |
| } |
| else |
| --- 522,528 ---- |
| int len; |
| |
| expand_env((char_u *)"~/", NameBuff, MAXPATHL); |
| ! len = (int)STRLEN(NameBuff); |
| vim_strncpy(NameBuff + len, fm->fname + 2, MAXPATHL - len - 1); |
| } |
| else |
| |
| |
| |
| *** 1216,1222 **** |
| int lastbyte = last; |
| |
| oldtext = ml_get(lnum); |
| ! oldlen = STRLEN(oldtext); |
| if (first >= (colnr_T)oldlen || oldlen == 0) /* just in case */ |
| return; |
| if (lastbyte >= oldlen) |
| --- 1216,1222 ---- |
| int lastbyte = last; |
| |
| oldtext = ml_get(lnum); |
| ! oldlen = (int)STRLEN(oldtext); |
| if (first >= (colnr_T)oldlen || oldlen == 0) /* just in case */ |
| return; |
| if (lastbyte >= oldlen) |
| |
| *** 1241,1248 **** |
| int len_first, len_other; |
| char_u *p; |
| |
| ! len_first = STRLEN(ml_get(first)); |
| ! len_other = STRLEN(ml_get(other)); |
| p = alloc((unsigned)(len_first + len_other + 1)); |
| if (p != NULL) |
| { |
| --- 1241,1248 ---- |
| int len_first, len_other; |
| char_u *p; |
| |
| ! len_first = (int)STRLEN(ml_get(first)); |
| ! len_other = (int)STRLEN(ml_get(other)); |
| p = alloc((unsigned)(len_first + len_other + 1)); |
| if (p != NULL) |
| { |
| |
| |
| |
| *** 337,343 **** |
| |
| if (rt != NULL) |
| { |
| ! len = STRLEN(rt); |
| if (len > pum_width) |
| { |
| for (j = pum_width; j < len; ++j) |
| --- 337,343 ---- |
| |
| if (rt != NULL) |
| { |
| ! len = (int)STRLEN(rt); |
| if (len > pum_width) |
| { |
| for (j = pum_width; j < len; ++j) |
| |
| |
| |
| *** 355,370 **** |
| * On Win64 longs are 32 bit and pointers 64 bit. |
| * For printf() and scanf() we need to take care of long_u specifically. */ |
| #ifdef _WIN64 |
| ! typedef unsigned __int64 long_u; |
| ! typedef __int64 long_i; |
| ! # define SCANF_HEX_LONG_U "%Ix" |
| ! # define PRINTF_HEX_LONG_U "0x%Ix" |
| ! #else |
| ! typedef unsigned long long_u; |
| ! typedef long long_i; |
| ! # define SCANF_HEX_LONG_U "%lx" |
| ! # define PRINTF_HEX_LONG_U "0x%lx" |
| #endif |
| |
| /* |
| * The characters and attributes cached for the screen. |
| --- 355,373 ---- |
| * On Win64 longs are 32 bit and pointers 64 bit. |
| * For printf() and scanf() we need to take care of long_u specifically. */ |
| #ifdef _WIN64 |
| ! typedef unsigned __int64 long_u; |
| ! typedef __int64 long_i; |
| ! # define SCANF_HEX_LONG_U "%Ix" |
| ! # define SCANF_DECIMAL_LONG_U "%Iu" |
| ! # define PRINTF_HEX_LONG_U "0x%Ix" |
| ! #else |
| ! typedef unsigned long long_u; |
| ! typedef long long_i; |
| ! # define SCANF_HEX_LONG_U "%lx" |
| ! # define SCANF_DECIMAL_LONG_U "%lu" |
| ! # define PRINTF_HEX_LONG_U "0x%lx" |
| #endif |
| + #define PRINTF_DECIMAL_LONG_U SCANF_DECIMAL_LONG_U |
| |
| /* |
| * The characters and attributes cached for the screen. |
| |
| |
| |
| *** 6303,6309 **** |
| cur = cur->next; |
| } |
| } |
| ! if ((hlg_id = syn_namen2id(grp, STRLEN(grp))) == 0) |
| { |
| EMSG2(_(e_nogroup), grp); |
| return -1; |
| --- 6303,6309 ---- |
| cur = cur->next; |
| } |
| } |
| ! if ((hlg_id = syn_namen2id(grp, (int)STRLEN(grp))) == 0) |
| { |
| EMSG2(_(e_nogroup), grp); |
| return -1; |
| |
| |
| |
| *** 668,669 **** |
| --- 668,671 ---- |
| { /* Add new patch number below this line */ |
| + /**/ |
| + 283, |
| /**/ |
| |
| -- |
| hundred-and-one symptoms of being an internet addict: |
| 139. You down your lunch in five minutes, at your desk, so you can |
| spend the rest of the hour surfing the Net. |
| |
| /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ |
| /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
| \\\ download, build and distribute -- http://www.A-A-P.org /// |
| \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |