[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110914: * lisp/window.el (switch-to-buffer): Re-add the warning that was lost in the

[Stefan Monnier]

------------------------------------------------------------
revno: 110914
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Sun 2012-11-18 22:16:03 -0500
message:
  * lisp/window.el (switch-to-buffer): Re-add the warning that was lost in the
  code rewrite.
modified:
  lisp/ChangeLog
  lisp/window.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-18 17:10:35 +0000
+++ b/lisp/ChangeLog    2012-11-19 03:16:03 +0000
@@ -1,3 +1,8 @@
+2012-11-19  Stefan Monnier  <address@hidden>
+
+       * window.el (switch-to-buffer): Re-add the warning that was lost in the
+       code rewrite.
+
 2012-11-18  Paul Eggert  <address@hidden>
 
        More minor time fixes.

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2012-11-17 02:03:58 +0000
+++ b/lisp/window.el    2012-11-19 03:16:03 +0000
@@ -5870,7 +5870,12 @@
   :version "24.3")
 
 (defun switch-to-buffer (buffer-or-name &optional norecord force-same-window)
-  "Switch to buffer BUFFER-OR-NAME in the selected window.
+  "Display buffer BUFFER-OR-NAME in the selected window.
+
+WARNING: This is NOT the way to work on another buffer temporarily
+within a Lisp program!  Use `set-buffer' instead.  That avoids
+messing with the window-buffer correspondences.
+
 If the selected window cannot display the specified
 buffer (e.g. if it is a minibuffer window or strongly dedicated
 to another buffer), call `pop-to-buffer' to select the buffer in