[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.25 emacs/src/fontset.c:1.77.4.26
*** emacs/src/fontset.c:1.77.4.25       Fri Nov 12 02:52:55 2004
--- emacs/src/fontset.c Wed Dec  8 23:42:20 2004
***************
*** 1410,1416 ****
       Lisp_Object name, target, font_spec, frame, add;
  {
    Lisp_Object fontset;
!   Lisp_Object font_def, registry;
    Lisp_Object encoding, repertory;
    Lisp_Object range_list;
    struct charset *charset = NULL;
--- 1410,1416 ----
       Lisp_Object name, target, font_spec, frame, add;
  {
    Lisp_Object fontset;
!   Lisp_Object font_def, registry, family;
    Lisp_Object encoding, repertory;
    Lisp_Object range_list;
    struct charset *charset = NULL;
***************
*** 1449,1456 ****
      }
    else if (CONSP (font_spec))
      {
-       Lisp_Object family;
- 
        family = XCAR (font_spec);
        registry = XCDR (font_spec);
  
--- 1449,1454 ----
***************
*** 1474,1480 ****
    if (STRINGP (font_spec))
      encoding = find_font_encoding (font_spec);
    else
!     encoding = find_font_encoding (registry);
    if (SYMBOLP (encoding))
      {
        CHECK_CHARSET (encoding);
--- 1472,1478 ----
    if (STRINGP (font_spec))
      encoding = find_font_encoding (font_spec);
    else
!     encoding = find_font_encoding (concat2 (family, registry));
    if (SYMBOLP (encoding))
      {
        CHECK_CHARSET (encoding);