Commit 3545439c authored by Kenichi Handa's avatar Kenichi Handa

(w32_find_ccl_program): Get compiled CCL code by just

calling setup_coding_system.
parent a42f54e6
...@@ -41,6 +41,7 @@ Boston, MA 02111-1307, USA. */ ...@@ -41,6 +41,7 @@ Boston, MA 02111-1307, USA. */
#include "w32heap.h" #include "w32heap.h"
#include "termhooks.h" #include "termhooks.h"
#include "coding.h" #include "coding.h"
#include "ccl.h"
#include <commdlg.h> #include <commdlg.h>
#include <shellapi.h> #include <shellapi.h>
...@@ -6197,10 +6198,7 @@ void ...@@ -6197,10 +6198,7 @@ void
w32_find_ccl_program (fontp) w32_find_ccl_program (fontp)
struct font_info *fontp; struct font_info *fontp;
{ {
extern Lisp_Object Vfont_ccl_encoder_alist, Vccl_program_table; Lisp_Object list, elt;
extern Lisp_Object Qccl_program_idx;
extern Lisp_Object resolve_symbol_ccl_program ();
Lisp_Object list, elt, ccl_prog, ccl_id;
for (list = Vfont_ccl_encoder_alist; CONSP (list); list = XCONS (list)->cdr) for (list = Vfont_ccl_encoder_alist; CONSP (list); list = XCONS (list)->cdr)
{ {
...@@ -6209,26 +6207,16 @@ w32_find_ccl_program (fontp) ...@@ -6209,26 +6207,16 @@ w32_find_ccl_program (fontp)
&& STRINGP (XCONS (elt)->car) && STRINGP (XCONS (elt)->car)
&& (fast_c_string_match_ignore_case (XCONS (elt)->car, fontp->name) && (fast_c_string_match_ignore_case (XCONS (elt)->car, fontp->name)
>= 0)) >= 0))
{ break;
if (SYMBOLP (XCONS (elt)->cdr) && }
(!NILP (ccl_id = Fget (XCONS (elt)->cdr, Qccl_program_idx)))) if (! NILP (list))
{ {
ccl_prog = XVECTOR (Vccl_program_table)->contents[XUINT (ccl_id)]; struct ccl_program *ccl = xmalloc (sizeof (struct ccl_program));
if (!CONSP (ccl_prog)) continue;
ccl_prog = XCONS (ccl_prog)->cdr; if (setup_ccl_program (ccl, XCONS (elt)->cdr) < 0)
} xfree (ccl);
else else
{ fontp->font_encoder = ccl;
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;
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment