diff options
| author | Thien-Thi Nguyen | 2002-06-03 01:37:29 +0000 |
|---|---|---|
| committer | Thien-Thi Nguyen | 2002-06-03 01:37:29 +0000 |
| commit | a731cae28ec4cdc487467b08c2df5e082ff6c0a6 (patch) | |
| tree | 5e4e5a36d5e235d8e7619572825e4b8185cd4d3b /src/cmds.c | |
| parent | 8e11578b9a2622db1c8012669b1df29871fdca71 (diff) | |
| download | emacs-a731cae28ec4cdc487467b08c2df5e082ff6c0a6.tar.gz emacs-a731cae28ec4cdc487467b08c2df5e082ff6c0a6.zip | |
(Fdelete_backward_char, internal_self_insert): Cast
`current_column' return value to int.
Diffstat (limited to 'src/cmds.c')
| -rw-r--r-- | src/cmds.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cmds.c b/src/cmds.c index 40990d074b8..912c1e4a98f 100644 --- a/src/cmds.c +++ b/src/cmds.c | |||
| @@ -161,7 +161,7 @@ starts at a field boundary, point does not move. To ignore field | |||
| 161 | boundaries, either bind `inhibit-field-text-motion' to t, or use the | 161 | boundaries, either bind `inhibit-field-text-motion' to t, or use the |
| 162 | `forward-line' function instead. For instance, `(forward-line 0)' does | 162 | `forward-line' function instead. For instance, `(forward-line 0)' does |
| 163 | the same thing as `(beginning-of-line)', except that it ignores field | 163 | the same thing as `(beginning-of-line)', except that it ignores field |
| 164 | boundaries. */) | 164 | boundaries. */) |
| 165 | (n) | 165 | (n) |
| 166 | Lisp_Object n; | 166 | Lisp_Object n; |
| 167 | { | 167 | { |
| @@ -171,7 +171,7 @@ boundaries. */) | |||
| 171 | CHECK_NUMBER (n); | 171 | CHECK_NUMBER (n); |
| 172 | 172 | ||
| 173 | SET_PT (XINT (Fline_beginning_position (n))); | 173 | SET_PT (XINT (Fline_beginning_position (n))); |
| 174 | 174 | ||
| 175 | return Qnil; | 175 | return Qnil; |
| 176 | } | 176 | } |
| 177 | 177 | ||
| @@ -299,10 +299,10 @@ N was explicitly specified. */) | |||
| 299 | && ! deleted_special | 299 | && ! deleted_special |
| 300 | && ! (PT == ZV || FETCH_BYTE (PT_BYTE) == '\n')) | 300 | && ! (PT == ZV || FETCH_BYTE (PT_BYTE) == '\n')) |
| 301 | { | 301 | { |
| 302 | int column = current_column (); | 302 | int column = (int) current_column (); /* iftc */ |
| 303 | 303 | ||
| 304 | value = Fdelete_char (make_number (-XINT (n)), killflag); | 304 | value = Fdelete_char (make_number (-XINT (n)), killflag); |
| 305 | i = column - current_column (); | 305 | i = column - (int) current_column (); /* iftc */ |
| 306 | Finsert_char (make_number (' '), make_number (i), Qnil); | 306 | Finsert_char (make_number (' '), make_number (i), Qnil); |
| 307 | /* Whitespace chars are ASCII chars, so we can simply subtract. */ | 307 | /* Whitespace chars are ASCII chars, so we can simply subtract. */ |
| 308 | SET_PT_BOTH (PT - i, PT_BYTE - i); | 308 | SET_PT_BOTH (PT - i, PT_BYTE - i); |
| @@ -431,7 +431,7 @@ internal_self_insert (c, noautofill) | |||
| 431 | && ! (c2 == '\t' | 431 | && ! (c2 == '\t' |
| 432 | && XINT (current_buffer->tab_width) > 0 | 432 | && XINT (current_buffer->tab_width) > 0 |
| 433 | && XFASTINT (current_buffer->tab_width) < 20 | 433 | && XFASTINT (current_buffer->tab_width) < 20 |
| 434 | && (target_clm = (current_column () | 434 | && (target_clm = ((int) current_column () /* iftc */ |
| 435 | + XINT (Fchar_width (make_number (c)))), | 435 | + XINT (Fchar_width (make_number (c)))), |
| 436 | target_clm % XFASTINT (current_buffer->tab_width))))) | 436 | target_clm % XFASTINT (current_buffer->tab_width))))) |
| 437 | { | 437 | { |