Add FORCE-SAME-WINDOW argument to switch-to-buffer.

* lisp/window.el (switch-to-buffer): New arg FORCE-SAME-WINDOW.  Use
pop-to-buffer buffer-or-name if it is nil.

* lisp/emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions):
Remove switch-to-buffer.

1 files changed, 9 insertions, 0 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 8a37735b41f..3f23c23fe3a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -986,6 +986,15 @@ sc.el, x-menu.el, rnews.el, rnewspost.el
 
 * Lisp changes in Emacs 24.1
 
+** Window changes
+
+*** `switch-to-buffer' has a new optional argument FORCE-SAME-WINDOW,
+which if non-nil requires the buffer to be displayed in the currently
+selected window, signaling an error otherwise.  If nil, another window
+can be used, e.g. if the selected one is strongly dedicated.
+
+*** FIXME: buffer-display-alist changes
+
 ** Completion
 *** New variable completion-extra-properties used to specify extra properties
 of the current completion: