comparison src/dispnew.c @ 16039:855c8d8ba0f0

Change all references from point to PT.

16038:8cd162ceb1dc

  /* Give up if character is invisible. */
  /* Give up if character has a face property.
     At the moment we only lose at end of line or end of buffer
     and only with faces that have some background */
  /* Instead of wasting time, give up if character has any text properties */
      || ! NILP (Ftext_properties_at (make_number (point - 1), Qnil))
#endif

  /* Give up if w is minibuffer and a message is being displayed there */
      || (MINI_WINDOW_P (w) && echo_area_glyphs))
    return 0;

    int face = 0;
#ifdef HAVE_FACES
    int dummy;

    if (FRAME_WINDOW_P (frame) || FRAME_MSDOS_P (frame))
      face = compute_char_face (frame, w, point - 1, -1, -1, &dummy, point, 0);
#endif
    current_frame->glyphs[vpos][hpos] = MAKE_GLYPH (frame, g, face);
    current_frame->charstarts[vpos][hpos] = point - 1;
    /* Record the entry for after the newly inserted character.  */
    current_frame->charstarts[vpos][hpos + 1] = point;
    adjust_window_charstarts (w, vpos, 1);
  }
  unchanged_modified = MODIFF;
  beg_unchanged = GPT - BEG;
  XSETFASTINT (w->last_point, point);
  XSETFASTINT (w->last_point_x, hpos);
  XSETFASTINT (w->last_modified, MODIFF);

  reassert_line_highlight (0, vpos);
  write_glyphs (&current_frame->glyphs[vpos][hpos], 1);

#ifdef USE_TEXT_PROPERTIES
  /* Don't use direct output next to an invisible character
     since we might need to do something special.  */

  XSETFASTINT (position, point);
  if (XFASTINT (position) < ZV
      && ! NILP (Fget_char_property (position,
				     Qinvisible,
				     selected_window)))
    return 0;

  XSETFASTINT (position, point - 1);
  if (XFASTINT (position) >= BEGV
      && ! NILP (Fget_char_property (position,
				     Qinvisible,
				     selected_window)))
    return 0;
#endif

  FRAME_CURSOR_X (frame) += n;
  XSETFASTINT (w->last_point_x, FRAME_CURSOR_X (frame));
  XSETFASTINT (w->last_point, point);
  cursor_to (FRAME_CURSOR_Y (frame), FRAME_CURSOR_X (frame));
  fflush (stdout);

  return 1;
}

16039:855c8d8ba0f0

  /* Give up if character is invisible. */
  /* Give up if character has a face property.
     At the moment we only lose at end of line or end of buffer
     and only with faces that have some background */
  /* Instead of wasting time, give up if character has any text properties */
      || ! NILP (Ftext_properties_at (make_number (PT - 1), Qnil))
#endif

  /* Give up if w is minibuffer and a message is being displayed there */
      || (MINI_WINDOW_P (w) && echo_area_glyphs))
    return 0;

    int face = 0;
#ifdef HAVE_FACES
    int dummy;

    if (FRAME_WINDOW_P (frame) || FRAME_MSDOS_P (frame))
      face = compute_char_face (frame, w, PT - 1, -1, -1, &dummy, PT, 0);
#endif
    current_frame->glyphs[vpos][hpos] = MAKE_GLYPH (frame, g, face);
    current_frame->charstarts[vpos][hpos] = PT - 1;
    /* Record the entry for after the newly inserted character.  */
    current_frame->charstarts[vpos][hpos + 1] = PT;
    adjust_window_charstarts (w, vpos, 1);
  }
  unchanged_modified = MODIFF;
  beg_unchanged = GPT - BEG;
  XSETFASTINT (w->last_point, PT);
  XSETFASTINT (w->last_point_x, hpos);
  XSETFASTINT (w->last_modified, MODIFF);

  reassert_line_highlight (0, vpos);
  write_glyphs (&current_frame->glyphs[vpos][hpos], 1);

#ifdef USE_TEXT_PROPERTIES
  /* Don't use direct output next to an invisible character
     since we might need to do something special.  */

  XSETFASTINT (position, PT);
  if (XFASTINT (position) < ZV
      && ! NILP (Fget_char_property (position,
				     Qinvisible,
				     selected_window)))
    return 0;

  XSETFASTINT (position, PT - 1);
  if (XFASTINT (position) >= BEGV
      && ! NILP (Fget_char_property (position,
				     Qinvisible,
				     selected_window)))
    return 0;
#endif

  FRAME_CURSOR_X (frame) += n;
  XSETFASTINT (w->last_point_x, FRAME_CURSOR_X (frame));
  XSETFASTINT (w->last_point, PT);
  cursor_to (FRAME_CURSOR_Y (frame), FRAME_CURSOR_X (frame));
  fflush (stdout);

  return 1;
}