From ddadbc0e71e7b1be4e79447a7c134b0762d104eb Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 6 Jul 2012 21:34:39 +0200 Subject: [PATCH] Fixes: debbugs:11870 * w32fns.c (Fx_window_property): Accept the same arguments as the X Windows version. Doc fix. * xfns.c (Fx_window_property): Doc fix. --- src/ChangeLog | 6 ++++++ src/w32fns.c | 13 +++++++------ src/xfns.c | 11 ++++++----- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index bb9fabfaa8e..0f1a0bdc666 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2012-07-06 Andreas Schwab + + * w32fns.c (Fx_window_property): Accept the same arguments as the + X Windows version. Doc fix. + * xfns.c (Fx_window_property): Doc fix. (Bug#11870) + 2012-07-06 Juanma Barranquero Eli Zaretskii diff --git a/src/w32fns.c b/src/w32fns.c index 99eca5c77b5..babc1e76cfc 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -4944,23 +4944,24 @@ FRAME nil or omitted means use the selected frame. Value is PROP. */) DEFUN ("x-window-property", Fx_window_property, Sx_window_property, - 1, 2, 0, + 1, 6, 0, doc: /* Value is the value of window property PROP on FRAME. If FRAME is nil or omitted, use the selected frame. -On MS Windows, this function only accepts the PROP and FRAME arguments. - On X Windows, the following optional arguments are also accepted: If TYPE is nil or omitted, get the property as a string. Otherwise TYPE is the name of the atom that denotes the type expected. If SOURCE is non-nil, get the property on that window instead of from FRAME. The number 0 denotes the root window. -If DELETE_P is non-nil, delete the property after retrieving it. -If VECTOR_RET_P is non-nil, don't return a string but a vector of values. +If DELETE-P is non-nil, delete the property after retrieving it. +If VECTOR-RET-P is non-nil, don't return a string but a vector of values. + +On MS Windows, this function accepts but ignores those optional arguments. Value is nil if FRAME hasn't a property with name PROP or if PROP has no value of TYPE (always string in the MS Windows case). */) - (Lisp_Object prop, Lisp_Object frame) + (Lisp_Object prop, Lisp_Object frame, Lisp_Object type, + Lisp_Object source, Lisp_Object delete_p, Lisp_Object vector_ret_p) { struct frame *f = check_x_frame (frame); Atom prop_atom; diff --git a/src/xfns.c b/src/xfns.c index ec729fab566..01ff62fcc48 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -4292,19 +4292,20 @@ DEFUN ("x-window-property", Fx_window_property, Sx_window_property, doc: /* Value is the value of window property PROP on FRAME. If FRAME is nil or omitted, use the selected frame. -On MS Windows, this function only accepts the PROP and FRAME arguments. - On X Windows, the following optional arguments are also accepted: If TYPE is nil or omitted, get the property as a string. Otherwise TYPE is the name of the atom that denotes the type expected. If SOURCE is non-nil, get the property on that window instead of from FRAME. The number 0 denotes the root window. -If DELETE_P is non-nil, delete the property after retrieving it. -If VECTOR_RET_P is non-nil, don't return a string but a vector of values. +If DELETE-P is non-nil, delete the property after retrieving it. +If VECTOR-RET-P is non-nil, don't return a string but a vector of values. + +On MS Windows, this function accepts but ignores those optional arguments. Value is nil if FRAME hasn't a property with name PROP or if PROP has no value of TYPE (always string in the MS Windows case). */) - (Lisp_Object prop, Lisp_Object frame, Lisp_Object type, Lisp_Object source, Lisp_Object delete_p, Lisp_Object vector_ret_p) + (Lisp_Object prop, Lisp_Object frame, Lisp_Object type, + Lisp_Object source, Lisp_Object delete_p, Lisp_Object vector_ret_p) { struct frame *f = check_x_frame (frame); Atom prop_atom; -- 2.39.2