Mercurial > hg > xemacs-beta
changeset 3154:f94f72c6ceb0
[xemacs-hg @ 2005-12-20 22:01:50 by aidan]
The Xft merge broke the server-side X11 charset font cache.
| author | aidan |
|---|---|
| date | Tue, 20 Dec 2005 22:01:52 +0000 |
| parents | 962f429ac715 |
| children | fe5d7f5ea988 |
| files | src/ChangeLog src/objects-x.c |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Dec 19 22:51:17 2005 +0000 +++ b/src/ChangeLog Tue Dec 20 22:01:52 2005 +0000 @@ -1,3 +1,10 @@ +2005-12-20 Aidan Kehoe <kehoea@parhasard.net> + + * objects-x.c (x_find_charset_font): + Return Qnil on no match, not Qunbound. Fixes performance issues + based on the use of this return value in + objects.c:font_instantiate + 2005-12-18 Aidan Kehoe <kehoea@parhasard.net> * syntax.c (charset_syntax):
--- a/src/objects-x.c Mon Dec 19 22:51:17 2005 +0000 +++ b/src/objects-x.c Tue Dec 20 22:01:52 2005 +0000 @@ -1175,7 +1175,7 @@ Extbyte **names; int count = 0; const Extbyte *patternext; - Lisp_Object result = Qunbound; + Lisp_Object result = Qnil; int i; /* #### with Xft need to handle second stage here -- sjt