To: vim-dev@vim.org
Subject: Patch 6.0.248
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 6.0.248
Problem:    When using compressed help files and 'encoding' isn't "latin1",
	    Vim converts the help file before decompressing. (David Reviejo)
Solution:   Don't convert a help file when 'binary' is set.
Files:	    src/fileio.c


*** ../vim60.247/src/fileio.c	Mon Feb 18 13:52:08 2002
--- src/fileio.c	Thu Feb 21 17:24:02 2002
***************
*** 682,695 ****
  	fenc = enc_canonize(eap->cmd + eap->force_enc);
  	fenc_alloced = TRUE;
      }
!     else if (curbuf->b_help)
      {
! 	fenc = (char_u *)"latin1";	/* help files are latin1 */
  	fenc_alloced = FALSE;
      }
!     else if (curbuf->b_p_bin)
      {
! 	fenc = (char_u *)"";		/* binary: don't convert */
  	fenc_alloced = FALSE;
      }
      else if (*p_fencs == NUL)
--- 686,699 ----
  	fenc = enc_canonize(eap->cmd + eap->force_enc);
  	fenc_alloced = TRUE;
      }
!     else if (curbuf->b_p_bin)
      {
! 	fenc = (char_u *)"";		/* binary: don't convert */
  	fenc_alloced = FALSE;
      }
!     else if (curbuf->b_help)
      {
! 	fenc = (char_u *)"latin1";	/* help files are latin1 */
  	fenc_alloced = FALSE;
      }
      else if (*p_fencs == NUL)
*** ../vim60.247/src/version.c	Thu Feb 21 17:14:51 2002
--- src/version.c	Thu Feb 21 17:26:09 2002
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     248,
  /**/

-- 
I recommend ordering large cargo containers of paper towels to make up
whatever budget underruns you have.  Paper products are always useful and they
have the advantage of being completely flushable if you need to make room in
the storage area later.
				(Scott Adams - The Dilbert principle)

 ///  Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net  \\\
///   Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim   \\\
\\\           Project leader for A-A-P -- http://www.a-a-p.org           ///
 \\\  Help me helping AIDS orphans in Uganda - http://iccf-holland.org  ///