diff options
| author | Juanma Barranquero | 2014-02-21 14:33:57 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2014-02-21 14:33:57 +0100 |
| commit | 37febf5317f51728435612d74f57de30ca665629 (patch) | |
| tree | 07c266b68eb8d53582d30e0ba366fef0446edc7e | |
| parent | bed5126f521b70ea3c21e99fe340759729b6d660 (diff) | |
| download | emacs-37febf5317f51728435612d74f57de30ca665629.tar.gz emacs-37febf5317f51728435612d74f57de30ca665629.zip | |
doc/lispref/windows.texi (Window Configurations): Doc fix.
(Windows and Frames): Fix typo.
| -rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispref/windows.texi | 7 |
2 files changed, 9 insertions, 3 deletions
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 @@ | |||
| 1 | 2014-02-21 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * windows.texi (Window Configurations): Doc fix. | ||
| 4 | (Windows and Frames): Fix typo. | ||
| 5 | |||
| 1 | 2014-02-21 Glenn Morris <rgm@gnu.org> | 6 | 2014-02-21 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * internals.texi (Process Internals): | 8 | * 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 | |||
| 252 | window @var{W2} and the internal window @var{W3}. The child windows | 252 | window @var{W2} and the internal window @var{W3}. The child windows |
| 253 | of @var{W3} form a vertical combination, consisting of the live | 253 | of @var{W3} form a vertical combination, consisting of the live |
| 254 | windows @var{W4} and @var{W5}. Hence, the live windows in this | 254 | windows @var{W4} and @var{W5}. Hence, the live windows in this |
| 255 | window tree are @var{W2} @var{W4}, and @var{W5}. | 255 | window tree are @var{W2}, @var{W4}, and @var{W5}. |
| 256 | 256 | ||
| 257 | The following functions can be used to retrieve a child window of an | 257 | The following functions can be used to retrieve a child window of an |
| 258 | internal window, and the siblings of a child window. | 258 | internal window, and the siblings of a child window. |
| @@ -3504,8 +3504,9 @@ the following function to restore the state of the window. | |||
| 3504 | This function puts the window state @var{state} into @var{window}. The | 3504 | This function puts the window state @var{state} into @var{window}. The |
| 3505 | argument @var{state} should be the state of a window returned by an | 3505 | argument @var{state} should be the state of a window returned by an |
| 3506 | earlier invocation of @code{window-state-get}, see above. The optional | 3506 | earlier invocation of @code{window-state-get}, see above. The optional |
| 3507 | argument @var{window} must specify a live window and defaults to the | 3507 | argument @var{window} must specify a valid window and defaults to the |
| 3508 | selected one. | 3508 | selected one. If @var{window} is not live, it is replaced by a live |
| 3509 | window before putting @var{state} into it. | ||
| 3509 | 3510 | ||
| 3510 | If the optional argument @var{ignore} is non-@code{nil}, it means to ignore | 3511 | If the optional argument @var{ignore} is non-@code{nil}, it means to ignore |
| 3511 | minimum window sizes and fixed-size restrictions. If @var{ignore} | 3512 | minimum window sizes and fixed-size restrictions. If @var{ignore} |