summaryrefslogtreecommitdiff
path: root/src/xfns.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-03-09 17:03:29 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-03-09 17:03:29 -0800
commitc0951e534c34cb4400bf9dcb18ae40b31a684bae (patch)
tree9795a1c34b7038963ae4619dc2ceba946fd6208f /src/xfns.c
parent6b43790020907a8199984a44f5624f842edea754 (diff)
downloademacs-c0951e534c34cb4400bf9dcb18ae40b31a684bae.tar.gz
* xfns.c (Fx_file_dialog, Fx_select_font): Fix pointer signedness.
Diffstat (limited to 'src/xfns.c')
-rw-r--r--src/xfns.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xfns.c b/src/xfns.c
index 8ba91f9ffb8..45e0e13dcbc 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5566,11 +5566,11 @@ Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories. */)
BLOCK_INPUT;
if (STRINGP (default_filename))
- cdef_file = SDATA (default_filename);
+ cdef_file = SSDATA (default_filename);
else
- cdef_file = SDATA (dir);
+ cdef_file = SSDATA (dir);
- fn = xg_get_file_name (f, SDATA (prompt), cdef_file,
+ fn = xg_get_file_name (f, SSDATA (prompt), cdef_file,
! NILP (mustmatch),
! NILP (only_dir_p));
@@ -5626,12 +5626,12 @@ If FRAME is omitted or nil, it defaults to the selected frame. */)
XSETFONT (font, FRAME_FONT (f));
font_param = Ffont_get (font, intern (":name"));
if (STRINGP (font_param))
- default_name = xstrdup (SDATA (font_param));
+ default_name = xstrdup (SSDATA (font_param));
else
{
font_param = Fframe_parameter (frame, Qfont_param);
if (STRINGP (font_param))
- default_name = xstrdup (SDATA (font_param));
+ default_name = xstrdup (SSDATA (font_param));
}
if (default_name == NULL && x_last_font_name != NULL)