diff options
| author | Paul Eggert | 2012-08-17 14:12:11 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-08-17 14:12:11 -0700 |
| commit | 0c94c8d603031f6b665ae7f3136ca77fb573fd7e (patch) | |
| tree | fabdd332bf09c4ea02198aa36a6a7bdab7e43397 /src/alloc.c | |
| parent | ee21815118944347ad0c45d47af651e7283709d2 (diff) | |
| download | emacs-0c94c8d603031f6b665ae7f3136ca77fb573fd7e.tar.gz emacs-0c94c8d603031f6b665ae7f3136ca77fb573fd7e.zip | |
A few more naming-convention fixes for getters and setters.
* buffer.c (set_buffer_overlays_before): Move here from buffer.h,
and rename from buffer_overlays_set_before.
(set_buffer_overlays_after): Move here from buffer.h, and rename
from buffer_overlays_set_after.
* buffer.h (buffer_intervals): Rename from buffer_get_intervals.
All uses changed.
(set_buffer_intervals): Rename from buffer_set_intervals.
* intervals.c (set_interval_object): Move here from intervals.h,
and rename from interval_set_object.
(set_interval_left): Move here from intervals.h, and rename from
interval_set_left.
(set_interval_right): Move here from intervals.h, and rename from
interval_set_right.
(copy_interval_parent): Move here from intervals.h, and rename from
interval_copy_parent.
* intervals.h (set_interval_parent): Rename from interval_set_parent.
(set_interval_plist): Rename from interval_set_plist.
Return void, not Lisp_Object, since no caller uses the result.
* lisp.h (string_intervals): Rename from string_get_intervals.
(set_string_intervals): Rename from string_set_intervals.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/alloc.c b/src/alloc.c index 1d484d4a322..522f33f5379 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -5836,7 +5836,7 @@ mark_buffer (struct buffer *buffer) | |||
| 5836 | 5836 | ||
| 5837 | /* ...but there are some buffer-specific things. */ | 5837 | /* ...but there are some buffer-specific things. */ |
| 5838 | 5838 | ||
| 5839 | MARK_INTERVAL_TREE (buffer_get_intervals (buffer)); | 5839 | MARK_INTERVAL_TREE (buffer_intervals (buffer)); |
| 5840 | 5840 | ||
| 5841 | /* For now, we just don't mark the undo_list. It's done later in | 5841 | /* For now, we just don't mark the undo_list. It's done later in |
| 5842 | a special way just before the sweep phase, and after stripping | 5842 | a special way just before the sweep phase, and after stripping |
| @@ -6090,7 +6090,7 @@ mark_object (Lisp_Object arg) | |||
| 6090 | } | 6090 | } |
| 6091 | if (!PURE_POINTER_P (XSTRING (ptr->name))) | 6091 | if (!PURE_POINTER_P (XSTRING (ptr->name))) |
| 6092 | MARK_STRING (XSTRING (ptr->name)); | 6092 | MARK_STRING (XSTRING (ptr->name)); |
| 6093 | MARK_INTERVAL_TREE (string_get_intervals (ptr->name)); | 6093 | MARK_INTERVAL_TREE (string_intervals (ptr->name)); |
| 6094 | 6094 | ||
| 6095 | ptr = ptr->next; | 6095 | ptr = ptr->next; |
| 6096 | if (ptr) | 6096 | if (ptr) |
| @@ -6405,7 +6405,7 @@ gc_sweep (void) | |||
| 6405 | { | 6405 | { |
| 6406 | if (!iblk->intervals[i].gcmarkbit) | 6406 | if (!iblk->intervals[i].gcmarkbit) |
| 6407 | { | 6407 | { |
| 6408 | interval_set_parent (&iblk->intervals[i], interval_free_list); | 6408 | set_interval_parent (&iblk->intervals[i], interval_free_list); |
| 6409 | interval_free_list = &iblk->intervals[i]; | 6409 | interval_free_list = &iblk->intervals[i]; |
| 6410 | this_free++; | 6410 | this_free++; |
| 6411 | } | 6411 | } |