Mercurial > vim
changeset 1712:563bd9a63fdc v7.2.010
updated for version 7.2-010
| author | vimboss |
|---|---|
| date | Sat, 06 Sep 2008 14:44:59 +0000 |
| parents | 20b2e52ca962 |
| children | 7781fcd2b74f |
| files | src/mbyte.c src/misc2.c src/normal.c src/version.c |
| diffstat | 4 files changed, 57 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/src/mbyte.c +++ b/src/mbyte.c @@ -2540,7 +2540,6 @@ utf_head_off(base, p) return (int)(p - q); } -#if defined(FEAT_EVAL) || defined(PROTO) /* * Copy a character from "*fp" to "*tp" and advance the pointers. */ @@ -2555,7 +2554,6 @@ mb_copy_char(fp, tp) *tp += l; *fp += l; } -#endif /* * Return the offset from "p" to the first byte of a character. When "p" is
--- a/src/misc2.c +++ b/src/misc2.c @@ -1257,7 +1257,6 @@ vim_strsave_escaped_ext(string, esc_char return escaped_string; } -#if !defined(BACKSLASH_IN_FILENAME) || defined(FEAT_EVAL) || defined(PROTO) /* * Return TRUE when 'shell' has "csh" in the tail. */ @@ -1266,9 +1265,7 @@ csh_like_shell() { return (strstr((char *)gettail(p_sh), "csh") != NULL); } -#endif - -#if defined(FEAT_EVAL) || defined(PROTO) + /* * Escape "string" for use as a shell argument with system(). * This uses single quotes, except when we know we need to use double qoutes @@ -1391,7 +1388,6 @@ vim_strsave_shellescape(string, do_speci return escaped_string; } -#endif /* * Like vim_strsave(), but make all characters uppercase.
--- a/src/normal.c +++ b/src/normal.c @@ -5469,6 +5469,11 @@ nv_ident(cap) STRCPY(buf, "he! "); else { + /* An external command will probably use an argument starting + * with "-" as an option. To avoid trouble we skip the "-". */ + while (*ptr == '-') + ++ptr; + /* When a count is given, turn it into a range. Is this * really what we want? */ isman = (STRCMP(kp, "man") == 0); @@ -5511,37 +5516,57 @@ nv_ident(cap) /* * Now grab the chars in the identifier */ - if (cmdchar == '*') - aux_ptr = (char_u *)(p_magic ? "/.*~[^$\\" : "/^$\\"); - else if (cmdchar == '#') - aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\"); - else if (cmdchar == 'K' && !kp_help) - aux_ptr = (char_u *)" \t\\\"|!"; + if (cmdchar == 'K' && !kp_help) + { + /* Escape the argument properly for a shell command */ + p = vim_strsave_shellescape(ptr, TRUE); + if (p == NULL) + { + vim_free(buf); + return; + } + buf = (char_u *)vim_realloc(buf, STRLEN(buf) + STRLEN(p) + 1); + if (buf == NULL) + { + vim_free(buf); + vim_free(p); + return; + } + STRCAT(buf, p); + vim_free(p); + } else - /* Don't escape spaces and Tabs in a tag with a backslash */ - aux_ptr = (char_u *)"\\|\""; - - p = buf + STRLEN(buf); - while (n-- > 0) - { - /* put a backslash before \ and some others */ - if (vim_strchr(aux_ptr, *ptr) != NULL) - *p++ = '\\'; + { + if (cmdchar == '*') + aux_ptr = (char_u *)(p_magic ? "/.*~[^$\\" : "/^$\\"); + else if (cmdchar == '#') + aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\"); + else + /* Don't escape spaces and Tabs in a tag with a backslash */ + aux_ptr = (char_u *)"\\|\"\n*?["; + + p = buf + STRLEN(buf); + while (n-- > 0) + { + /* put a backslash before \ and some others */ + if (vim_strchr(aux_ptr, *ptr) != NULL) + *p++ = '\\'; #ifdef FEAT_MBYTE - /* When current byte is a part of multibyte character, copy all bytes - * of that character. */ - if (has_mbyte) - { - int i; - int len = (*mb_ptr2len)(ptr) - 1; - - for (i = 0; i < len && n >= 1; ++i, --n) - *p++ = *ptr++; - } -#endif - *p++ = *ptr++; - } - *p = NUL; + /* When current byte is a part of multibyte character, copy all + * bytes of that character. */ + if (has_mbyte) + { + int i; + int len = (*mb_ptr2len)(ptr) - 1; + + for (i = 0; i < len && n >= 1; ++i, --n) + *p++ = *ptr++; + } +#endif + *p++ = *ptr++; + } + *p = NUL; + } /* * Execute the command.