[Emacs-diffs] Changes to emacs/src/fontset.c [emacs-unicode-2]

[Kenichi Handa]

Index: emacs/src/fontset.c
diff -c emacs/src/fontset.c:1.77.4.1 emacs/src/fontset.c:1.77.4.2
*** emacs/src/fontset.c:1.77.4.1        Mon Sep  8 08:48:11 2003
--- emacs/src/fontset.c Mon Oct  6 07:22:42 2003
***************
*** 460,468 ****
  {
    char *font_name;
    struct font_info *font_info;
  
    font_name = choose_face_font (f, face->lface, AREF (font_def, 0), NULL);
!   if (! (font_info = fs_load_font (f, font_name, XINT (AREF (font_def, 1)))))
      return -1;
  
    if (NILP (AREF (font_def, 2))
--- 460,473 ----
  {
    char *font_name;
    struct font_info *font_info;
+   int charset;
  
    font_name = choose_face_font (f, face->lface, AREF (font_def, 0), NULL);
!   if (NATNUMP (AREF (font_def, 1)))
!     charset = XINT (AREF (font_def, 1));
!   else
!     charset = -1;
!   if (! (font_info = fs_load_font (f, font_name, charset)))
      return -1;
  
    if (NILP (AREF (font_def, 2))