projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 05618db8 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.3.056 | |
| 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.3.056 | |
| 11 | Problem: The last characters of a multi-byte file name may not be displayed | |
| 12 | in the window title. | |
| 13 | Solution: Avoid to remove a multi-byte character where the last byte looks | |
| 14 | like a path separator character. (Yasuhiro Matsumoto) | |
| 15 | Files: src/buffer.c, src/ex_getln.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-6.3.055/src/buffer.c Sun Dec 5 16:18:46 2004 | |
| 19 | --- src/buffer.c Thu Dec 16 13:59:48 2004 | |
| 20 | *************** | |
| 21 | *** 2953,2959 **** | |
| 22 | } | |
| 23 | else | |
| 24 | { | |
| 25 | ! while (p > buf + off + 1 && vim_ispathsep(p[-1])) | |
| 26 | --p; | |
| 27 | #ifdef VMS | |
| 28 | /* path separator is part of the path */ | |
| 29 | --- 2953,2964 ---- | |
| 30 | } | |
| 31 | else | |
| 32 | { | |
| 33 | ! while (p > buf + off + 1 && vim_ispathsep(p[-1]) | |
| 34 | ! #ifdef FEAT_MBYTE | |
| 35 | ! && (!has_mbyte | |
| 36 | ! || (*mb_head_off)(buf + off, p - 1) == 0) | |
| 37 | ! #endif | |
| 38 | ! ) | |
| 39 | --p; | |
| 40 | #ifdef VMS | |
| 41 | /* path separator is part of the path */ | |
| 42 | *** ../vim-6.3.055/src/ex_getln.c Thu Jan 13 14:17:23 2005 | |
| 43 | --- src/ex_getln.c Thu Jan 13 14:22:02 2005 | |
| 44 | *************** | |
| 45 | *** 496,501 **** | |
| 46 | --- 496,505 ---- | |
| 47 | i = (int)(xpc.xp_pattern - ccline.cmdbuff); | |
| 48 | while (--j > i) | |
| 49 | { | |
| 50 | + #ifdef FEAT_MBYTE | |
| 51 | + if (has_mbyte) | |
| 52 | + j -= (*mb_head_off)(ccline.cmdbuff, ccline.cmdbuff + j); | |
| 53 | + #endif | |
| 54 | if (vim_ispathsep(ccline.cmdbuff[j])) | |
| 55 | { | |
| 56 | found = TRUE; | |
| 57 | *** ../vim-6.3.055/src/version.c Thu Jan 13 14:17:23 2005 | |
| 58 | --- src/version.c Thu Jan 13 16:21:13 2005 | |
| 59 | *************** | |
| 60 | *** 643,644 **** | |
| 61 | --- 643,646 ---- | |
| 62 | { /* Add new patch number below this line */ | |
| 63 | + /**/ | |
| 64 | + 56, | |
| 65 | /**/ | |
| 66 | ||
| 67 | -- | |
| 68 | Vim is like Emacs without all the typing. (John "Johann" Spetz) | |
| 69 | ||
| 70 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 71 | /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 72 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 73 | \\\ Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html /// |