Commit ddadbc0e authored by Andreas Schwab's avatar Andreas Schwab
Browse files

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.
parent 133a11fc
2012-07-06 Andreas Schwab <schwab@linux-m68k.org>
* 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 <lekktu@gmail.com> 2012-07-06 Juanma Barranquero <lekktu@gmail.com>
Eli Zaretskii <eliz@gnu.org> Eli Zaretskii <eliz@gnu.org>
......
...@@ -4944,23 +4944,24 @@ FRAME nil or omitted means use the selected frame. Value is PROP. */) ...@@ -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, 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. doc: /* Value is the value of window property PROP on FRAME.
If FRAME is nil or omitted, use the selected 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: On X Windows, the following optional arguments are also accepted:
If TYPE is nil or omitted, get the property as a string. 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. 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 If SOURCE is non-nil, get the property on that window instead of from
FRAME. The number 0 denotes the root window. FRAME. The number 0 denotes the root window.
If DELETE_P is non-nil, delete the property after retrieving it. 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 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 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). */) 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); struct frame *f = check_x_frame (frame);
Atom prop_atom; Atom prop_atom;
......
...@@ -4292,19 +4292,20 @@ DEFUN ("x-window-property", Fx_window_property, Sx_window_property, ...@@ -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. doc: /* Value is the value of window property PROP on FRAME.
If FRAME is nil or omitted, use the selected 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: On X Windows, the following optional arguments are also accepted:
If TYPE is nil or omitted, get the property as a string. 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. 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 If SOURCE is non-nil, get the property on that window instead of from
FRAME. The number 0 denotes the root window. FRAME. The number 0 denotes the root window.
If DELETE_P is non-nil, delete the property after retrieving it. 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 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 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). */) 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); struct frame *f = check_x_frame (frame);
Atom prop_atom; Atom prop_atom;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment