[Emacs-diffs] Changes to emacs/src/fontset.c

[Kim F . Storm]

Index: emacs/src/fontset.c
diff -c emacs/src/fontset.c:1.90 emacs/src/fontset.c:1.91
*** emacs/src/fontset.c:1.90    Thu Nov  4 02:26:43 2004
--- emacs/src/fontset.c Thu Nov  4 23:12:33 2004
***************
*** 789,797 ****
        || strcmp (SDATA (pattern), CACHED_FONTSET_NAME))
      {
        /* We must at first update the cached data.  */
!       char *regex, *p0, *p1;
        int ndashes = 0, nstars = 0;
!       
        for (p0 = SDATA (pattern); *p0; p0++)
        {
          if (*p0 == '-')
--- 789,797 ----
        || strcmp (SDATA (pattern), CACHED_FONTSET_NAME))
      {
        /* We must at first update the cached data.  */
!       unsigned char *regex, *p0, *p1;
        int ndashes = 0, nstars = 0;
! 
        for (p0 = SDATA (pattern); *p0; p0++)
        {
          if (*p0 == '-')
***************
*** 804,815 ****
         we convert "*" to "[^-]*" which is much faster in regular
         expression matching.  */
        if (ndashes < 14)
!       p1 = regex = (char *) alloca (SBYTES (pattern) + 2 * nstars + 1);
        else
!       p1 = regex = (char *) alloca (SBYTES (pattern) + 5 * nstars + 1);
  
        *p1++ = '^';
!       for (p0 = (char *) SDATA (pattern); *p0; p0++)
        {
          if (*p0 == '*' && p0 > SDATA (pattern) && p0[-1] != '\\')
            {
--- 804,815 ----
         we convert "*" to "[^-]*" which is much faster in regular
         expression matching.  */
        if (ndashes < 14)
!       p1 = regex = (unsigned char *) alloca (SBYTES (pattern) + 2 * nstars + 
1);
        else
!       p1 = regex = (unsigned char *) alloca (SBYTES (pattern) + 5 * nstars + 
1);
  
        *p1++ = '^';
!       for (p0 = SDATA (pattern); *p0; p0++)
        {
          if (*p0 == '*' && p0 > SDATA (pattern) && p0[-1] != '\\')
            {