From: Jan Djärv Date: Sat, 7 Feb 2004 17:17:20 +0000 (+0000) Subject: macfns.c, w32fns.c (Fx_change_window_property): X-Git-Tag: ttn-vms-21-2-B4~7722 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=030400ebb178fa357c65b886aae48eea61a8a4a8;p=emacs.git macfns.c, w32fns.c (Fx_change_window_property): Make doc string and parameters same as for X version. --- diff --git a/src/ChangeLog b/src/ChangeLog index ad219254ddb..3cd8ce0f654 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2004-02-07 Jan Dj,Ad(Brv + + * macfns.c (Fx_change_window_property): Make doc string and + parameters same as for X version. + + * w32fns.c (Fx_change_window_property): Ditto. + 2004-02-07 Kim F. Storm * xdisp.c (hscroll_window_tree): Position cursor near to right diff --git a/src/macfns.c b/src/macfns.c index 0f87556fb1e..a01811048fe 100644 --- a/src/macfns.c +++ b/src/macfns.c @@ -7792,12 +7792,25 @@ x_kill_gs_process (pixmap, f) ***********************************************************************/ DEFUN ("x-change-window-property", Fx_change_window_property, - Sx_change_window_property, 2, 3, 0, + Sx_change_window_property, 2, 6, 0, doc: /* Change window property PROP to VALUE on the X window of FRAME. -PROP and VALUE must be strings. FRAME nil or omitted means use the -selected frame. Value is VALUE. */) - (prop, value, frame) - Lisp_Object frame, prop, value; +VALUE may be a string or a list of conses, numbers and/or strings. +If an element in the list is a string, it is converted to +an Atom and the value of the Atom is used. If an element is a cons, +it is converted to a 32 bit number where the car is the 16 top bits and the +cdr is the lower 16 bits. +FRAME nil or omitted means use the selected frame. +If TYPE is given and non-nil, it is the name of the type of VALUE. +If TYPE is not given or nil, the type is STRING. +FORMAT gives the size in bits of each element if VALUE is a list. +It must be one of 8, 16 or 32. +If VALUE is a string or FORMAT is nil or not given, FORMAT defaults to 8. +If OUTER_P is non-nil, the property is changed for the outer X window of +FRAME. Default is to change on the edit X window. + +Value is VALUE. */) + (prop, value, frame, type, format, outer_p) + Lisp_Object prop, value, frame, type, format, outer_p; { #if 0 /* MAC_TODO : port window properties to Mac */ struct frame *f = check_x_frame (frame); diff --git a/src/w32fns.c b/src/w32fns.c index f296c171595..3b53bade2ad 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -12405,12 +12405,25 @@ x_kill_gs_process (pixmap, f) ***********************************************************************/ DEFUN ("x-change-window-property", Fx_change_window_property, - Sx_change_window_property, 2, 3, 0, + Sx_change_window_property, 2, 6, 0, doc: /* Change window property PROP to VALUE on the X window of FRAME. -PROP and VALUE must be strings. FRAME nil or omitted means use the -selected frame. Value is VALUE. */) - (prop, value, frame) - Lisp_Object frame, prop, value; +VALUE may be a string or a list of conses, numbers and/or strings. +If an element in the list is a string, it is converted to +an Atom and the value of the Atom is used. If an element is a cons, +it is converted to a 32 bit number where the car is the 16 top bits and the +cdr is the lower 16 bits. +FRAME nil or omitted means use the selected frame. +If TYPE is given and non-nil, it is the name of the type of VALUE. +If TYPE is not given or nil, the type is STRING. +FORMAT gives the size in bits of each element if VALUE is a list. +It must be one of 8, 16 or 32. +If VALUE is a string or FORMAT is nil or not given, FORMAT defaults to 8. +If OUTER_P is non-nil, the property is changed for the outer X window of +FRAME. Default is to change on the edit X window. + +Value is VALUE. */) + (prop, value, frame, type, format, outer_p) + Lisp_Object prop, value, frame, type, format, outer_p; { #if 0 /* TODO : port window properties to W32 */ struct frame *f = check_x_frame (frame);