Mercurial > emacs
diff src/xfont.c @ 112434:9de5a68b57e1
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 | ef719132ddfa |
children |
line wrap: on
line diff
--- a/src/xfont.c Sat Jan 22 17:09:09 2011 -0800 +++ b/src/xfont.c Sat Jan 22 18:56:06 2011 -0800 @@ -362,7 +362,7 @@ script = Qnil; } } - + BLOCK_INPUT; x_catch_errors (display); @@ -540,7 +540,7 @@ if (STRINGP (XCAR (alter)) && ((r - name) + SBYTES (XCAR (alter))) < 256) { - strcpy (r, (char *) SDATA (XCAR (alter))); + strcpy (r, SSDATA (XCAR (alter))); list = xfont_list_pattern (display, name, registry, script); if (! NILP (list)) break; @@ -797,7 +797,7 @@ ASET (font_object, FONT_TYPE_INDEX, Qx); if (STRINGP (fullname)) { - font_parse_xlfd ((char *) SDATA (fullname), font_object); + font_parse_xlfd (SSDATA (fullname), font_object); ASET (font_object, FONT_NAME_INDEX, fullname); } else @@ -1113,4 +1113,3 @@ xfont_driver.type = Qx; register_font_driver (&xfont_driver, NULL); } -