Mercurial > emacs

diff src/xfaces.c @ 112434:9de5a68b57e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
author Paul Eggert <eggert@cs.ucla.edu>
date Sat, 22 Jan 2011 18:56:06 -0800
parents 42e22c4f06b7
children
line wrap: on
line diff
--- a/src/xfaces.c	Sat Jan 22 17:09:09 2011 -0800
+++ b/src/xfaces.c	Sat Jan 22 18:56:06 2011 -0800
@@ -3612,7 +3612,7 @@
 #if defined HAVE_X_I18N
 	      char *fontsetname = xic_create_fontsetname (SDATA (xlfd), motif);
 #else
-	      char *fontsetname = (char *) SDATA (xlfd);
+	      char *fontsetname = SSDATA (xlfd);
 #endif
 	      sprintf (line, "%s.pane.menubar*font%s: %s",
 		       myname, suffix, fontsetname);
@@ -3621,7 +3621,7 @@
 		       myname, popup_path, suffix, fontsetname);
 	      XrmPutLineResource (&rdb, line);
 	      changed_p = 1;
-	      if (fontsetname != (char *) SDATA (xlfd))
+	      if (fontsetname != SSDATA (xlfd))
 		xfree (fontsetname);
 	    }
 	}
@@ -6763,4 +6763,3 @@
   defsubr (&Sx_family_fonts);
 #endif
 }
-