[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/fontset.c,v
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] Changes to emacs/src/fontset.c,v |
Date: |
Tue, 17 Jun 2008 01:25:11 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kenichi Handa <handa> 08/06/17 01:25:11
Index: fontset.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fontset.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- fontset.c 15 Jun 2008 12:23:27 -0000 1.133
+++ fontset.c 17 Jun 2008 01:25:11 -0000 1.134
@@ -1005,7 +1005,7 @@
{
/* We must at first update the cached data. */
unsigned char *regex, *p0, *p1;
- int ndashes = 0, nstars = 0, nplus = 0;
+ int ndashes = 0, nstars = 0, nescs = 0;
for (p0 = SDATA (pattern); *p0; p0++)
{
@@ -1013,17 +1013,20 @@
ndashes++;
else if (*p0 == '*')
nstars++;
- else if (*p0 == '+')
- nplus++;
+ else if (*p0 == '['
+ || *p0 == '.' || *p0 == '\\'
+ || *p0 == '+' || *p0 == '^'
+ || *p0 == '$')
+ nescs++;
}
/* 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 +
2 * nplus + 1);
+ p1 = regex = (unsigned char *) alloca (SBYTES (pattern) + 2 * nstars +
2 * nescs + 1);
else
- p1 = regex = (unsigned char *) alloca (SBYTES (pattern) + 5 * nstars +
2 * nplus + 1);
+ p1 = regex = (unsigned char *) alloca (SBYTES (pattern) + 5 * nstars +
2 * nescs + 1);
*p1++ = '^';
for (p0 = SDATA (pattern); *p0; p0++)
@@ -1038,8 +1041,11 @@
}
else if (*p0 == '?')
*p1++ = '.';
- else if (*p0 == '+')
- *p1++ = '\\', *p1++ = '+';
+ else if (*p0 == '['
+ || *p0 == '.' || *p0 == '\\'
+ || *p0 == '+' || *p0 == '^'
+ || *p0 == '$')
+ *p1++ = '\\', *p1++ = *p0;
else
*p1++ = *p0;
}
- [Emacs-diffs] Changes to emacs/src/fontset.c,v, Miles Bader, 2008/06/01
- [Emacs-diffs] Changes to emacs/src/fontset.c,v, Kenichi Handa, 2008/06/05
- [Emacs-diffs] Changes to emacs/src/fontset.c,v, Andreas Schwab, 2008/06/08
- [Emacs-diffs] Changes to emacs/src/fontset.c,v, Kenichi Handa, 2008/06/15
- [Emacs-diffs] Changes to emacs/src/fontset.c,v,
Kenichi Handa <=
- [Emacs-diffs] Changes to emacs/src/fontset.c,v, Kenichi Handa, 2008/06/20
- [Emacs-diffs] Changes to emacs/src/fontset.c,v, Kenichi Handa, 2008/06/29