aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2004-02-07 17:17:20 +0000
committerJan Djärv2004-02-07 17:17:20 +0000
commit030400ebb178fa357c65b886aae48eea61a8a4a8 (patch)
treee7341c40e9284cbeb39829e5dbcc708124e18c02
parent1cb60b5a354ca2e11a3e1434d1ff8f07f61f2969 (diff)
downloademacs-030400ebb178fa357c65b886aae48eea61a8a4a8.tar.gz
emacs-030400ebb178fa357c65b886aae48eea61a8a4a8.zip
macfns.c, w32fns.c (Fx_change_window_property):
Make doc string and parameters same as for X version.
-rw-r--r--src/ChangeLog7
-rw-r--r--src/macfns.c23
-rw-r--r--src/w32fns.c23
3 files changed, 43 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ad219254ddb..3cd8ce0f654 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12004-02-07 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * macfns.c (Fx_change_window_property): Make doc string and
4 parameters same as for X version.
5
6 * w32fns.c (Fx_change_window_property): Ditto.
7
12004-02-07 Kim F. Storm <storm@cua.dk> 82004-02-07 Kim F. Storm <storm@cua.dk>
2 9
3 * xdisp.c (hscroll_window_tree): Position cursor near to right 10 * 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)
7792 ***********************************************************************/ 7792 ***********************************************************************/
7793 7793
7794DEFUN ("x-change-window-property", Fx_change_window_property, 7794DEFUN ("x-change-window-property", Fx_change_window_property,
7795 Sx_change_window_property, 2, 3, 0, 7795 Sx_change_window_property, 2, 6, 0,
7796 doc: /* Change window property PROP to VALUE on the X window of FRAME. 7796 doc: /* Change window property PROP to VALUE on the X window of FRAME.
7797PROP and VALUE must be strings. FRAME nil or omitted means use the 7797VALUE may be a string or a list of conses, numbers and/or strings.
7798selected frame. Value is VALUE. */) 7798If an element in the list is a string, it is converted to
7799 (prop, value, frame) 7799an Atom and the value of the Atom is used. If an element is a cons,
7800 Lisp_Object frame, prop, value; 7800it is converted to a 32 bit number where the car is the 16 top bits and the
7801cdr is the lower 16 bits.
7802FRAME nil or omitted means use the selected frame.
7803If TYPE is given and non-nil, it is the name of the type of VALUE.
7804If TYPE is not given or nil, the type is STRING.
7805FORMAT gives the size in bits of each element if VALUE is a list.
7806It must be one of 8, 16 or 32.
7807If VALUE is a string or FORMAT is nil or not given, FORMAT defaults to 8.
7808If OUTER_P is non-nil, the property is changed for the outer X window of
7809FRAME. Default is to change on the edit X window.
7810
7811Value is VALUE. */)
7812 (prop, value, frame, type, format, outer_p)
7813 Lisp_Object prop, value, frame, type, format, outer_p;
7801{ 7814{
7802#if 0 /* MAC_TODO : port window properties to Mac */ 7815#if 0 /* MAC_TODO : port window properties to Mac */
7803 struct frame *f = check_x_frame (frame); 7816 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)
12405 ***********************************************************************/ 12405 ***********************************************************************/
12406 12406
12407DEFUN ("x-change-window-property", Fx_change_window_property, 12407DEFUN ("x-change-window-property", Fx_change_window_property,
12408 Sx_change_window_property, 2, 3, 0, 12408 Sx_change_window_property, 2, 6, 0,
12409 doc: /* Change window property PROP to VALUE on the X window of FRAME. 12409 doc: /* Change window property PROP to VALUE on the X window of FRAME.
12410PROP and VALUE must be strings. FRAME nil or omitted means use the 12410VALUE may be a string or a list of conses, numbers and/or strings.
12411selected frame. Value is VALUE. */) 12411If an element in the list is a string, it is converted to
12412 (prop, value, frame) 12412an Atom and the value of the Atom is used. If an element is a cons,
12413 Lisp_Object frame, prop, value; 12413it is converted to a 32 bit number where the car is the 16 top bits and the
12414cdr is the lower 16 bits.
12415FRAME nil or omitted means use the selected frame.
12416If TYPE is given and non-nil, it is the name of the type of VALUE.
12417If TYPE is not given or nil, the type is STRING.
12418FORMAT gives the size in bits of each element if VALUE is a list.
12419It must be one of 8, 16 or 32.
12420If VALUE is a string or FORMAT is nil or not given, FORMAT defaults to 8.
12421If OUTER_P is non-nil, the property is changed for the outer X window of
12422FRAME. Default is to change on the edit X window.
12423
12424Value is VALUE. */)
12425 (prop, value, frame, type, format, outer_p)
12426 Lisp_Object prop, value, frame, type, format, outer_p;
12414{ 12427{
12415#if 0 /* TODO : port window properties to W32 */ 12428#if 0 /* TODO : port window properties to W32 */
12416 struct frame *f = check_x_frame (frame); 12429 struct frame *f = check_x_frame (frame);