From 4c131798b5ab25557bfbc9a8b94c05fcdd195069 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Wed, 31 Jul 2013 16:09:16 +0400 Subject: [PATCH] * frame.c (Fset_frame_height, Fset_frame_width): Mention nil frame in docstring. (Fset_frame_size, Fset_frame_position): Use decode_live_frame and mention nil frame in docstring. --- src/ChangeLog | 3 +++ src/frame.c | 28 ++++++++++++++-------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 0e3e43c0cc..1c4880e335 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -2,6 +2,9 @@ * frame.c (Fmake_terminal_frame): Use store_in_alist to setup frame parameters and call to Fmodify_frame_parameters just once. + (Fset_frame_height, Fset_frame_width): Mention nil frame in docstring. + (Fset_frame_size, Fset_frame_position): Use decode_live_frame + and mention nil frame in docstring. 2013-07-31 Dmitry Antipov diff --git a/src/frame.c b/src/frame.c index 9e156f3f0d..271d99904c 100644 --- a/src/frame.c +++ b/src/frame.c @@ -2403,8 +2403,9 @@ is used. */) DEFUN ("set-frame-height", Fset_frame_height, Sset_frame_height, 2, 3, 0, doc: /* Specify that the frame FRAME has LINES lines. -Optional third arg non-nil means that redisplay should use LINES lines -but that the idea of the actual height of the frame should not be changed. */) +If FRAME is nil, the selected frame is used. Optional third arg +non-nil means that redisplay should use LINES lines but that the +idea of the actual height of the frame should not be changed. */) (Lisp_Object frame, Lisp_Object lines, Lisp_Object pretend) { register struct frame *f = decode_live_frame (frame); @@ -2427,8 +2428,9 @@ but that the idea of the actual height of the frame should not be changed. */) DEFUN ("set-frame-width", Fset_frame_width, Sset_frame_width, 2, 3, 0, doc: /* Specify that the frame FRAME has COLS columns. -Optional third arg non-nil means that redisplay should use COLS columns -but that the idea of the actual width of the frame should not be changed. */) +If FRAME is nil, the selected frame is used. Optional third arg +non-nil means that redisplay should use COLS columns but that the +idea of the actual width of the frame should not be changed. */) (Lisp_Object frame, Lisp_Object cols, Lisp_Object pretend) { register struct frame *f = decode_live_frame (frame); @@ -2450,15 +2452,14 @@ but that the idea of the actual width of the frame should not be changed. */) } DEFUN ("set-frame-size", Fset_frame_size, Sset_frame_size, 3, 3, 0, - doc: /* Sets size of FRAME to COLS by ROWS, measured in characters. */) + doc: /* Sets size of FRAME to COLS by ROWS, measured in characters. +If FRAME is nil, the selected frame is used. */) (Lisp_Object frame, Lisp_Object cols, Lisp_Object rows) { - register struct frame *f; + register struct frame *f = decode_live_frame (frame); - CHECK_LIVE_FRAME (frame); CHECK_TYPE_RANGED_INTEGER (int, cols); CHECK_TYPE_RANGED_INTEGER (int, rows); - f = XFRAME (frame); /* I think this should be done with a hook. */ #ifdef HAVE_WINDOW_SYSTEM @@ -2480,17 +2481,16 @@ DEFUN ("set-frame-size", Fset_frame_size, Sset_frame_size, 3, 3, 0, DEFUN ("set-frame-position", Fset_frame_position, Sset_frame_position, 3, 3, 0, doc: /* Sets position of FRAME in pixels to XOFFSET by YOFFSET. -This is actually the position of the upper left corner of the frame. -Negative values for XOFFSET or YOFFSET are interpreted relative to -the rightmost or bottommost possible position (that stays within the screen). */) +If FRAME is nil, the selected frame is used. XOFFSET and YOFFSET are +actually the position of the upper left corner of the frame. Negative +values for XOFFSET or YOFFSET are interpreted relative to the rightmost +or bottommost possible position (that stays within the screen). */) (Lisp_Object frame, Lisp_Object xoffset, Lisp_Object yoffset) { - register struct frame *f; + register struct frame *f = decode_live_frame (frame); - CHECK_LIVE_FRAME (frame); CHECK_TYPE_RANGED_INTEGER (int, xoffset); CHECK_TYPE_RANGED_INTEGER (int, yoffset); - f = XFRAME (frame); /* I think this should be done with a hook. */ #ifdef HAVE_WINDOW_SYSTEM -- 2.20.1