[Emacs-diffs] Changes to emacs/src/keyboard.c

[Kenichi Handa]

Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.720 emacs/src/keyboard.c:1.721
*** emacs/src/keyboard.c:1.720  Sun Jan 19 16:50:01 2003
--- emacs/src/keyboard.c        Thu Jan 23 21:31:07 2003
***************
*** 1335,1341 ****
  static int read_key_sequence P_ ((Lisp_Object *, int, Lisp_Object,
                                  int, int, int));
  void safe_run_hooks P_ ((Lisp_Object));
! static void adjust_point_for_property P_ ((int));
  
  Lisp_Object
  command_loop_1 ()
--- 1335,1341 ----
  static int read_key_sequence P_ ((Lisp_Object *, int, Lisp_Object,
                                  int, int, int));
  void safe_run_hooks P_ ((Lisp_Object));
! static void adjust_point_for_property P_ ((int, int));
  
  Lisp_Object
  command_loop_1 ()
***************
*** 1587,1593 ****
                    /* Put this before calling adjust_point_for_property
                       so it will only get called once in any case.  */
                    goto directly_done;
!                 adjust_point_for_property (last_point_position);
                  already_adjusted = 1;
                  if (PT == last_point_position + 1
                      && (dp
--- 1587,1593 ----
                    /* Put this before calling adjust_point_for_property
                       so it will only get called once in any case.  */
                    goto directly_done;
!                 adjust_point_for_property (last_point_position, 0);
                  already_adjusted = 1;
                  if (PT == last_point_position + 1
                      && (dp
***************
*** 1621,1627 ****
                  lose = FETCH_CHAR (PT_BYTE);
                  if (! NILP (Vpost_command_hook))
                    goto directly_done;
!                 adjust_point_for_property (last_point_position);
                  already_adjusted = 1;
                  if (PT == last_point_position - 1
                      && (dp
--- 1621,1627 ----
                  lose = FETCH_CHAR (PT_BYTE);
                  if (! NILP (Vpost_command_hook))
                    goto directly_done;
!                 adjust_point_for_property (last_point_position, 0);
                  already_adjusted = 1;
                  if (PT == last_point_position - 1
                      && (dp
***************
*** 1791,1797 ****
          && NILP (Vdisable_point_adjustment)
          && NILP (Vglobal_disable_point_adjustment)
          && !already_adjusted)
!       adjust_point_for_property (last_point_position);
  
        /* Install chars successfully executed in kbd macro.  */
  
--- 1791,1797 ----
          && NILP (Vdisable_point_adjustment)
          && NILP (Vglobal_disable_point_adjustment)
          && !already_adjusted)
!       adjust_point_for_property (last_point_position, MODIFF != prev_modiff);
  
        /* Install chars successfully executed in kbd macro.  */
  
***************
*** 1817,1824 ****
  extern Lisp_Object get_pos_property P_ ((Lisp_Object, Lisp_Object, 
Lisp_Object));
  
  static void
! adjust_point_for_property (last_pt)
       int last_pt;
  {
    int beg, end;
    Lisp_Object val, overlay, tmp;
--- 1817,1825 ----
  extern Lisp_Object get_pos_property P_ ((Lisp_Object, Lisp_Object, 
Lisp_Object));
  
  static void
! adjust_point_for_property (last_pt, modified)
       int last_pt;
+      int modified;
  {
    int beg, end;
    Lisp_Object val, overlay, tmp;
***************
*** 1894,1901 ****
              check_composition = check_display = 1;
            }
          xassert (PT == beg || PT == end);
!         /* Pretend the area doesn't exist.  */
!         if (!ellipsis && beg < end)
            {
              if (last_pt == beg && PT == end && end < ZV)
                (check_composition = check_display = 1, SET_PT (end + 1));
--- 1895,1903 ----
              check_composition = check_display = 1;
            }
          xassert (PT == beg || PT == end);
!         /* Pretend the area doesn't exist if the buffer is not
!            modified.  */
!         if (!modified && !ellipsis && beg < end)
            {
              if (last_pt == beg && PT == end && end < ZV)
                (check_composition = check_display = 1, SET_PT (end + 1));