2 files changed, 2 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7bd71260763..076749197e0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
 
         * window.el (window--delete): Delete dedicated frame
         unconditionally when argument KILL is non-nil.  (Bug#9699)
+        (switch-to-buffer): Fix doc-string typo.
 
 2011-10-08  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 
diff --git a/lisp/window.el b/lisp/window.el
index 72b14e1852e..79629c9c285 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -4977,7 +4977,7 @@ one.
 If FORCE-SAME-WINDOW is non-nil, BUFFER-OR-NAME must be displayed
 in the selected window; signal an error if that is
 impossible (e.g. if the selected window is minibuffer-only).  If
-non-nil, BUFFER-OR-NAME may be displayed in another window.
+nil, BUFFER-OR-NAME may be displayed in another window.
 
 Return the buffer switched to."
   (interactive