comparison src/buffer.c @ 3884:19b4e1fef348

* buffer.c (list_buffers_1): Make desired_point a lisp object; set it to nil, unless we find the current buffer. (Flist_buffers): Don't try to set point in the buffer list unless list_buffers_1 actually returns an integer. Don't use a full save_excursion; just save and restore the buffer.

3883:b9e5a869b33e

     Lisp_Object files;
{
  register Lisp_Object tail, tem, buf;
  Lisp_Object col1, col2, col3, minspace;
  register struct buffer *old = current_buffer, *b;
  int desired_point = 0;
  Lisp_Object other_file_symbol;

  other_file_symbol = intern ("list-buffers-directory");

  XFASTINT (col1) = 19;
  XFASTINT (col2) = 25;
  XFASTINT (col3) = 40;

      /* Optionally don't mention buffers that lack files. */
      if (!NILP (files) && NILP (b->filename))
	continue;
      /* Identify the current buffer. */
      if (b == old)
	desired_point = point;
      write_string (b == old ? "." : " ", -1);
      /* Identify modified buffers */
      write_string (BUF_MODIFF (b) > b->save_modified ? "*" : " ", -1);
      write_string (NILP (b->read_only) ? "  " : "% ", -1);
      Fprinc (b->name, Qnil);

      write_string ("\n", -1);
    }

  current_buffer->read_only = Qt;
  set_buffer_internal (old);
  return make_number (desired_point);
}

DEFUN ("list-buffers", Flist_buffers, Slist_buffers, 0, 1, "P",
  "Display a list of names of existing buffers.\n\
The list is displayed in a buffer named `*Buffer List*'.\n\

The M column contains a * for buffers that are modified.\n\
The R column contains a % for buffers that are read-only.")
  (files)
     Lisp_Object files;
{
  int count = specpdl_ptr - specpdl;
  Lisp_Object desired_point;

  desired_point =
    internal_with_output_to_temp_buffer ("*Buffer List*",
					 list_buffers_1, files);

  record_unwind_protect (save_excursion_restore, save_excursion_save ());
  Fset_buffer (build_string ("*Buffer List*"));
  SET_PT (XINT (desired_point));
  
  return unbind_to (count, Qnil);
}

DEFUN ("kill-all-local-variables", Fkill_all_local_variables, Skill_all_local_variables,
  0, 0, 0,
  "Switch to Fundamental mode by killing current buffer's local variables.\n\

3884:19b4e1fef348

     Lisp_Object files;
{
  register Lisp_Object tail, tem, buf;
  Lisp_Object col1, col2, col3, minspace;
  register struct buffer *old = current_buffer, *b;
  Lisp_Object desired_point;
  Lisp_Object other_file_symbol;

  desired_point = Qnil;
  other_file_symbol = intern ("list-buffers-directory");

  XFASTINT (col1) = 19;
  XFASTINT (col2) = 25;
  XFASTINT (col3) = 40;

      /* Optionally don't mention buffers that lack files. */
      if (!NILP (files) && NILP (b->filename))
	continue;
      /* Identify the current buffer. */
      if (b == old)
	XFASTINT (desired_point) = point;
      write_string (b == old ? "." : " ", -1);
      /* Identify modified buffers */
      write_string (BUF_MODIFF (b) > b->save_modified ? "*" : " ", -1);
      write_string (NILP (b->read_only) ? "  " : "% ", -1);
      Fprinc (b->name, Qnil);

      write_string ("\n", -1);
    }

  current_buffer->read_only = Qt;
  set_buffer_internal (old);
  return desired_point;
}

DEFUN ("list-buffers", Flist_buffers, Slist_buffers, 0, 1, "P",
  "Display a list of names of existing buffers.\n\
The list is displayed in a buffer named `*Buffer List*'.\n\

The M column contains a * for buffers that are modified.\n\
The R column contains a % for buffers that are read-only.")
  (files)
     Lisp_Object files;
{
  Lisp_Object desired_point;

  desired_point =
    internal_with_output_to_temp_buffer ("*Buffer List*",
					 list_buffers_1, files);

  if (NUMBERP (desired_point))
    {
      int count = specpdl_ptr - specpdl;
      record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
      Fset_buffer (build_string ("*Buffer List*"));
      SET_PT (XINT (desired_point));
      return unbind_to (count, Qnil);
    }
}

DEFUN ("kill-all-local-variables", Fkill_all_local_variables, Skill_all_local_variables,
  0, 0, 0,
  "Switch to Fundamental mode by killing current buffer's local variables.\n\