Mercurial > emacs
comparison src/fontset.c @ 83292:ad07ff6e4555
Merged from miles@gnu.org--gnu-2005 (patch 67, 270-278)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-270
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-271
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-272
src/xdisp.c (dump_glyph_row): Don't display overlay_arrow_p field.
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-273
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-274
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-275
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-276
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-277
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-278
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-67
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-332
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 25 Apr 2005 11:49:38 +0000 |
parents | 48ba3f89c89f e3221787f899 |
children | 2d137ca54960 |
comparison
equal
deleted
inserted
replaced
83291:bbf359ec4a59 | 83292:ad07ff6e4555 |
---|---|
352 code[2] = 0; /* anchor */ | 352 code[2] = 0; /* anchor */ |
353 elt = &XCHAR_TABLE (fontset)->contents[charset + 128]; | 353 elt = &XCHAR_TABLE (fontset)->contents[charset + 128]; |
354 for (i = 0; code[i] > 0; i++) | 354 for (i = 0; code[i] > 0; i++) |
355 { | 355 { |
356 if (!SUB_CHAR_TABLE_P (*elt)) | 356 if (!SUB_CHAR_TABLE_P (*elt)) |
357 *elt = make_sub_char_table (*elt); | 357 { |
358 Lisp_Object val = *elt; | |
359 *elt = make_sub_char_table (val); | |
360 XCHAR_TABLE (*elt)->defalt = val; | |
361 } | |
358 elt = &XCHAR_TABLE (*elt)->contents[code[i]]; | 362 elt = &XCHAR_TABLE (*elt)->contents[code[i]]; |
359 } | 363 } |
360 if (SUB_CHAR_TABLE_P (*elt)) | 364 if (SUB_CHAR_TABLE_P (*elt)) |
361 XCHAR_TABLE (*elt)->defalt = newelt; | 365 XCHAR_TABLE (*elt)->defalt = newelt; |
362 else | 366 else |