From: Juanma Barranquero Date: Fri, 21 Feb 2014 13:33:57 +0000 (+0100) Subject: doc/lispref/windows.texi (Window Configurations): Doc fix. X-Git-Tag: emacs-24.3.90~173^2^2~30 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=37febf5317f51728435612d74f57de30ca665629;p=emacs.git doc/lispref/windows.texi (Window Configurations): Doc fix. (Windows and Frames): Fix typo. --- diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index d6a996ca9bf..eb6559ba07f 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2014-02-21 Juanma Barranquero + + * windows.texi (Window Configurations): Doc fix. + (Windows and Frames): Fix typo. + 2014-02-21 Glenn Morris * internals.texi (Process Internals): diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index e14a1485882..f19a08c85e7 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -252,7 +252,7 @@ child windows form a horizontal combination, consisting of the live window @var{W2} and the internal window @var{W3}. The child windows of @var{W3} form a vertical combination, consisting of the live windows @var{W4} and @var{W5}. Hence, the live windows in this -window tree are @var{W2} @var{W4}, and @var{W5}. +window tree are @var{W2}, @var{W4}, and @var{W5}. The following functions can be used to retrieve a child window of an internal window, and the siblings of a child window. @@ -3504,8 +3504,9 @@ the following function to restore the state of the window. This function puts the window state @var{state} into @var{window}. The argument @var{state} should be the state of a window returned by an earlier invocation of @code{window-state-get}, see above. The optional -argument @var{window} must specify a live window and defaults to the -selected one. +argument @var{window} must specify a valid window and defaults to the +selected one. If @var{window} is not live, it is replaced by a live +window before putting @var{state} into it. If the optional argument @var{ignore} is non-@code{nil}, it means to ignore minimum window sizes and fixed-size restrictions. If @var{ignore}