summaryrefslogtreecommitdiff
path: root/src/ex_cmds.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-01-13 15:58:01 +0000
committerBram Moolenaar <Bram@vim.org>2009-01-13 15:58:01 +0000
commit1418a0d586ed1b429ab9e0408f31e6955758b8c5 (patch)
treed3b5f6554fa02dfa2b2488e634986de4e0c5393b /src/ex_cmds.c
parentc937213e08aed8154afbc0d479d989cd59af681b (diff)
downloadvim-git-1418a0d586ed1b429ab9e0408f31e6955758b8c5.tar.gz
updated for version 7.2-082v7.2.082
Diffstat (limited to 'src/ex_cmds.c')
-rw-r--r--src/ex_cmds.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 45d8c81f1..cfda9035b 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++];