mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-08 04:30:45 -08:00
Code Issues Projects Releases Wiki Activity

(x_find_ccl_program): Get compiled CCL code by just

Browse source 
calling setup_coding_system.
This commit is contained in:
Kenichi Handa 1999-07-26 11:57:35 +00:00
parent ef4ced281f
commit a42f54e697
1 changed files with 11 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/xterm.c
View file

@ -12077,10 +12077,7 @@ void
x_find_ccl_program (fontp)
struct font_info *fontp;
{
extern Lisp_Object Vfont_ccl_encoder_alist, Vccl_program_table;
extern Lisp_Object Qccl_program_idx;
extern Lisp_Object resolve_symbol_ccl_program ();
Lisp_Object list, elt, ccl_prog, ccl_id;
Lisp_Object list, elt;
for (list = Vfont_ccl_encoder_alist; CONSP (list); list = XCONS (list)->cdr)
{
@ -12089,26 +12086,16 @@ x_find_ccl_program (fontp)
&& STRINGP (XCONS (elt)->car)
&& (fast_c_string_match_ignore_case (XCONS (elt)->car, fontp->name)
>= 0))
{
if (SYMBOLP (XCONS (elt)->cdr) &&
(!NILP (ccl_id = Fget (XCONS (elt)->cdr, Qccl_program_idx))))
{
ccl_prog = XVECTOR (Vccl_program_table)->contents[XUINT (ccl_id)];
if (!CONSP (ccl_prog)) continue;
ccl_prog = XCONS (ccl_prog)->cdr;
}
else
{
ccl_prog = XCONS (elt)->cdr;
if (!VECTORP (ccl_prog)) continue;
}
fontp->font_encoder
= (struct ccl_program *) xmalloc (sizeof (struct ccl_program));
setup_ccl_program (fontp->font_encoder,
resolve_symbol_ccl_program (ccl_prog));
break;
}
break;
}
if (! NILP (list))
{
struct ccl_program *ccl = xmalloc (sizeof (struct ccl_program));
if (setup_ccl_program (ccl, XCONS (elt)->cdr) < 0)
xfree (ccl);
else
fontp->font_encoder = ccl;
}
}