(fontset_pattern_regexp): If '*' is preceded by '\',

treat it as a literal character.

diff --git a/src/ChangeLog b/src/ChangeLog
index 201bbcba66159698f0ffe93edd0d0c94bb9bc3c1..01d35ba8e9bfb9aa03955d74b86d3d5a4d8f9590 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-04  Kenichi Handa  <handa@m17n.org>
+
+       * fontset.c (fontset_pattern_regexp): If '*' is preceded by '\',
+       treat it as a literal character.
+
 2004-11-03  Kim F. Storm  <storm@cua.dk>
 
        * .gdbinit (ppt): New function.

diff --git a/src/fontset.c b/src/fontset.c
index bccbce8bf45f96acecb15816753a18f2201ca2e8..fc4da1305f3ae2e70c7f0be9c1bf0bd5a593aa27 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -796,7 +796,7 @@ fontset_pattern_regexp (pattern)
        {
          if (*p0 == '-')
            ndashes++;
-         else if (*p0 == '*')
+         else if (*p0 == '*' && p0 > SDATA (pattern) && p0[-1] != '\\')
            nstars++;
        }
 
@@ -811,7 +811,7 @@ fontset_pattern_regexp (pattern)
       *p1++ = '^';
       for (p0 = (char *) SDATA (pattern); *p0; p0++)
        {
-         if (*p0 == '*')
+         if (*p0 == '*' && p0 > SDATA (pattern) && p0[-1] != '\\')
            {
              if (ndashes < 14)
                *p1++ = '.';