diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-22 18:56:06 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-22 18:56:06 -0800 |
| commit | 51b59d794fe1d4a82fcd842b478657cc93f91595 (patch) | |
| tree | 25e57573403a13f3fe70934b40bf38c0190fd5ed /src/xfont.c | |
| parent | 9e928ac989c824c376b1ab576a6da69cd86b12c6 (diff) | |
| download | emacs-51b59d794fe1d4a82fcd842b478657cc93f91595.tar.gz | |
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
Diffstat (limited to 'src/xfont.c')
| -rw-r--r-- | src/xfont.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/xfont.c b/src/xfont.c index a3de5988093..8326d357ca9 100644 --- a/src/xfont.c +++ b/src/xfont.c @@ -362,7 +362,7 @@ xfont_list_pattern (Display *display, const char *pattern, script = Qnil; } } - + BLOCK_INPUT; x_catch_errors (display); @@ -540,7 +540,7 @@ xfont_list (Lisp_Object frame, Lisp_Object spec) 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 @@ xfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size) 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 @@ syms_of_xfont (void) xfont_driver.type = Qx; register_font_driver (&xfont_driver, NULL); } - |