]>
Commit | Line | Data |
---|---|---|
43e41de9 ER |
1 | To: vim_dev@googlegroups.com |
2 | Subject: Patch 7.3.081 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.3.081 | |
11 | Problem: Non-printable characters in 'statusline' cause trouble. (ZyX) | |
12 | Solution: Use transstr(). (partly by Caio Ariede) | |
13 | Files: src/screen.c | |
14 | ||
15 | ||
16 | *** ../vim-7.3.080/src/screen.c 2010-08-15 21:57:32.000000000 +0200 | |
17 | --- src/screen.c 2010-12-08 19:27:20.000000000 +0100 | |
18 | *************** | |
19 | *** 3405,3413 **** | |
20 | # endif | |
21 | ) | |
22 | { | |
23 | ! int_u text_sign; | |
24 | # ifdef FEAT_SIGN_ICONS | |
25 | ! int_u icon_sign; | |
26 | # endif | |
27 | ||
28 | /* Draw two cells with the sign value or blank. */ | |
29 | --- 3405,3413 ---- | |
30 | # endif | |
31 | ) | |
32 | { | |
33 | ! int text_sign; | |
34 | # ifdef FEAT_SIGN_ICONS | |
35 | ! int icon_sign; | |
36 | # endif | |
37 | ||
38 | /* Draw two cells with the sign value or blank. */ | |
39 | *************** | |
40 | *** 6522,6529 **** | |
41 | stl, use_sandbox, | |
42 | fillchar, maxwidth, hltab, tabtab); | |
43 | vim_free(stl); | |
44 | - len = (int)STRLEN(buf); | |
45 | ||
46 | while (width < maxwidth && len < (int)sizeof(buf) - 1) | |
47 | { | |
48 | #ifdef FEAT_MBYTE | |
49 | --- 6522,6538 ---- | |
50 | stl, use_sandbox, | |
51 | fillchar, maxwidth, hltab, tabtab); | |
52 | vim_free(stl); | |
53 | ||
54 | + /* Make all characters printable. */ | |
55 | + p = transstr(buf); | |
56 | + if (p != NULL) | |
57 | + { | |
58 | + vim_strncpy(buf, p, sizeof(buf) - 1); | |
59 | + vim_free(p); | |
60 | + } | |
61 | + | |
62 | + /* fill up with "fillchar" */ | |
63 | + len = (int)STRLEN(buf); | |
64 | while (width < maxwidth && len < (int)sizeof(buf) - 1) | |
65 | { | |
66 | #ifdef FEAT_MBYTE | |
67 | *** ../vim-7.3.080/src/version.c 2010-12-08 17:09:27.000000000 +0100 | |
68 | --- src/version.c 2010-12-08 19:31:40.000000000 +0100 | |
69 | *************** | |
70 | *** 716,717 **** | |
71 | --- 716,719 ---- | |
72 | { /* Add new patch number below this line */ | |
73 | + /**/ | |
74 | + 81, | |
75 | /**/ | |
76 | ||
77 | -- | |
78 | hundred-and-one symptoms of being an internet addict: | |
79 | 6. You refuse to go to a vacation spot with no electricity and no phone lines. | |
80 | ||
81 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
82 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
83 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
84 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |