78 lines
2.1 KiB
Plaintext
78 lines
2.1 KiB
Plaintext
To: vim-dev@vim.org
|
|
Subject: Patch 7.2.082
|
|
Fcc: outbox
|
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
Mime-Version: 1.0
|
|
Content-Type: text/plain; charset=ISO-8859-1
|
|
Content-Transfer-Encoding: 8bit
|
|
------------
|
|
|
|
Patch 7.2.082
|
|
Problem: When 'ff' is "mac" then "ga" on a ^J shows 0x0d instead of 0x0a.
|
|
(Andy Wokula)
|
|
Solution: Use NL for this situation. (Lech Lorens)
|
|
Files: src/ex_cmds.c
|
|
|
|
|
|
*** ../vim-7.2.081/src/ex_cmds.c Fri Nov 28 21:26:50 2008
|
|
--- src/ex_cmds.c Tue Jan 13 16:51:32 2009
|
|
***************
|
|
*** 49,54 ****
|
|
--- 49,55 ----
|
|
exarg_T *eap;
|
|
{
|
|
int c;
|
|
+ int cval;
|
|
char buf1[20];
|
|
char buf2[20];
|
|
char_u buf3[7];
|
|
***************
|
|
*** 75,80 ****
|
|
--- 76,85 ----
|
|
{
|
|
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,100 ****
|
|
buf2[0] = NUL;
|
|
vim_snprintf((char *)IObuff, IOSIZE,
|
|
_("<%s>%s%s %d, Hex %02x, Octal %03o"),
|
|
! transchar(c), buf1, buf2, c, c, c);
|
|
#ifdef FEAT_MBYTE
|
|
if (enc_utf8)
|
|
c = cc[ci++];
|
|
--- 99,105 ----
|
|
buf2[0] = NUL;
|
|
vim_snprintf((char *)IObuff, IOSIZE,
|
|
_("<%s>%s%s %d, Hex %02x, Octal %03o"),
|
|
! transchar(c), buf1, buf2, cval, cval, cval);
|
|
#ifdef FEAT_MBYTE
|
|
if (enc_utf8)
|
|
c = cc[ci++];
|
|
*** ../vim-7.2.081/src/version.c Tue Jan 13 16:37:31 2009
|
|
--- src/version.c Tue Jan 13 16:53:39 2009
|
|
***************
|
|
*** 678,679 ****
|
|
--- 678,681 ----
|
|
{ /* Add new patch number below this line */
|
|
+ /**/
|
|
+ 82,
|
|
/**/
|
|
|
|
--
|
|
The budget process was invented by an alien race of sadistic beings who
|
|
resemble large cats.
|
|
(Scott Adams - The Dilbert principle)
|
|
|
|
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|