aboutsummaryrefslogtreecommitdiffstats
path: root/src/editfns.c
diff options
context:
space:
mode:
authorPaul Eggert2012-08-17 14:12:11 -0700
committerPaul Eggert2012-08-17 14:12:11 -0700
commit0c94c8d603031f6b665ae7f3136ca77fb573fd7e (patch)
treefabdd332bf09c4ea02198aa36a6a7bdab7e43397 /src/editfns.c
parentee21815118944347ad0c45d47af651e7283709d2 (diff)
downloademacs-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/editfns.c')
-rw-r--r--src/editfns.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/editfns.c b/src/editfns.c
index b7feb733782..5445561fad3 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3936,7 +3936,7 @@ usage: (format STRING &rest OBJECTS) */)
3936 3936
3937 /* If this argument has text properties, record where 3937 /* If this argument has text properties, record where
3938 in the result string it appears. */ 3938 in the result string it appears. */
3939 if (string_get_intervals (args[n])) 3939 if (string_intervals (args[n]))
3940 info[n].intervals = arg_intervals = 1; 3940 info[n].intervals = arg_intervals = 1;
3941 3941
3942 continue; 3942 continue;
@@ -4280,7 +4280,7 @@ usage: (format STRING &rest OBJECTS) */)
4280 arguments has text properties, set up text properties of the 4280 arguments has text properties, set up text properties of the
4281 result string. */ 4281 result string. */
4282 4282
4283 if (string_get_intervals (args[0]) || arg_intervals) 4283 if (string_intervals (args[0]) || arg_intervals)
4284 { 4284 {
4285 Lisp_Object len, new_len, props; 4285 Lisp_Object len, new_len, props;
4286 struct gcpro gcpro1; 4286 struct gcpro gcpro1;
@@ -4530,7 +4530,7 @@ Transposing beyond buffer boundaries is an error. */)
4530 Lisp_Object buf; 4530 Lisp_Object buf;
4531 4531
4532 XSETBUFFER (buf, current_buffer); 4532 XSETBUFFER (buf, current_buffer);
4533 cur_intv = buffer_get_intervals (current_buffer); 4533 cur_intv = buffer_intervals (current_buffer);
4534 4534
4535 validate_region (&startr1, &endr1); 4535 validate_region (&startr1, &endr1);
4536 validate_region (&startr2, &endr2); 4536 validate_region (&startr2, &endr2);