mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-01 09:51:22 -08:00
Code Issues Projects Releases Wiki Activity

(Fswitch_to_buffer): Fix previous change.

Browse source
This commit is contained in:
Richard M. Stallman 2006-08-25 21:10:26 +00:00
parent f9de773811
commit 611ac52147
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/buffer.c
View file

@ -1685,10 +1685,15 @@ the window-buffer correspondences. */)
if (EQ (buffer, Fwindow_buffer (selected_window)))
{
if (NILP (norecord) && !EQ (buffer, XCDR (XCAR (Vbuffer_alist))))
/* Basically a NOP. Avoid signalling an error in the case where
the selected window is dedicated, or a minibuffer. */
/* But do put this buffer at the front of the buffer list,
unless that has been inhibited. Note that even if
BUFFER is at the front of the main buffer-list already,
we still want to move it to the front of the frame's buffer list. */
if (NILP (norecord))
record_buffer (buffer);
/* Basically a NOP. Avoid signalling an error if the selected window
is dedicated, or a minibuffer, ... */
return Fset_buffer (buffer);
}