projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 0a7814d6 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: patch 7.1.083 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.1.083 (after 7.1.081) | |
| 11 | Problem: Command line completion doesn't work with wildcards. | |
| 12 | Solution: Add vim_isfilec_or_wc() and use it. (Martin Toft) | |
| 13 | Files: src/charset.c, src/proto/charset.pro, src/ex_docmd.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.1.082/src/charset.c Wed Aug 15 20:40:45 2007 | |
| 17 | --- src/charset.c Sun Aug 19 22:30:25 2007 | |
| 18 | *************** | |
| 19 | *** 932,937 **** | |
| 20 | --- 932,954 ---- | |
| 21 | } | |
| 22 | ||
| 23 | /* | |
| 24 | + * return TRUE if 'c' is a valid file-name character or a wildcard character | |
| 25 | + * Assume characters above 0x100 are valid (multi-byte). | |
| 26 | + * Explicitly interpret ']' as a wildcard character as mch_has_wildcard("]") | |
| 27 | + * returns false. | |
| 28 | + */ | |
| 29 | + int | |
| 30 | + vim_isfilec_or_wc(c) | |
| 31 | + int c; | |
| 32 | + { | |
| 33 | + char_u buf[2]; | |
| 34 | + | |
| 35 | + buf[0] = (char_u)c; | |
| 36 | + buf[1] = NUL; | |
| 37 | + return vim_isfilec(c) || c == ']' || mch_has_wildcard(buf); | |
| 38 | + } | |
| 39 | + | |
| 40 | + /* | |
| 41 | * return TRUE if 'c' is a printable character | |
| 42 | * Assume characters above 0x100 are printable (multi-byte), except for | |
| 43 | * Unicode. | |
| 44 | *** ../vim-7.1.082/src/proto/charset.pro Sat May 5 19:21:32 2007 | |
| 45 | --- src/proto/charset.pro Sun Aug 19 22:30:28 2007 | |
| 46 | *************** | |
| 47 | *** 21,26 **** | |
| 48 | --- 21,27 ---- | |
| 49 | int vim_iswordp __ARGS((char_u *p)); | |
| 50 | int vim_iswordc_buf __ARGS((char_u *p, buf_T *buf)); | |
| 51 | int vim_isfilec __ARGS((int c)); | |
| 52 | + int vim_isfilec_or_wc __ARGS((int c)); | |
| 53 | int vim_isprintc __ARGS((int c)); | |
| 54 | int vim_isprintc_strict __ARGS((int c)); | |
| 55 | int lbr_chartabsize __ARGS((unsigned char *s, colnr_T col)); | |
| 56 | *** ../vim-7.1.082/src/ex_docmd.c Sat Aug 18 17:46:50 2007 | |
| 57 | --- src/ex_docmd.c Sun Aug 19 22:29:17 2007 | |
| 58 | *************** | |
| 59 | *** 3311,3319 **** | |
| 60 | in_quote = !in_quote; | |
| 61 | } | |
| 62 | #ifdef SPACE_IN_FILENAME | |
| 63 | ! else if (!vim_isfilec(c) && (!(ea.argt & NOSPC) || usefilter)) | |
| 64 | #else | |
| 65 | ! else if (!vim_isfilec(c)) | |
| 66 | #endif | |
| 67 | { | |
| 68 | while (*p != NUL) | |
| 69 | --- 3311,3320 ---- | |
| 70 | in_quote = !in_quote; | |
| 71 | } | |
| 72 | #ifdef SPACE_IN_FILENAME | |
| 73 | ! else if (!vim_isfilec_or_wc(c) | |
| 74 | ! && (!(ea.argt & NOSPC) || usefilter)) | |
| 75 | #else | |
| 76 | ! else if (!vim_isfilec_or_wc(c)) | |
| 77 | #endif | |
| 78 | { | |
| 79 | while (*p != NUL) | |
| 80 | *************** | |
| 81 | *** 3324,3330 **** | |
| 82 | else | |
| 83 | #endif | |
| 84 | c = *p; | |
| 85 | ! if (c == '`' || vim_isfilec(c)) | |
| 86 | break; | |
| 87 | #ifdef FEAT_MBYTE | |
| 88 | if (has_mbyte) | |
| 89 | --- 3325,3331 ---- | |
| 90 | else | |
| 91 | #endif | |
| 92 | c = *p; | |
| 93 | ! if (c == '`' || vim_isfilec_or_wc(c)) | |
| 94 | break; | |
| 95 | #ifdef FEAT_MBYTE | |
| 96 | if (has_mbyte) | |
| 97 | *** ../vim-7.1.082/src/version.c Sat Aug 18 18:20:57 2007 | |
| 98 | --- src/version.c Sun Aug 19 22:31:43 2007 | |
| 99 | *************** | |
| 100 | *** 668,669 **** | |
| 101 | --- 668,671 ---- | |
| 102 | { /* Add new patch number below this line */ | |
| 103 | + /**/ | |
| 104 | + 83, | |
| 105 | /**/ | |
| 106 | ||
| 107 | -- | |
| 108 | "You mean there really is an answer?" | |
| 109 | "Yes! But you're not going to like it!" | |
| 110 | "Oh do please tell us!" | |
| 111 | "You're really not going to like it!" | |
| 112 | "but we MUST know - tell us" | |
| 113 | "Alright, the answer is...." | |
| 114 | "yes..." | |
| 115 | "... is ..." | |
| 116 | "yes... come on!" | |
| 117 | "is 42!" | |
| 118 | (Douglas Adams - The Hitchhiker's Guide to the Galaxy) | |
| 119 | ||
| 120 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 121 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 122 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 123 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |