diff options
Diffstat (limited to 'doc/lispref')
| -rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispref/windows.texi | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index acc334ea000..1e86e07998c 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-10-30 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * windows.texi (Windows and Frames): Remove "iso-" infix from | ||
| 4 | documentation of window-iso-combined-p. | ||
| 5 | |||
| 1 | 2011-10-26 Chong Yidong <cyd@gnu.org> | 6 | 2011-10-26 Chong Yidong <cyd@gnu.org> |
| 2 | 7 | ||
| 3 | * modes.texi (Running Hooks): Document with-wrapper-hook. | 8 | * modes.texi (Running Hooks): Document with-wrapper-hook. |
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 9dd03027ee2..37679aa4a0b 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi | |||
| @@ -309,7 +309,7 @@ W4)} is @code{W6}. | |||
| 309 | The following function is useful to determine whether a window is part | 309 | The following function is useful to determine whether a window is part |
| 310 | of a vertical or horizontal combination. | 310 | of a vertical or horizontal combination. |
| 311 | 311 | ||
| 312 | @defun window-iso-combined-p &optional window horizontal | 312 | @defun window-combined-p &optional window horizontal |
| 313 | This function returns non-@code{nil} if and only if @var{window} is | 313 | This function returns non-@code{nil} if and only if @var{window} is |
| 314 | vertically combined. The argument @var{window} can specify any window | 314 | vertically combined. The argument @var{window} can specify any window |
| 315 | and defaults to the selected one. The actual return value is the first | 315 | and defaults to the selected one. The actual return value is the first |