aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-11-07 09:49:54 -0800
committerGlenn Morris2011-11-07 09:49:54 -0800
commit441950c75ddfc8a93024c58219cac8fd09e7582e (patch)
tree0029bbfebef23deb9a09ed82c1f9f29e7e6d9501
parentd31d07be7548ac824730d88c45b459028081eb51 (diff)
downloademacs-441950c75ddfc8a93024c58219cac8fd09e7582e.tar.gz
emacs-441950c75ddfc8a93024c58219cac8fd09e7582e.zip
* doc/lispref/windows.texi (Choosing Window): Fix keybinding typo.
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/windows.texi2
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index d714d1b26e5..ff629ce67ae 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
12011-11-07 Glenn Morris <rgm@gnu.org>
2
3 * windows.texi (Choosing Window): Fix keybinding typo.
4
12011-11-07 Martin Rudalics <rudalics@gmx.at> 52011-11-07 Martin Rudalics <rudalics@gmx.at>
2 6
3 * windows.texi (Resizing Windows, Splitting Windows) 7 * windows.texi (Resizing Windows, Splitting Windows)
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index eb3c1849523..02626adfd87 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -2163,7 +2163,7 @@ unless @var{norecord} is non-@code{nil}.
2163 2163
2164 The command @code{display-buffer} flexibly chooses a window for 2164 The command @code{display-buffer} flexibly chooses a window for
2165display, and displays a specified buffer in that window. It can be 2165display, and displays a specified buffer in that window. It can be
2166called interactively, via the key binding @kbd{C-x 4 o}. It is also 2166called interactively, via the key binding @kbd{C-x 4 C-o}. It is also
2167used as a subroutine by many functions and commands, including 2167used as a subroutine by many functions and commands, including
2168@code{switch-to-buffer} and @code{pop-to-buffer} (@pxref{Switching 2168@code{switch-to-buffer} and @code{pop-to-buffer} (@pxref{Switching
2169Buffers}). 2169Buffers}).