Commit c0951e53 authored by Paul Eggert's avatar Paul Eggert
Browse files

* xfns.c (Fx_file_dialog, Fx_select_font): Fix pointer signedness.

parent 6b437900
......@@ -2,6 +2,7 @@
 
* xfns.c (x_decode_color, x_set_name, x_window): Now static.
(Fx_create_frame): Add braces to silence GCC warning.
(Fx_file_dialog, Fx_select_font): Fix pointer signedness.
 
2011-03-09 Paul Eggert <eggert@cs.ucla.edu>
 
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment