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/buffer.h | |
| 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/buffer.h')
| -rw-r--r-- | src/buffer.h | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/buffer.h b/src/buffer.h index 7a6bddee5ec..507b15e8b4a 100644 --- a/src/buffer.h +++ b/src/buffer.h | |||
| @@ -953,7 +953,7 @@ extern Lisp_Object Qfirst_change_hook; | |||
| 953 | /* Get text properties of B. */ | 953 | /* Get text properties of B. */ |
| 954 | 954 | ||
| 955 | BUFFER_INLINE INTERVAL | 955 | BUFFER_INLINE INTERVAL |
| 956 | buffer_get_intervals (struct buffer *b) | 956 | buffer_intervals (struct buffer *b) |
| 957 | { | 957 | { |
| 958 | eassert (b->text != NULL); | 958 | eassert (b->text != NULL); |
| 959 | return b->text->intervals; | 959 | return b->text->intervals; |
| @@ -962,26 +962,12 @@ buffer_get_intervals (struct buffer *b) | |||
| 962 | /* Set text properties of B to I. */ | 962 | /* Set text properties of B to I. */ |
| 963 | 963 | ||
| 964 | BUFFER_INLINE void | 964 | BUFFER_INLINE void |
| 965 | buffer_set_intervals (struct buffer *b, INTERVAL i) | 965 | set_buffer_intervals (struct buffer *b, INTERVAL i) |
| 966 | { | 966 | { |
| 967 | eassert (b->text != NULL); | 967 | eassert (b->text != NULL); |
| 968 | b->text->intervals = i; | 968 | b->text->intervals = i; |
| 969 | } | 969 | } |
| 970 | 970 | ||
| 971 | /* Set an appropriate overlay of B. */ | ||
| 972 | |||
| 973 | BUFFER_INLINE void | ||
| 974 | buffer_set_overlays_before (struct buffer *b, struct Lisp_Overlay *o) | ||
| 975 | { | ||
| 976 | b->overlays_before = o; | ||
| 977 | } | ||
| 978 | |||
| 979 | BUFFER_INLINE void | ||
| 980 | buffer_set_overlays_after (struct buffer *b, struct Lisp_Overlay *o) | ||
| 981 | { | ||
| 982 | b->overlays_after = o; | ||
| 983 | } | ||
| 984 | |||
| 985 | /* Non-zero if current buffer has overlays. */ | 971 | /* Non-zero if current buffer has overlays. */ |
| 986 | 972 | ||
| 987 | BUFFER_INLINE int | 973 | BUFFER_INLINE int |