diff options
| author | Richard M. Stallman | 2002-07-11 17:38:49 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2002-07-11 17:38:49 +0000 |
| commit | 76e20cb028ce32295d2bbf9027e152dc267e0ac1 (patch) | |
| tree | 2a017354842208aa50e9d94b2a775f87f9aad363 | |
| parent | a67e162b88461f46b758f5a78bd2bb94478bf9c6 (diff) | |
| download | emacs-76e20cb028ce32295d2bbf9027e152dc267e0ac1.tar.gz emacs-76e20cb028ce32295d2bbf9027e152dc267e0ac1.zip | |
(last_known_column): Declare as double, not float.
(current_column, current_column_1, string_display_width)
(position_indentation): Return `double'.
(indented_beyond_p): Arg `column' is `double'. Callers changed.
| -rw-r--r-- | src/indent.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/indent.c b/src/indent.c index 521f27f15d3..ae1f68806d3 100644 --- a/src/indent.c +++ b/src/indent.c | |||
| @@ -47,7 +47,7 @@ int indent_tabs_mode; | |||
| 47 | Some things in set last_known_column_point to -1 | 47 | Some things in set last_known_column_point to -1 |
| 48 | to mark the memorized value as invalid. */ | 48 | to mark the memorized value as invalid. */ |
| 49 | 49 | ||
| 50 | float last_known_column; | 50 | double last_known_column; |
| 51 | 51 | ||
| 52 | /* Value of point when current_column was called. */ | 52 | /* Value of point when current_column was called. */ |
| 53 | 53 | ||
| @@ -57,8 +57,8 @@ int last_known_column_point; | |||
| 57 | 57 | ||
| 58 | int last_known_column_modified; | 58 | int last_known_column_modified; |
| 59 | 59 | ||
| 60 | static float current_column_1 P_ ((void)); | 60 | static double current_column_1 P_ ((void)); |
| 61 | static float position_indentation P_ ((int)); | 61 | static double position_indentation P_ ((int)); |
| 62 | 62 | ||
| 63 | /* Cache of beginning of line found by the last call of | 63 | /* Cache of beginning of line found by the last call of |
| 64 | current_column. */ | 64 | current_column. */ |
| @@ -355,7 +355,7 @@ invalidate_current_column () | |||
| 355 | last_known_column_point = 0; | 355 | last_known_column_point = 0; |
| 356 | } | 356 | } |
| 357 | 357 | ||
| 358 | float | 358 | double |
| 359 | current_column () | 359 | current_column () |
| 360 | { | 360 | { |
| 361 | register int col; | 361 | register int col; |
| @@ -502,7 +502,7 @@ current_column () | |||
| 502 | This function handles characters that are invisible | 502 | This function handles characters that are invisible |
| 503 | due to text properties or overlays. */ | 503 | due to text properties or overlays. */ |
| 504 | 504 | ||
| 505 | static float | 505 | static double |
| 506 | current_column_1 () | 506 | current_column_1 () |
| 507 | { | 507 | { |
| 508 | register int tab_width = XINT (current_buffer->tab_width); | 508 | register int tab_width = XINT (current_buffer->tab_width); |
| @@ -652,7 +652,7 @@ current_column_1 () | |||
| 652 | If BEG is nil, that stands for the beginning of STRING. | 652 | If BEG is nil, that stands for the beginning of STRING. |
| 653 | If END is nil, that stands for the end of STRING. */ | 653 | If END is nil, that stands for the end of STRING. */ |
| 654 | 654 | ||
| 655 | static float | 655 | static double |
| 656 | string_display_width (string, beg, end) | 656 | string_display_width (string, beg, end) |
| 657 | Lisp_Object string, beg, end; | 657 | Lisp_Object string, beg, end; |
| 658 | { | 658 | { |
| @@ -778,7 +778,7 @@ even if that goes past COLUMN; by default, MININUM is zero. */) | |||
| 778 | } | 778 | } |
| 779 | 779 | ||
| 780 | 780 | ||
| 781 | static float position_indentation P_ ((int)); | 781 | static double position_indentation P_ ((int)); |
| 782 | 782 | ||
| 783 | DEFUN ("current-indentation", Fcurrent_indentation, Scurrent_indentation, | 783 | DEFUN ("current-indentation", Fcurrent_indentation, Scurrent_indentation, |
| 784 | 0, 0, 0, | 784 | 0, 0, 0, |
| @@ -797,7 +797,7 @@ following any initial whitespace. */) | |||
| 797 | return val; | 797 | return val; |
| 798 | } | 798 | } |
| 799 | 799 | ||
| 800 | static float | 800 | static double |
| 801 | position_indentation (pos_byte) | 801 | position_indentation (pos_byte) |
| 802 | register int pos_byte; | 802 | register int pos_byte; |
| 803 | { | 803 | { |
| @@ -890,9 +890,9 @@ position_indentation (pos_byte) | |||
| 890 | int | 890 | int |
| 891 | indented_beyond_p (pos, pos_byte, column) | 891 | indented_beyond_p (pos, pos_byte, column) |
| 892 | int pos, pos_byte; | 892 | int pos, pos_byte; |
| 893 | float column; | 893 | double column; |
| 894 | { | 894 | { |
| 895 | float val; | 895 | double val; |
| 896 | int opoint = PT, opoint_byte = PT_BYTE; | 896 | int opoint = PT, opoint_byte = PT_BYTE; |
| 897 | 897 | ||
| 898 | SET_PT_BOTH (pos, pos_byte); | 898 | SET_PT_BOTH (pos, pos_byte); |
| @@ -1612,7 +1612,7 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width, | |||
| 1612 | { | 1612 | { |
| 1613 | if (selective > 0 | 1613 | if (selective > 0 |
| 1614 | && indented_beyond_p (pos, pos_byte, | 1614 | && indented_beyond_p (pos, pos_byte, |
| 1615 | (float) selective)) /* iftc */ | 1615 | (double) selective)) /* iftc */ |
| 1616 | { | 1616 | { |
| 1617 | /* If (pos == to), we don't have to take care of | 1617 | /* If (pos == to), we don't have to take care of |
| 1618 | selective display. */ | 1618 | selective display. */ |
| @@ -1628,7 +1628,7 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width, | |||
| 1628 | } | 1628 | } |
| 1629 | while (pos < to | 1629 | while (pos < to |
| 1630 | && indented_beyond_p (pos, pos_byte, | 1630 | && indented_beyond_p (pos, pos_byte, |
| 1631 | (float) selective)); /* iftc */ | 1631 | (double) selective)); /* iftc */ |
| 1632 | /* Allow for the " ..." that is displayed for them. */ | 1632 | /* Allow for the " ..." that is displayed for them. */ |
| 1633 | if (selective_rlen) | 1633 | if (selective_rlen) |
| 1634 | { | 1634 | { |
| @@ -1878,7 +1878,7 @@ vmotion (from, vtarget, w) | |||
| 1878 | && ((selective > 0 | 1878 | && ((selective > 0 |
| 1879 | && indented_beyond_p (XFASTINT (prevline), | 1879 | && indented_beyond_p (XFASTINT (prevline), |
| 1880 | CHAR_TO_BYTE (XFASTINT (prevline)), | 1880 | CHAR_TO_BYTE (XFASTINT (prevline)), |
| 1881 | (float) selective)) /* iftc */ | 1881 | (double) selective)) /* iftc */ |
| 1882 | /* watch out for newlines with `invisible' property */ | 1882 | /* watch out for newlines with `invisible' property */ |
| 1883 | || (propval = Fget_char_property (prevline, | 1883 | || (propval = Fget_char_property (prevline, |
| 1884 | Qinvisible, | 1884 | Qinvisible, |
| @@ -1938,7 +1938,7 @@ vmotion (from, vtarget, w) | |||
| 1938 | && ((selective > 0 | 1938 | && ((selective > 0 |
| 1939 | && indented_beyond_p (XFASTINT (prevline), | 1939 | && indented_beyond_p (XFASTINT (prevline), |
| 1940 | CHAR_TO_BYTE (XFASTINT (prevline)), | 1940 | CHAR_TO_BYTE (XFASTINT (prevline)), |
| 1941 | (float) selective)) /* iftc */ | 1941 | (double) selective)) /* iftc */ |
| 1942 | /* watch out for newlines with `invisible' property */ | 1942 | /* watch out for newlines with `invisible' property */ |
| 1943 | || (propval = Fget_char_property (prevline, Qinvisible, | 1943 | || (propval = Fget_char_property (prevline, Qinvisible, |
| 1944 | text_prop_object), | 1944 | text_prop_object), |