lkundrak / rpms / vim

Forked from rpms/vim 4 years ago
Clone
aa63acd
To: vim-dev@vim.org
aa63acd
Subject: patch 7.1.079
aa63acd
Fcc: outbox
aa63acd
From: Bram Moolenaar <Bram@moolenaar.net>
aa63acd
Mime-Version: 1.0
aa63acd
Content-Type: text/plain; charset=ISO-8859-1
aa63acd
Content-Transfer-Encoding: 8bit
aa63acd
------------
aa63acd
aa63acd
Patch 7.1.079
aa63acd
Problem:    When the locale is "C" and 'encoding' is "latin1" then the "@"
aa63acd
	    character in 'isfname', 'isprint', etc. doesn't pick up accented
aa63acd
	    characters.
aa63acd
Solution:   Instead of isalpha() use MB_ISLOWER() and MB_ISUPPER().
aa63acd
Files:	    src/charset.c, src/macros.h
aa63acd
aa63acd
aa63acd
*** ../vim-7.1.078/src/charset.c	Mon Aug  6 22:27:12 2007
aa63acd
--- src/charset.c	Tue Aug 14 13:43:30 2007
aa63acd
***************
aa63acd
*** 207,213 ****
aa63acd
  	    }
aa63acd
  	    while (c <= c2)
aa63acd
  	    {
aa63acd
! 		if (!do_isalpha || isalpha(c)
aa63acd
  #ifdef FEAT_FKMAP
aa63acd
  			|| (p_altkeymap && (F_isalpha(c) || F_isdigit(c)))
aa63acd
  #endif
aa63acd
--- 207,216 ----
aa63acd
  	    }
aa63acd
  	    while (c <= c2)
aa63acd
  	    {
aa63acd
! 		/* Use the MB_ functions here, because isalpha() doesn't
aa63acd
! 		 * work properly when 'encoding' is "latin1" and the locale is
aa63acd
! 		 * "C".  */
aa63acd
! 		if (!do_isalpha || MB_ISLOWER(c) || MB_ISUPPER(c)
aa63acd
  #ifdef FEAT_FKMAP
aa63acd
  			|| (p_altkeymap && (F_isalpha(c) || F_isdigit(c)))
aa63acd
  #endif
aa63acd
*** ../vim-7.1.078/src/macros.h	Thu May 10 19:21:00 2007
aa63acd
--- src/macros.h	Sat Aug  4 13:44:18 2007
aa63acd
***************
aa63acd
*** 54,63 ****
aa63acd
  
aa63acd
  /*
aa63acd
   * toupper() and tolower() that use the current locale.
aa63acd
!  * On some systems toupper()/tolower() only work on lower/uppercase characters
aa63acd
   * Careful: Only call TOUPPER_LOC() and TOLOWER_LOC() with a character in the
aa63acd
   * range 0 - 255.  toupper()/tolower() on some systems can't handle others.
aa63acd
!  * Note: for UTF-8 use utf_toupper() and utf_tolower().
aa63acd
   */
aa63acd
  #ifdef MSWIN
aa63acd
  #  define TOUPPER_LOC(c)	toupper_tab[(c) & 255]
aa63acd
--- 54,65 ----
aa63acd
  
aa63acd
  /*
aa63acd
   * toupper() and tolower() that use the current locale.
aa63acd
!  * On some systems toupper()/tolower() only work on lower/uppercase
aa63acd
!  * characters, first use islower() or isupper() then.
aa63acd
   * Careful: Only call TOUPPER_LOC() and TOLOWER_LOC() with a character in the
aa63acd
   * range 0 - 255.  toupper()/tolower() on some systems can't handle others.
aa63acd
!  * Note: It is often better to use MB_TOLOWER() and MB_TOUPPER(), because many
aa63acd
!  * toupper() and tolower() implementations only work for ASCII.
aa63acd
   */
aa63acd
  #ifdef MSWIN
aa63acd
  #  define TOUPPER_LOC(c)	toupper_tab[(c) & 255]
aa63acd
*** ../vim-7.1.078/src/version.c	Wed Aug 15 20:07:53 2007
aa63acd
--- src/version.c	Wed Aug 15 20:39:18 2007
aa63acd
***************
aa63acd
*** 668,669 ****
aa63acd
--- 668,671 ----
aa63acd
  {   /* Add new patch number below this line */
aa63acd
+ /**/
aa63acd
+     79,
aa63acd
  /**/
aa63acd
aa63acd
-- 
aa63acd
You're as much use as a condom machine at the Vatican.
aa63acd
                  -- Rimmer to Holly in Red Dwarf 'Queeg'
aa63acd
aa63acd
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
aa63acd
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
aa63acd
\\\        download, build and distribute -- http://www.A-A-P.org        ///
aa63acd
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///