comparison src/buffer.c @ 90596:6823a91487f2

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 399-413) - Update from CVS - Rcirc update from Ryan Yeske - Merge from gnus--rel--5.10 - Miscellaneous tq-related fixes. * gnus--rel--5.10 (patch 126-127) - Merge from emacs--devo--0 - Update from CVS Revision: [e-mail]/emacs--unicode--0--patch-105

90595:fd59c4164a14

     Lisp_Object buffer, norecord;
{
  char *err;

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

  return switch_to_buffer_1 (buffer, norecord);

     (flag)
     Lisp_Object flag;
{
  struct Lisp_Marker *tail, *markers;
  struct buffer *other;
  int undo_enabled_p = !EQ (current_buffer->undo_list, Qt);
  int begv, zv;
  int narrowed = (BEG != BEGV || Z != ZV);
  int modified_p = !NILP (Fbuffer_modified_p (Qnil));

  if (current_buffer->base_buffer)
    error ("Cannot do `set-buffer-multibyte' on an indirect buffer");

  /* Do nothing if nothing actually changes.  */
  if (NILP (flag) == NILP (current_buffer->enable_multibyte_characters))
    return flag;

  /* It would be better to update the list,
     but this is good enough for now.  */
  if (undo_enabled_p)
    current_buffer->undo_list = Qt;

  /* If the cached position is for this buffer, clear it out.  */
  clear_charpos_cache (current_buffer);

  if (NILP (flag))

      /* Do this last, so it can calculate the new correspondences
	 between chars and bytes.  */
      set_intervals_multibyte (1);
    }

  if (undo_enabled_p)
    current_buffer->undo_list = Qnil;

  /* Changing the multibyteness of a buffer means that all windows
     showing that buffer must be updated thoroughly.  */
  current_buffer->prevent_redisplay_optimizations_p = 1;
  ++windows_or_buffers_changed;

90596:6823a91487f2

     Lisp_Object buffer, norecord;
{
  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);

  return switch_to_buffer_1 (buffer, norecord);

     (flag)
     Lisp_Object flag;
{
  struct Lisp_Marker *tail, *markers;
  struct buffer *other;
  int begv, zv;
  int narrowed = (BEG != BEGV || Z != ZV);
  int modified_p = !NILP (Fbuffer_modified_p (Qnil));
  Lisp_Object old_undo = current_buffer->undo_list;
  struct gcpro gcpro1;

  if (current_buffer->base_buffer)
    error ("Cannot do `set-buffer-multibyte' on an indirect buffer");

  /* Do nothing if nothing actually changes.  */
  if (NILP (flag) == NILP (current_buffer->enable_multibyte_characters))
    return flag;

  GCPRO1 (old_undo);

  /* Don't record these buffer changes.  We will put a special undo entry
     instead.  */
  current_buffer->undo_list = Qt;

  /* If the cached position is for this buffer, clear it out.  */
  clear_charpos_cache (current_buffer);

  if (NILP (flag))

      /* Do this last, so it can calculate the new correspondences
	 between chars and bytes.  */
      set_intervals_multibyte (1);
    }

  if (!EQ (old_undo, Qt))
    {
      /* Represent all the above changes by a special undo entry.  */
      extern Lisp_Object Qapply;
      current_buffer->undo_list = Fcons (list3 (Qapply,
						intern ("set-buffer-multibyte"),
						NILP (flag) ? Qt : Qnil),
					 old_undo);
    }

  UNGCPRO;

  /* Changing the multibyteness of a buffer means that all windows
     showing that buffer must be updated thoroughly.  */
  current_buffer->prevent_redisplay_optimizations_p = 1;
  ++windows_or_buffers_changed;