comparison src/buffer.c @ 1348:f6ab9d1e1709

(Fkill_buffer): Pass 2nd arg to Fother_buffer. (Fswitch_to_buffer, Fpop_to_buffer, Fbury_buffer):

1347:ac3a893b9bb9

  /* Make this buffer not be current.
     In the process, notice if this is the sole visible buffer
     and give up if so.  */
  if (b == current_buffer)
    {
      tem = Fother_buffer (buf);
      Fset_buffer (tem);
      if (b == current_buffer)
	return Qnil;
    }

  tem = Fwindow_dedicated_p (selected_window);
  if (!NILP (tem))
    error ("Cannot switch buffers in a dedicated window");

  if (NILP (bufname))
    buf = Fother_buffer (Fcurrent_buffer ());
  else
    buf = Fget_buffer_create (bufname);
  Fset_buffer (buf);
  if (NILP (norecord))
    record_buffer (buf);

  (bufname, other)
     Lisp_Object bufname, other;
{
  register Lisp_Object buf;
  if (NILP (bufname))
    buf = Fother_buffer (Fcurrent_buffer ());
  else
    buf = Fget_buffer_create (bufname);
  Fset_buffer (buf);
  record_buffer (buf);
  Fselect_window (Fdisplay_buffer (buf, other));

      buf = buf1;
    }

  /* Remove it from the screen.  */
  if (EQ (buf, XWINDOW (selected_window)->buffer))
    Fswitch_to_buffer (Fother_buffer (buf), Qnil);

  /* Move it to the end of the buffer list.  */
  {
    register Lisp_Object aelt, link;

1348:f6ab9d1e1709

  /* Make this buffer not be current.
     In the process, notice if this is the sole visible buffer
     and give up if so.  */
  if (b == current_buffer)
    {
      tem = Fother_buffer (buf, Qnil);
      Fset_buffer (tem);
      if (b == current_buffer)
	return Qnil;
    }

  tem = Fwindow_dedicated_p (selected_window);
  if (!NILP (tem))
    error ("Cannot switch buffers in a dedicated window");

  if (NILP (bufname))
    buf = Fother_buffer (Fcurrent_buffer (), Qnil);
  else
    buf = Fget_buffer_create (bufname);
  Fset_buffer (buf);
  if (NILP (norecord))
    record_buffer (buf);

  (bufname, other)
     Lisp_Object bufname, other;
{
  register Lisp_Object buf;
  if (NILP (bufname))
    buf = Fother_buffer (Fcurrent_buffer (), Qnil);
  else
    buf = Fget_buffer_create (bufname);
  Fset_buffer (buf);
  record_buffer (buf);
  Fselect_window (Fdisplay_buffer (buf, other));

      buf = buf1;
    }

  /* Remove it from the screen.  */
  if (EQ (buf, XWINDOW (selected_window)->buffer))
    Fswitch_to_buffer (Fother_buffer (buf, Qnil), Qnil);

  /* Move it to the end of the buffer list.  */
  {
    register Lisp_Object aelt, link;