diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/intervals.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 89e054f62b0..21475dd6a6a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-03-18 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-03-18 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * intervals.c (interval_start_pos): Now static. | ||
| 4 | |||
| 3 | * intervals.h (CHECK_TOTAL_LENGTH): Avoid empty "else". | 5 | * intervals.h (CHECK_TOTAL_LENGTH): Avoid empty "else". |
| 4 | 6 | ||
| 5 | * atimer.c (start_atimer, append_atimer_lists, set_alarm): Rename | 7 | * atimer.c (start_atimer, append_atimer_lists, set_alarm): Rename |
diff --git a/src/intervals.c b/src/intervals.c index 12b2789cc77..351677ad27e 100644 --- a/src/intervals.c +++ b/src/intervals.c | |||
| @@ -586,7 +586,7 @@ split_interval_left (INTERVAL interval, EMACS_INT offset) | |||
| 586 | Don't use this function on an interval which is the child | 586 | Don't use this function on an interval which is the child |
| 587 | of another interval! */ | 587 | of another interval! */ |
| 588 | 588 | ||
| 589 | int | 589 | static int |
| 590 | interval_start_pos (INTERVAL source) | 590 | interval_start_pos (INTERVAL source) |
| 591 | { | 591 | { |
| 592 | Lisp_Object parent; | 592 | Lisp_Object parent; |
| @@ -2559,4 +2559,3 @@ set_intervals_multibyte (int multi_flag) | |||
| 2559 | set_intervals_multibyte_1 (BUF_INTERVALS (current_buffer), multi_flag, | 2559 | set_intervals_multibyte_1 (BUF_INTERVALS (current_buffer), multi_flag, |
| 2560 | BEG, BEG_BYTE, Z, Z_BYTE); | 2560 | BEG, BEG_BYTE, Z, Z_BYTE); |
| 2561 | } | 2561 | } |
| 2562 | |||