(fontset_pattern_regexp): Escape `+' characters in pattern.

diff --git a/src/ChangeLog b/src/ChangeLog
index f3a7ec0468e8ef83d5a6ae52af4176ed94a6d3b9..cdc4439043451e130e30fb8ac765a7a4416edc4b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-15  Naohiro Aota  <nao.aota@gmail.com>  (tiny change)
+
+       * fontset.c (fontset_pattern_regexp): Escape `+' characters in
+       pattern.
+
 2008-06-15  Andreas Schwab  <schwab@suse.de>
 
        * font.c (font_update_drivers): Fix crash when no drivers match.

diff --git a/src/fontset.c b/src/fontset.c
index a488e9c4a1da2970ce7f9ebdce7a5881f226664d..9878569e7b7c9cdb665b20941cebe9cb9bed5fa5 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1005,7 +1005,7 @@ fontset_pattern_regexp (pattern)
     {
       /* We must at first update the cached data.  */
       unsigned char *regex, *p0, *p1;
-      int ndashes = 0, nstars = 0;
+      int ndashes = 0, nstars = 0, nplus = 0;
 
       for (p0 = SDATA (pattern); *p0; p0++)
        {
@@ -1013,15 +1013,17 @@ fontset_pattern_regexp (pattern)
            ndashes++;
          else if (*p0 == '*')
            nstars++;
+         else if (*p0 == '+')
+           nplus++;
        }
 
       /* If PATTERN is not full XLFD we conert "*" to ".*".  Otherwise
         we convert "*" to "[^-]*" which is much faster in regular
         expression matching.  */
       if (ndashes < 14)
-       p1 = regex = (unsigned char *) alloca (SBYTES (pattern) + 2 * nstars + 1);
+       p1 = regex = (unsigned char *) alloca (SBYTES (pattern) + 2 * nstars + 2 * nplus + 1);
       else
-       p1 = regex = (unsigned char *) alloca (SBYTES (pattern) + 5 * nstars + 1);
+       p1 = regex = (unsigned char *) alloca (SBYTES (pattern) + 5 * nstars + 2 * nplus + 1);
 
       *p1++ = '^';
       for (p0 = SDATA (pattern); *p0; p0++)
@@ -1036,6 +1038,8 @@ fontset_pattern_regexp (pattern)
            }
          else if (*p0 == '?')
            *p1++ = '.';
+         else if (*p0 == '+')
+           *p1++ = '\\', *p1++ = '+';
          else
            *p1++ = *p0;
        }