diff options
| author | Martin Rudalics | 2012-11-18 12:34:36 +0100 |
|---|---|---|
| committer | Martin Rudalics | 2012-11-18 12:34:36 +0100 |
| commit | 66c466d4fdb7f874f19191ca06fad92f9c2393cd (patch) | |
| tree | e8da4b91f63b438d36957bd0b9e5258fe9dae116 | |
| parent | d1a355a1bfb2ff5914e42267c2d0c9e414f08b68 (diff) | |
| download | emacs-66c466d4fdb7f874f19191ca06fad92f9c2393cd.tar.gz emacs-66c466d4fdb7f874f19191ca06fad92f9c2393cd.zip | |
Fix example for Display Action Functions.
* windows.texi (Display Action Functions): Fix recently added
example. Suggested by Michael Heerdegen.
| -rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispref/windows.texi | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 389d94bf8c5..bdf4ef13488 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-11-18 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * windows.texi (Display Action Functions): Fix recently added | ||
| 4 | example. Suggested by Michael Heerdegen. | ||
| 5 | |||
| 1 | 2012-11-18 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2012-11-18 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | Minor cleanup for times as lists of four integers. | 8 | Minor cleanup for times as lists of four integers. |
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 439e807260f..46b31ef0d9f 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi | |||
| @@ -2038,7 +2038,8 @@ Evaluating the form above will cause @code{display-buffer} to proceed as | |||
| 2038 | follows: If `*foo*' already appears on a visible or iconified frame, it | 2038 | follows: If `*foo*' already appears on a visible or iconified frame, it |
| 2039 | will reuse its window. Otherwise, it will try to pop up a new window | 2039 | will reuse its window. Otherwise, it will try to pop up a new window |
| 2040 | or, if that is impossible, a new frame. If all these steps fail, it | 2040 | or, if that is impossible, a new frame. If all these steps fail, it |
| 2041 | will try to use some existing window. | 2041 | will proceed using whatever @code{display-buffer-base-action} and |
| 2042 | @code{display-buffer-fallback-action} prescribe. | ||
| 2042 | 2043 | ||
| 2043 | Furthermore, @code{display-buffer} will try to adjust a reused window | 2044 | Furthermore, @code{display-buffer} will try to adjust a reused window |
| 2044 | (provided `*foo*' was put by @code{display-buffer} there before) or a | 2045 | (provided `*foo*' was put by @code{display-buffer} there before) or a |