diff options
| author | Juanma Barranquero | 2004-04-25 23:56:14 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2004-04-25 23:56:14 +0000 |
| commit | e198ba8711821da8fec10d1ab5d836f058fcf646 (patch) | |
| tree | 1840950acc238d8eaddb3ff7376182bc0e516123 /src | |
| parent | f3d5f92d98cb97a735ae9725a7db8479b5d81d85 (diff) | |
| download | emacs-e198ba8711821da8fec10d1ab5d836f058fcf646.tar.gz emacs-e198ba8711821da8fec10d1ab5d836f058fcf646.zip | |
(Fpop_to_buffer): Fix docstring.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/buffer.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b0c68409234..ea83b7ce3b3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,7 +1,12 @@ | |||
| 1 | 2004-04-26 Juanma Barranquero <lektu@terra.es> | ||
| 2 | |||
| 3 | * buffer.c (Fpop_to_buffer): Fix docstring. | ||
| 4 | |||
| 1 | 2004-04-26 Steven Tamm <steventamm@mac.com> | 5 | 2004-04-26 Steven Tamm <steventamm@mac.com> |
| 6 | |||
| 2 | * lread.c (init_lread): Don't display missing lisp directory | 7 | * lread.c (init_lread): Don't display missing lisp directory |
| 3 | warnings with Carbon Emacs because self-contained bundled Emacs | 8 | warnings with Carbon Emacs because self-contained bundled Emacs |
| 4 | may be build without correct installation path. | 9 | may be built without correct installation path. |
| 5 | 10 | ||
| 6 | 2004-04-25 Kim F. Storm <storm@cua.dk> | 11 | 2004-04-25 Kim F. Storm <storm@cua.dk> |
| 7 | 12 | ||
diff --git a/src/buffer.c b/src/buffer.c index 6e67f07cf38..db16b22e35a 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -1683,7 +1683,7 @@ DEFUN ("pop-to-buffer", Fpop_to_buffer, Spop_to_buffer, 1, 3, 0, | |||
| 1683 | doc: /* Select buffer BUFFER in some window, preferably a different one. | 1683 | doc: /* Select buffer BUFFER in some window, preferably a different one. |
| 1684 | If BUFFER is nil, then some other buffer is chosen. | 1684 | If BUFFER is nil, then some other buffer is chosen. |
| 1685 | If `pop-up-windows' is non-nil, windows can be split to do this. | 1685 | If `pop-up-windows' is non-nil, windows can be split to do this. |
| 1686 | If optional second arg OTHER-WINDOW is nil, insist on finding another | 1686 | If optional second arg OTHER-WINDOW is non-nil, insist on finding another |
| 1687 | window even if BUFFER is already visible in the selected window, | 1687 | window even if BUFFER is already visible in the selected window, |
| 1688 | and ignore `same-window-regexps' and `same-window-buffer-names'. | 1688 | and ignore `same-window-regexps' and `same-window-buffer-names'. |
| 1689 | This uses the function `display-buffer' as a subroutine; see the documentation | 1689 | This uses the function `display-buffer' as a subroutine; see the documentation |