]>
Commit | Line | Data |
---|---|---|
c7a9d944 AG |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 6.4.005 | |
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.4.005 | |
11 | Problem: When truncating a message with multi-byte characters the '<' may | |
12 | be written before the buffer. (Pawel S. Veselov) | |
13 | Solution: Don't write the '<' when there is sufficient room. | |
14 | Files: src/message.c | |
15 | ||
16 | ||
17 | *** ../vim-6.4.004/src/message.c Sun Jun 13 12:15:03 2004 | |
18 | --- src/message.c Thu Dec 22 22:26:05 2005 | |
19 | *************** | |
20 | *** 718,723 **** | |
21 | --- 718,727 ---- | |
22 | { | |
23 | int size = vim_strsize(s); | |
24 | ||
25 | + /* There may be room anyway when there are multibyte chars. */ | |
26 | + if (size <= room) | |
27 | + return s; | |
28 | + | |
29 | for (n = 0; size >= room; ) | |
30 | { | |
31 | size -= (*mb_ptr2cells)(s + n); | |
32 | *** ../vim-6.4.004/src/version.c Thu Dec 1 16:08:05 2005 | |
33 | --- src/version.c Thu Dec 22 22:33:27 2005 | |
34 | *************** | |
35 | *** 643,644 **** | |
36 | --- 643,646 ---- | |
37 | { /* Add new patch number below this line */ | |
38 | + /**/ | |
39 | + 5, | |
40 | /**/ | |
41 | ||
42 | -- | |
43 | ARTHUR: Old woman! | |
44 | DENNIS: Man! | |
45 | ARTHUR: Man. I'm sorry. Old man, What knight live in that castle over there? | |
46 | DENNIS: I'm thirty-seven. | |
47 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
48 | ||
49 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
50 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
51 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
52 | \\\ help me help AIDS victims -- http://www.ICCF.nl /// |