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

[Kenichi Handa]

Index: emacs/src/cmds.c
diff -c emacs/src/cmds.c:1.86 emacs/src/cmds.c:1.87
*** emacs/src/cmds.c:1.86       Mon Apr 22 18:33:36 2002
--- emacs/src/cmds.c    Sun Jun  2 21:37:29 2002
***************
*** 161,167 ****
  boundaries, either bind `inhibit-field-text-motion' to t, or use the
  `forward-line' function instead.  For instance, `(forward-line 0)' does
  the same thing as `(beginning-of-line)', except that it ignores field
! boundaries.  */) 
       (n)
       Lisp_Object n;
  {
--- 161,167 ----
  boundaries, either bind `inhibit-field-text-motion' to t, or use the
  `forward-line' function instead.  For instance, `(forward-line 0)' does
  the same thing as `(beginning-of-line)', except that it ignores field
! boundaries.  */)
       (n)
       Lisp_Object n;
  {
***************
*** 171,177 ****
      CHECK_NUMBER (n);
  
    SET_PT (XINT (Fline_beginning_position (n)));
!   
    return Qnil;
  }
  
--- 171,177 ----
      CHECK_NUMBER (n);
  
    SET_PT (XINT (Fline_beginning_position (n)));
! 
    return Qnil;
  }
  
***************
*** 299,308 ****
        && ! deleted_special
        && ! (PT == ZV || FETCH_BYTE (PT_BYTE) == '\n'))
      {
!       int column = current_column ();
  
        value = Fdelete_char (make_number (-XINT (n)), killflag);
!       i = column - current_column ();
        Finsert_char (make_number (' '), make_number (i), Qnil);
        /* Whitespace chars are ASCII chars, so we can simply subtract.  */
        SET_PT_BOTH (PT - i, PT_BYTE - i);
--- 299,308 ----
        && ! deleted_special
        && ! (PT == ZV || FETCH_BYTE (PT_BYTE) == '\n'))
      {
!       int column = (int) current_column (); /* iftc */
  
        value = Fdelete_char (make_number (-XINT (n)), killflag);
!       i = column - (int) current_column (); /* iftc */
        Finsert_char (make_number (' '), make_number (i), Qnil);
        /* Whitespace chars are ASCII chars, so we can simply subtract.  */
        SET_PT_BOTH (PT - i, PT_BYTE - i);
***************
*** 431,437 ****
              && ! (c2 == '\t'
                    && XINT (current_buffer->tab_width) > 0
                    && XFASTINT (current_buffer->tab_width) < 20
!                   && (target_clm = (current_column () 
                                      + XINT (Fchar_width (make_number (c)))),
                        target_clm % XFASTINT (current_buffer->tab_width)))))
        {
--- 431,437 ----
              && ! (c2 == '\t'
                    && XINT (current_buffer->tab_width) > 0
                    && XFASTINT (current_buffer->tab_width) < 20
!                   && (target_clm = ((int) current_column () /* iftc */
                                      + XINT (Fchar_width (make_number (c)))),
                        target_clm % XFASTINT (current_buffer->tab_width)))))
        {