comparison src/buffer.c @ 51939:d38453fdf2a0

(copy_overlays): Use EMACS_INT for positions. (Fswitch_to_buffer): Don't signal an error when switching to the same buffer in a dedicated window.

51938:20d4eb1de9b0

  XSETBUFFER (buffer, b);

  for (; list; list = list->next)
    {
      Lisp_Object overlay, start, end, old_overlay;
      int charpos;

      XSETMISC (old_overlay, list);
      charpos = marker_position (OVERLAY_START (old_overlay));
      start = Fmake_marker ();
      Fset_marker (start, make_number (charpos), buffer);

the window-buffer correspondences.  */)
     (buffer, norecord)
     Lisp_Object buffer, norecord;
{
  char *err;

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

  return switch_to_buffer_1 (buffer, norecord);

  int insertion = (after ? XFASTINT (arg3) == 0 : EQ (start, end));
  struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;

  overlay = Qnil;
  tail = NULL;

  if (!after)
    {
      /* We are being called before a change.
	 Scan the overlays to find the functions to call.  */

51939:d38453fdf2a0

  XSETBUFFER (buffer, b);

  for (; list; list = list->next)
    {
      Lisp_Object overlay, start, end, old_overlay;
      EMACS_INT charpos;

      XSETMISC (old_overlay, list);
      charpos = marker_position (OVERLAY_START (old_overlay));
      start = Fmake_marker ();
      Fset_marker (start, make_number (charpos), buffer);

the window-buffer correspondences.  */)
     (buffer, norecord)
     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);

  int insertion = (after ? XFASTINT (arg3) == 0 : EQ (start, end));
  struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;

  overlay = Qnil;
  tail = NULL;

  /* We used to run the functions as soon as we found them and only register
     them in last_overlay_modification_hooks for the purpose of the `after'
     case.  But running elisp code as we traverse the list of overlays is
     painful because the list can be modified by the elisp code so we had to
     copy at several places.  We now simply do a read-only traversal that
     only collects the functions to run and we run them afterwards.  It's
     simpler, especially since all the code was already there.  -stef  */

  if (!after)
    {
      /* We are being called before a change.
	 Scan the overlays to find the functions to call.  */