1 To: [email protected] |
|
2 Subject: Patch 7.2.082 |
|
3 Fcc: outbox |
|
4 From: Bram Moolenaar <[email protected]> |
|
5 Mime-Version: 1.0 |
|
6 Content-Type: text/plain; charset=ISO-8859-1 |
|
7 Content-Transfer-Encoding: 8bit |
|
8 ------------ |
|
9 |
|
10 Patch 7.2.082 |
|
11 Problem: When 'ff' is "mac" then "ga" on a ^J shows 0x0d instead of 0x0a. |
|
12 (Andy Wokula) |
|
13 Solution: Use NL for this situation. (Lech Lorens) |
|
14 Files: src/ex_cmds.c |
|
15 |
|
16 |
|
17 *** ../vim-7.2.081/src/ex_cmds.c Fri Nov 28 21:26:50 2008 |
|
18 --- src/ex_cmds.c Tue Jan 13 16:51:32 2009 |
|
19 *************** |
|
20 *** 49,54 **** |
|
21 --- 49,55 ---- |
|
22 exarg_T *eap; |
|
23 { |
|
24 int c; |
|
25 + int cval; |
|
26 char buf1[20]; |
|
27 char buf2[20]; |
|
28 char_u buf3[7]; |
|
29 *************** |
|
30 *** 75,80 **** |
|
31 --- 76,85 ---- |
|
32 { |
|
33 if (c == NL) /* NUL is stored as NL */ |
|
34 c = NUL; |
|
35 + if (c == CAR && get_fileformat(curbuf) == EOL_MAC) |
|
36 + cval = NL; /* NL is stored as CR */ |
|
37 + else |
|
38 + cval = c; |
|
39 if (vim_isprintc_strict(c) && (c < ' ' |
|
40 #ifndef EBCDIC |
|
41 || c > '~' |
|
42 *************** |
|
43 *** 94,100 **** |
|
44 buf2[0] = NUL; |
|
45 vim_snprintf((char *)IObuff, IOSIZE, |
|
46 _("<%s>%s%s %d, Hex %02x, Octal %03o"), |
|
47 ! transchar(c), buf1, buf2, c, c, c); |
|
48 #ifdef FEAT_MBYTE |
|
49 if (enc_utf8) |
|
50 c = cc[ci++]; |
|
51 --- 99,105 ---- |
|
52 buf2[0] = NUL; |
|
53 vim_snprintf((char *)IObuff, IOSIZE, |
|
54 _("<%s>%s%s %d, Hex %02x, Octal %03o"), |
|
55 ! transchar(c), buf1, buf2, cval, cval, cval); |
|
56 #ifdef FEAT_MBYTE |
|
57 if (enc_utf8) |
|
58 c = cc[ci++]; |
|
59 *** ../vim-7.2.081/src/version.c Tue Jan 13 16:37:31 2009 |
|
60 --- src/version.c Tue Jan 13 16:53:39 2009 |
|
61 *************** |
|
62 *** 678,679 **** |
|
63 --- 678,681 ---- |
|
64 { /* Add new patch number below this line */ |
|
65 + /**/ |
|
66 + 82, |
|
67 /**/ |
|
68 |
|
69 -- |
|
70 The budget process was invented by an alien race of sadistic beings who |
|
71 resemble large cats. |
|
72 (Scott Adams - The Dilbert principle) |
|
73 |
|
74 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ |
|
75 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
|
76 \\\ download, build and distribute -- http://www.A-A-P.org /// |
|
77 \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |
|