/[emacs]/emacs/src/keyboard.c
ViewVC logotype

Diff of /emacs/src/keyboard.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.720 by jhd, Sun Jan 19 21:50:01 2003 UTC revision 1.721 by handa, Fri Jan 24 02:31:07 2003 UTC
# Line 1335  DEFUN ("abort-recursive-edit", Fabort_re Line 1335  DEFUN ("abort-recursive-edit", Fabort_re
1335  static int read_key_sequence P_ ((Lisp_Object *, int, Lisp_Object,  static int read_key_sequence P_ ((Lisp_Object *, int, Lisp_Object,
1336                                    int, int, int));                                    int, int, int));
1337  void safe_run_hooks P_ ((Lisp_Object));  void safe_run_hooks P_ ((Lisp_Object));
1338  static void adjust_point_for_property P_ ((int));  static void adjust_point_for_property P_ ((int, int));
1339    
1340  Lisp_Object  Lisp_Object
1341  command_loop_1 ()  command_loop_1 ()
# Line 1587  command_loop_1 () Line 1587  command_loop_1 ()
1587                      /* Put this before calling adjust_point_for_property                      /* Put this before calling adjust_point_for_property
1588                         so it will only get called once in any case.  */                         so it will only get called once in any case.  */
1589                      goto directly_done;                      goto directly_done;
1590                    adjust_point_for_property (last_point_position);                    adjust_point_for_property (last_point_position, 0);
1591                    already_adjusted = 1;                    already_adjusted = 1;
1592                    if (PT == last_point_position + 1                    if (PT == last_point_position + 1
1593                        && (dp                        && (dp
# Line 1621  command_loop_1 () Line 1621  command_loop_1 ()
1621                    lose = FETCH_CHAR (PT_BYTE);                    lose = FETCH_CHAR (PT_BYTE);
1622                    if (! NILP (Vpost_command_hook))                    if (! NILP (Vpost_command_hook))
1623                      goto directly_done;                      goto directly_done;
1624                    adjust_point_for_property (last_point_position);                    adjust_point_for_property (last_point_position, 0);
1625                    already_adjusted = 1;                    already_adjusted = 1;
1626                    if (PT == last_point_position - 1                    if (PT == last_point_position - 1
1627                        && (dp                        && (dp
# Line 1791  command_loop_1 () Line 1791  command_loop_1 ()
1791            && NILP (Vdisable_point_adjustment)            && NILP (Vdisable_point_adjustment)
1792            && NILP (Vglobal_disable_point_adjustment)            && NILP (Vglobal_disable_point_adjustment)
1793            && !already_adjusted)            && !already_adjusted)
1794          adjust_point_for_property (last_point_position);          adjust_point_for_property (last_point_position, MODIFF != prev_modiff);
1795    
1796        /* Install chars successfully executed in kbd macro.  */        /* Install chars successfully executed in kbd macro.  */
1797    
# Line 1817  extern Lisp_Object Qafter_string, Qbefor Line 1817  extern Lisp_Object Qafter_string, Qbefor
1817  extern Lisp_Object get_pos_property P_ ((Lisp_Object, Lisp_Object, Lisp_Object));  extern Lisp_Object get_pos_property P_ ((Lisp_Object, Lisp_Object, Lisp_Object));
1818    
1819  static void  static void
1820  adjust_point_for_property (last_pt)  adjust_point_for_property (last_pt, modified)
1821       int last_pt;       int last_pt;
1822         int modified;
1823  {  {
1824    int beg, end;    int beg, end;
1825    Lisp_Object val, overlay, tmp;    Lisp_Object val, overlay, tmp;
# Line 1894  adjust_point_for_property (last_pt) Line 1895  adjust_point_for_property (last_pt)
1895                check_composition = check_display = 1;                check_composition = check_display = 1;
1896              }              }
1897            xassert (PT == beg || PT == end);            xassert (PT == beg || PT == end);
1898            /* Pretend the area doesn't exist.  */            /* Pretend the area doesn't exist if the buffer is not
1899            if (!ellipsis && beg < end)               modified.  */
1900              if (!modified && !ellipsis && beg < end)
1901              {              {
1902                if (last_pt == beg && PT == end && end < ZV)                if (last_pt == beg && PT == end && end < ZV)
1903                  (check_composition = check_display = 1, SET_PT (end + 1));                  (check_composition = check_display = 1, SET_PT (end + 1));

Legend:
Removed from v.1.720  
changed lines
  Added in v.1.721

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26