diff options
| author | vimboss <devnull@localhost> | 2009-01-13 15:58:01 +0000 |
|---|---|---|
| committer | vimboss <devnull@localhost> | 2009-01-13 15:58:01 +0000 |
| commit | 869582f3d4b82582eebd46f1fd0a1a53a2ab4955 (patch) | |
| tree | d3b5f6554fa02dfa2b2488e634986de4e0c5393b | |
| parent | 9512707c2d88a25e2083e428d622fc13926204f2 (diff) | |
| download | vim-869582f3d4b82582eebd46f1fd0a1a53a2ab4955.tar.gz | |
updated for version 7.2-082v7.2.082
| -rw-r--r-- | src/ex_cmds.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 45d8c81f..cfda9035 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -49,6 +49,7 @@ do_ascii(eap) exarg_T *eap; { int c; + int cval; char buf1[20]; char buf2[20]; char_u buf3[7]; @@ -75,6 +76,10 @@ do_ascii(eap) { if (c == NL) /* NUL is stored as NL */ c = NUL; + if (c == CAR && get_fileformat(curbuf) == EOL_MAC) + cval = NL; /* NL is stored as CR */ + else + cval = c; if (vim_isprintc_strict(c) && (c < ' ' #ifndef EBCDIC || c > '~' @@ -94,7 +99,7 @@ do_ascii(eap) buf2[0] = NUL; vim_snprintf((char *)IObuff, IOSIZE, _("<%s>%s%s %d, Hex %02x, Octal %03o"), - transchar(c), buf1, buf2, c, c, c); + transchar(c), buf1, buf2, cval, cval, cval); #ifdef FEAT_MBYTE if (enc_utf8) c = cc[ci++]; diff --git a/src/version.c b/src/version.c index 8c3020ef..db226cea 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 82, +/**/ 81, /**/ 80, |