summaryrefslogtreecommitdiff
path: root/src/xfns.c
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2012-07-06 21:34:39 +0200
committerAndreas Schwab <schwab@linux-m68k.org>2012-07-06 21:34:39 +0200
commitddadbc0e71e7b1be4e79447a7c134b0762d104eb (patch)
tree11ca8aff519e07c77f1836035c1a907da6fc50a4 /src/xfns.c
parent133a11fc593ee918a6c4c1e68c024949c9ba2f1b (diff)
downloademacs-ddadbc0e71e7b1be4e79447a7c134b0762d104eb.tar.gz
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.
Diffstat (limited to 'src/xfns.c')
-rw-r--r--src/xfns.c11
1 files changed, 6 insertions, 5 deletions
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;