[Emacs-diffs] Changes to emacs/src/xfaces.c

[Stefan Monnier]

Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.314 emacs/src/xfaces.c:1.315
*** emacs/src/xfaces.c:1.314    Fri Feb 18 22:55:53 2005
--- emacs/src/xfaces.c  Thu Mar 17 18:43:47 2005
***************
*** 4695,4705 ****
  #else
          const char *suffix = "";
  #endif
          sprintf (line, "%s.pane.menubar*font%s: %s",
!                  myname, suffix, face->font_name);
          XrmPutLineResource (&rdb, line);
          sprintf (line, "%s.%s*font%s: %s",
!                  myname, popup_path, suffix, face->font_name);
          XrmPutLineResource (&rdb, line);
          changed_p = 1;
        }
--- 4695,4712 ----
  #else
          const char *suffix = "";
  #endif
+ #if defined HAVE_X_I18N && defined USE_MOTIF
+         extern char *xic_create_fontsetname
+           P_ ((char *base_fontname, Bool motif));
+         char *fontsetname = xic_create_fontsetname (face->font_name, True);
+ #else
+         char *fontsetname = face->font_name;
+ #endif
          sprintf (line, "%s.pane.menubar*font%s: %s",
!                  myname, suffix, fontsetname);
          XrmPutLineResource (&rdb, line);
          sprintf (line, "%s.%s*font%s: %s",
!                  myname, popup_path, suffix, fontsetname);
          XrmPutLineResource (&rdb, line);
          changed_p = 1;
        }
***************
*** 7765,7771 ****
  {
    fprintf (stderr, "ID: %d\n", face->id);
  #ifdef HAVE_X_WINDOWS
!   fprintf (stderr, "gc: %d\n", (int) face->gc);
  #endif
    fprintf (stderr, "foreground: 0x%lx (%s)\n",
           face->foreground,
--- 7772,7778 ----
  {
    fprintf (stderr, "ID: %d\n", face->id);
  #ifdef HAVE_X_WINDOWS
!   fprintf (stderr, "gc: %ld\n", (long) face->gc);
  #endif
    fprintf (stderr, "foreground: 0x%lx (%s)\n",
           face->foreground,