diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-11-18 22:16:03 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-11-18 22:16:03 -0500 |
| commit | d1c0cddf73e3edf4b1a7bbaa9e24caa817bd10e1 (patch) | |
| tree | e08f71956dc4a84c41b13cc7710f0db427678718 | |
| parent | 535efd4a430b6595a30efaa2919e565ad21209b9 (diff) | |
* lisp/window.el (switch-to-buffer): Re-add the warning that was lost in the
code rewrite.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/window.el | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a6fdf7ebc4b..85e762497e4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-11-19 Stefan Monnier <monnier@iro.umontreal.ca> + + * window.el (switch-to-buffer): Re-add the warning that was lost in the + code rewrite. + 2012-11-18 Paul Eggert <eggert@cs.ucla.edu> More minor time fixes. diff --git a/lisp/window.el b/lisp/window.el index d378ea5ff14..52909fa9e5f 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -5870,7 +5870,12 @@ the selected window or never appeared in it before, or if :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 |