projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 48112765 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.385 (extra) | |
| 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 6.2.385 (extra) | |
| 11 | Problem: Win32: forward_slash() and trash_input_buf() are undefined when | |
| 12 | compiling with small features. (Ajit Thakkar) | |
| 13 | Solution: Change the #ifdefs for forward_slash(). Don't call | |
| 14 | trash_input_buf() if the input buffer isn't used. | |
| 15 | Files: src/fileio.c, src/os_win32.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-6.2.384/src/fileio.c Sun Mar 7 15:21:39 2004 | |
| 19 | --- src/fileio.c Sat Mar 20 20:02:34 2004 | |
| 20 | *************** | |
| 21 | *** 6064,6069 **** | |
| 22 | --- 6069,6097 ---- | |
| 23 | #endif /* TEMPDIRNAMES */ | |
| 24 | } | |
| 25 | ||
| 26 | + #if defined(BACKSLASH_IN_FILENAME) || defined(PROTO) | |
| 27 | + /* | |
| 28 | + * Convert all backslashes in fname to forward slashes in-place. | |
| 29 | + */ | |
| 30 | + void | |
| 31 | + forward_slash(fname) | |
| 32 | + char_u *fname; | |
| 33 | + { | |
| 34 | + char_u *p; | |
| 35 | + | |
| 36 | + for (p = fname; *p != NUL; ++p) | |
| 37 | + # ifdef FEAT_MBYTE | |
| 38 | + /* The Big5 encoding can have '\' in the trail byte. */ | |
| 39 | + if (enc_dbcs != 0 && (*mb_ptr2len_check)(p) > 1) | |
| 40 | + ++p; | |
| 41 | + else | |
| 42 | + # endif | |
| 43 | + if (*p == '\\') | |
| 44 | + *p = '/'; | |
| 45 | + } | |
| 46 | + #endif | |
| 47 | + | |
| 48 | + | |
| 49 | /* | |
| 50 | * Code for automatic commands. | |
| 51 | * | |
| 52 | *************** | |
| 53 | *** 6255,6282 **** | |
| 54 | static EVENT_T last_event; | |
| 55 | static int last_group; | |
| 56 | ||
| 57 | - #if defined(BACKSLASH_IN_FILENAME) || defined(PROTO) | |
| 58 | - /* | |
| 59 | - * Convert all backslashes in fname to forward slashes in-place. | |
| 60 | - */ | |
| 61 | - void | |
| 62 | - forward_slash(fname) | |
| 63 | - char_u *fname; | |
| 64 | - { | |
| 65 | - char_u *p; | |
| 66 | - | |
| 67 | - for (p = fname; *p != NUL; ++p) | |
| 68 | - # ifdef FEAT_MBYTE | |
| 69 | - /* The Big5 encoding can have '\' in the trail byte. */ | |
| 70 | - if (enc_dbcs != 0 && (*mb_ptr2len_check)(p) > 1) | |
| 71 | - ++p; | |
| 72 | - else | |
| 73 | - # endif | |
| 74 | - if (*p == '\\') | |
| 75 | - *p = '/'; | |
| 76 | - } | |
| 77 | - #endif | |
| 78 | - | |
| 79 | /* | |
| 80 | * Show the autocommands for one AutoPat. | |
| 81 | */ | |
| 82 | --- 6283,6288 ---- | |
| 83 | *** ../vim-6.2.384/src/os_win32.c Thu Mar 11 21:03:40 2004 | |
| 84 | --- src/os_win32.c Sat Mar 20 20:06:51 2004 | |
| 85 | *************** | |
| 86 | *** 1396,1402 **** | |
| 87 | --- 1401,1409 ---- | |
| 88 | ||
| 89 | if (c == Ctrl_C && ctrl_c_interrupts) | |
| 90 | { | |
| 91 | + #if defined(FEAT_CLIENTSERVER) | |
| 92 | trash_input_buf(); | |
| 93 | + #endif | |
| 94 | got_int = TRUE; | |
| 95 | } | |
| 96 | ||
| 97 | *** ../vim-6.2.384/src/version.c Sat Mar 20 21:12:16 2004 | |
| 98 | --- src/version.c Sat Mar 20 21:13:46 2004 | |
| 99 | *************** | |
| 100 | *** 639,640 **** | |
| 101 | --- 639,642 ---- | |
| 102 | { /* Add new patch number below this line */ | |
| 103 | + /**/ | |
| 104 | + 385, | |
| 105 | /**/ | |
| 106 | ||
| 107 | -- | |
| 108 | From "know your smileys": | |
| 109 | :-{} Too much lipstick | |
| 110 | ||
| 111 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 112 | /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 113 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 114 | \\\ Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html /// |