aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2011-10-08 16:01:55 +0200
committerMartin Rudalics2011-10-08 16:01:55 +0200
commit235ce86fea5c1b5c024da7e05a2f50aa7f22a992 (patch)
treee59e129c48ea5612acd1be12f9de0c086aa6f6d7
parentc557cd6b97df3989fda0b2d19cff80bb7a9a5c70 (diff)
downloademacs-235ce86fea5c1b5c024da7e05a2f50aa7f22a992.tar.gz
emacs-235ce86fea5c1b5c024da7e05a2f50aa7f22a992.zip
Fix doc-string typo in switch-to-buffer.
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/window.el2
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 @@
2 2
3 * window.el (window--delete): Delete dedicated frame 3 * window.el (window--delete): Delete dedicated frame
4 unconditionally when argument KILL is non-nil. (Bug#9699) 4 unconditionally when argument KILL is non-nil. (Bug#9699)
5 (switch-to-buffer): Fix doc-string typo.
5 6
62011-10-08 Thierry Volpiatto <thierry.volpiatto@gmail.com> 72011-10-08 Thierry Volpiatto <thierry.volpiatto@gmail.com>
7 8
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.
4977If FORCE-SAME-WINDOW is non-nil, BUFFER-OR-NAME must be displayed 4977If FORCE-SAME-WINDOW is non-nil, BUFFER-OR-NAME must be displayed
4978in the selected window; signal an error if that is 4978in the selected window; signal an error if that is
4979impossible (e.g. if the selected window is minibuffer-only). If 4979impossible (e.g. if the selected window is minibuffer-only). If
4980non-nil, BUFFER-OR-NAME may be displayed in another window. 4980nil, BUFFER-OR-NAME may be displayed in another window.
4981 4981
4982Return the buffer switched to." 4982Return the buffer switched to."
4983 (interactive 4983 (interactive