updated for version 7.2-082

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 45d8c81f17215b76f8d72621bd06adb6b1a7a7a9..cfda9035b7da78c78fa54fad0de4a70472b5345d 100644 (file)
--- 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 8c3020ef8fa6978665acd48af22dd9aeec115058..db226cea2e7654bdb194d29cd2cdef945f10bd7e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    82,
 /**/
     81,
 /**/