comparison src/buffer.c @ 72524:49a6e184d20a

(Fswitch_to_buffer): Fix previous change.

72523:85d27b00d6b0

{
  char *err;

  if (EQ (buffer, Fwindow_buffer (selected_window)))
    {
      if (NILP (norecord)  && !EQ (buffer, XCDR (XCAR (Vbuffer_alist))))
	record_buffer (buffer);
      /* Basically a NOP.  Avoid signalling an error if the selected window
	 is dedicated, or a minibuffer, ...  */
      return Fset_buffer (buffer);
    }

  err = no_switch_window (selected_window);
  if (err) error (err);

72524:49a6e184d20a

{
  char *err;

  if (EQ (buffer, Fwindow_buffer (selected_window)))
    {
      /* 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);
      return Fset_buffer (buffer);
    }

  err = no_switch_window (selected_window);
  if (err) error (err);