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/print.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/print.c')
| -rw-r--r-- | src/print.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/print.c b/src/print.c index 23ad6c0a256..9d633ecce51 100644 --- a/src/print.c +++ b/src/print.c | |||
| @@ -1194,7 +1194,7 @@ print_preprocess (Lisp_Object obj) | |||
| 1194 | { | 1194 | { |
| 1195 | case Lisp_String: | 1195 | case Lisp_String: |
| 1196 | /* A string may have text properties, which can be circular. */ | 1196 | /* A string may have text properties, which can be circular. */ |
| 1197 | traverse_intervals_noorder (string_get_intervals (obj), | 1197 | traverse_intervals_noorder (string_intervals (obj), |
| 1198 | print_preprocess_string, Qnil); | 1198 | print_preprocess_string, Qnil); |
| 1199 | break; | 1199 | break; |
| 1200 | 1200 | ||
| @@ -1297,7 +1297,7 @@ static Lisp_Object | |||
| 1297 | print_prune_string_charset (Lisp_Object string) | 1297 | print_prune_string_charset (Lisp_Object string) |
| 1298 | { | 1298 | { |
| 1299 | print_check_string_result = 0; | 1299 | print_check_string_result = 0; |
| 1300 | traverse_intervals (string_get_intervals (string), 0, | 1300 | traverse_intervals (string_intervals (string), 0, |
| 1301 | print_check_string_charset_prop, string); | 1301 | print_check_string_charset_prop, string); |
| 1302 | if (! (print_check_string_result & PRINT_STRING_UNSAFE_CHARSET_FOUND)) | 1302 | if (! (print_check_string_result & PRINT_STRING_UNSAFE_CHARSET_FOUND)) |
| 1303 | { | 1303 | { |
| @@ -1408,7 +1408,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag | |||
| 1408 | if (! EQ (Vprint_charset_text_property, Qt)) | 1408 | if (! EQ (Vprint_charset_text_property, Qt)) |
| 1409 | obj = print_prune_string_charset (obj); | 1409 | obj = print_prune_string_charset (obj); |
| 1410 | 1410 | ||
| 1411 | if (string_get_intervals (obj)) | 1411 | if (string_intervals (obj)) |
| 1412 | { | 1412 | { |
| 1413 | PRINTCHAR ('#'); | 1413 | PRINTCHAR ('#'); |
| 1414 | PRINTCHAR ('('); | 1414 | PRINTCHAR ('('); |
| @@ -1499,9 +1499,9 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag | |||
| 1499 | } | 1499 | } |
| 1500 | PRINTCHAR ('\"'); | 1500 | PRINTCHAR ('\"'); |
| 1501 | 1501 | ||
| 1502 | if (string_get_intervals (obj)) | 1502 | if (string_intervals (obj)) |
| 1503 | { | 1503 | { |
| 1504 | traverse_intervals (string_get_intervals (obj), | 1504 | traverse_intervals (string_intervals (obj), |
| 1505 | 0, print_interval, printcharfun); | 1505 | 0, print_interval, printcharfun); |
| 1506 | PRINTCHAR (')'); | 1506 | PRINTCHAR (')'); |
| 1507 | } | 1507 | } |