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

[Richard M. Stallman]

Index: emacs/src/indent.c
diff -c emacs/src/indent.c:1.152 emacs/src/indent.c:1.153
*** emacs/src/indent.c:1.152    Sun Jun  2 21:52:02 2002
--- emacs/src/indent.c  Thu Jul 11 13:38:49 2002
***************
*** 47,53 ****
     Some things in set last_known_column_point to -1
     to mark the memorized value as invalid.  */
  
! float last_known_column;
  
  /* Value of point when current_column was called.  */
  
--- 47,53 ----
     Some things in set last_known_column_point to -1
     to mark the memorized value as invalid.  */
  
! double last_known_column;
  
  /* Value of point when current_column was called.  */
  
***************
*** 57,64 ****
  
  int last_known_column_modified;
  
! static float current_column_1 P_ ((void));
! static float position_indentation P_ ((int));
  
  /* Cache of beginning of line found by the last call of
     current_column. */
--- 57,64 ----
  
  int last_known_column_modified;
  
! static double current_column_1 P_ ((void));
! static double position_indentation P_ ((int));
  
  /* Cache of beginning of line found by the last call of
     current_column. */
***************
*** 355,361 ****
    last_known_column_point = 0;
  }
  
! float
  current_column ()
  {
    register int col;
--- 355,361 ----
    last_known_column_point = 0;
  }
  
! double
  current_column ()
  {
    register int col;
***************
*** 502,508 ****
     This function handles characters that are invisible
     due to text properties or overlays.  */
  
! static float
  current_column_1 ()
  {
    register int tab_width = XINT (current_buffer->tab_width);
--- 502,508 ----
     This function handles characters that are invisible
     due to text properties or overlays.  */
  
! static double
  current_column_1 ()
  {
    register int tab_width = XINT (current_buffer->tab_width);
***************
*** 652,658 ****
     If BEG is nil, that stands for the beginning of STRING.
     If END is nil, that stands for the end of STRING.  */
  
! static float
  string_display_width (string, beg, end)
       Lisp_Object string, beg, end;
  {
--- 652,658 ----
     If BEG is nil, that stands for the beginning of STRING.
     If END is nil, that stands for the end of STRING.  */
  
! static double
  string_display_width (string, beg, end)
       Lisp_Object string, beg, end;
  {
***************
*** 778,784 ****
  }
  
  
! static float position_indentation P_ ((int));
  
  DEFUN ("current-indentation", Fcurrent_indentation, Scurrent_indentation,
         0, 0, 0,
--- 778,784 ----
  }
  
  
! static double position_indentation P_ ((int));
  
  DEFUN ("current-indentation", Fcurrent_indentation, Scurrent_indentation,
         0, 0, 0,
***************
*** 797,803 ****
    return val;
  }
  
! static float
  position_indentation (pos_byte)
       register int pos_byte;
  {
--- 797,803 ----
    return val;
  }
  
! static double
  position_indentation (pos_byte)
       register int pos_byte;
  {
***************
*** 890,898 ****
  int
  indented_beyond_p (pos, pos_byte, column)
       int pos, pos_byte;
!      float column;
  {
!   float val;
    int opoint = PT, opoint_byte = PT_BYTE;
  
    SET_PT_BOTH (pos, pos_byte);
--- 890,898 ----
  int
  indented_beyond_p (pos, pos_byte, column)
       int pos, pos_byte;
!      double column;
  {
!   double val;
    int opoint = PT, opoint_byte = PT_BYTE;
  
    SET_PT_BOTH (pos, pos_byte);
***************
*** 1612,1618 ****
                {
                  if (selective > 0
                      && indented_beyond_p (pos, pos_byte,
!                                             (float) selective)) /* iftc */
                    {
                      /* If (pos == to), we don't have to take care of
                         selective display.  */
--- 1612,1618 ----
                {
                  if (selective > 0
                      && indented_beyond_p (pos, pos_byte,
!                                             (double) selective)) /* iftc */
                    {
                      /* If (pos == to), we don't have to take care of
                         selective display.  */
***************
*** 1628,1634 ****
                            }
                          while (pos < to
                                 && indented_beyond_p (pos, pos_byte,
!                                                        (float) selective)); 
/* iftc */
                          /* Allow for the " ..." that is displayed for them. */
                          if (selective_rlen)
                            {
--- 1628,1634 ----
                            }
                          while (pos < to
                                 && indented_beyond_p (pos, pos_byte,
!                                                        (double) selective)); 
/* iftc */
                          /* Allow for the " ..." that is displayed for them. */
                          if (selective_rlen)
                            {
***************
*** 1878,1884 ****
                 && ((selective > 0
                      && indented_beyond_p (XFASTINT (prevline),
                                            CHAR_TO_BYTE (XFASTINT (prevline)),
!                                           (float) selective)) /* iftc */
                     /* watch out for newlines with `invisible' property */
                     || (propval = Fget_char_property (prevline,
                                                       Qinvisible,
--- 1878,1884 ----
                 && ((selective > 0
                      && indented_beyond_p (XFASTINT (prevline),
                                            CHAR_TO_BYTE (XFASTINT (prevline)),
!                                           (double) selective)) /* iftc */
                     /* watch out for newlines with `invisible' property */
                     || (propval = Fget_char_property (prevline,
                                                       Qinvisible,
***************
*** 1938,1944 ****
             && ((selective > 0
                  && indented_beyond_p (XFASTINT (prevline),
                                        CHAR_TO_BYTE (XFASTINT (prevline)),
!                                       (float) selective)) /* iftc */
                 /* watch out for newlines with `invisible' property */
                 || (propval = Fget_char_property (prevline, Qinvisible,
                                                   text_prop_object),
--- 1938,1944 ----
             && ((selective > 0
                  && indented_beyond_p (XFASTINT (prevline),
                                        CHAR_TO_BYTE (XFASTINT (prevline)),
!                                       (double) selective)) /* iftc */
                 /* watch out for newlines with `invisible' property */
                 || (propval = Fget_char_property (prevline, Qinvisible,
                                                   text_prop_object),