Merge.

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 @@
+2011-10-30  Martin Rudalics  <rudalics@gmx.at>
+
+        * windows.texi (Windows and Frames): Remove "iso-" infix from
+        documentation of window-iso-combined-p.
+
 2011-10-26  Chong Yidong  <cyd@gnu.org>
 
         * 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}.
 The following function is useful to determine whether a window is part
 of a vertical or horizontal combination.
 
-@defun window-iso-combined-p &optional window horizontal
+@defun window-combined-p &optional window horizontal
 This function returns non-@code{nil} if and only if @var{window} is
 vertically combined.  The argument @var{window} can specify any window
 and defaults to the selected one.  The actual return value is the first