diff options
| author | Andreas Schwab | 2012-07-06 22:00:42 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2012-07-06 22:00:42 +0200 |
| commit | fca8d6b6871079195376ff9db564f659215d7295 (patch) | |
| tree | 6fa4f8938d53c16139509da7172b106737d9f9ab /src | |
| parent | 9c32bf45f491d35641751533eb5e399306b60947 (diff) | |
| download | emacs-fca8d6b6871079195376ff9db564f659215d7295.tar.gz emacs-fca8d6b6871079195376ff9db564f659215d7295.zip | |
* xfns.c (Fx_change_window_property): Doc fix.
* w32fns.c (Fx_change_window_property): Doc fix.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/w32fns.c | 5 | ||||
| -rw-r--r-- | src/xfns.c | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0f1a0bdc666..cfabe846422 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2012-07-06 Andreas Schwab <schwab@linux-m68k.org> | 1 | 2012-07-06 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 2 | ||
| 3 | * xfns.c (Fx_change_window_property): Doc fix. | ||
| 4 | * w32fns.c (Fx_change_window_property): Doc fix. | ||
| 5 | |||
| 3 | * w32fns.c (Fx_window_property): Accept the same arguments as the | 6 | * w32fns.c (Fx_window_property): Accept the same arguments as the |
| 4 | X Windows version. Doc fix. | 7 | X Windows version. Doc fix. |
| 5 | * xfns.c (Fx_window_property): Doc fix. (Bug#11870) | 8 | * xfns.c (Fx_window_property): Doc fix. (Bug#11870) |
diff --git a/src/w32fns.c b/src/w32fns.c index babc1e76cfc..53d344d11e8 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -4897,9 +4897,10 @@ If TYPE is not given or nil, the type is STRING. | |||
| 4897 | FORMAT gives the size in bits of each element if VALUE is a list. | 4897 | FORMAT gives the size in bits of each element if VALUE is a list. |
| 4898 | It must be one of 8, 16 or 32. | 4898 | It must be one of 8, 16 or 32. |
| 4899 | If VALUE is a string or FORMAT is nil or not given, FORMAT defaults to 8. | 4899 | If VALUE is a string or FORMAT is nil or not given, FORMAT defaults to 8. |
| 4900 | If OUTER_P is non-nil, the property is changed for the outer X window of | 4900 | If OUTER-P is non-nil, the property is changed for the outer X window of |
| 4901 | FRAME. Default is to change on the edit X window. */) | 4901 | FRAME. Default is to change on the edit X window. */) |
| 4902 | (Lisp_Object prop, Lisp_Object value, Lisp_Object frame, Lisp_Object type, Lisp_Object format, Lisp_Object outer_p) | 4902 | (Lisp_Object prop, Lisp_Object value, Lisp_Object frame, |
| 4903 | Lisp_Object type, Lisp_Object format, Lisp_Object outer_p) | ||
| 4903 | { | 4904 | { |
| 4904 | struct frame *f = check_x_frame (frame); | 4905 | struct frame *f = check_x_frame (frame); |
| 4905 | Atom prop_atom; | 4906 | Atom prop_atom; |
diff --git a/src/xfns.c b/src/xfns.c index 01ff62fcc48..35f715d89f7 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -4189,9 +4189,10 @@ If TYPE is not given or nil, the type is STRING. | |||
| 4189 | FORMAT gives the size in bits of each element if VALUE is a list. | 4189 | FORMAT gives the size in bits of each element if VALUE is a list. |
| 4190 | It must be one of 8, 16 or 32. | 4190 | It must be one of 8, 16 or 32. |
| 4191 | If VALUE is a string or FORMAT is nil or not given, FORMAT defaults to 8. | 4191 | If VALUE is a string or FORMAT is nil or not given, FORMAT defaults to 8. |
| 4192 | If OUTER_P is non-nil, the property is changed for the outer X window of | 4192 | If OUTER-P is non-nil, the property is changed for the outer X window of |
| 4193 | FRAME. Default is to change on the edit X window. */) | 4193 | FRAME. Default is to change on the edit X window. */) |
| 4194 | (Lisp_Object prop, Lisp_Object value, Lisp_Object frame, Lisp_Object type, Lisp_Object format, Lisp_Object outer_p) | 4194 | (Lisp_Object prop, Lisp_Object value, Lisp_Object frame, |
| 4195 | Lisp_Object type, Lisp_Object format, Lisp_Object outer_p) | ||
| 4195 | { | 4196 | { |
| 4196 | struct frame *f = check_x_frame (frame); | 4197 | struct frame *f = check_x_frame (frame); |
| 4197 | Atom prop_atom; | 4198 | Atom prop_atom; |