From 5890e400062253b59ab815b68c54463a6d505971 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Wed, 7 Nov 2012 09:23:20 +0400 Subject: [PATCH] * xfns.c (Fx_wm_set_size_hint): Use check_x_frame. Adjust docstring. --- src/ChangeLog | 4 ++++ src/xfns.c | 12 +++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 37907cd555a..e5c6dd6285d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-11-07 Dmitry Antipov + + * xfns.c (Fx_wm_set_size_hint): Use check_x_frame. Adjust docstring. + 2012-11-06 Paul Eggert Restore some duplicate definitions (Bug#12814). diff --git a/src/xfns.c b/src/xfns.c index 9c99902b93d..82e218479c8 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -2996,16 +2996,14 @@ x_default_font_parameter (struct frame *f, Lisp_Object parms) DEFUN ("x-wm-set-size-hint", Fx_wm_set_size_hint, Sx_wm_set_size_hint, 0, 1, 0, doc: /* Send the size hints for frame FRAME to the window manager. -If FRAME is nil, use the selected frame. */) +If FRAME is omitted or nil, use the selected frame. +Signal error if FRAME is not an X frame. */) (Lisp_Object frame) { - struct frame *f; - if (NILP (frame)) - frame = selected_frame; - f = XFRAME (frame); + struct frame *f = check_x_frame (frame); + block_input (); - if (FRAME_X_P (f)) - x_wm_set_size_hint (f, 0, 0); + x_wm_set_size_hint (f, 0, 0); unblock_input (); return Qnil; } -- 2.39.5