aboutsummaryrefslogtreecommitdiffstats
path: root/src/textprop.c
diff options
context:
space:
mode:
authorPaul Eggert2014-09-30 20:28:16 -0700
committerPaul Eggert2014-09-30 20:28:16 -0700
commit27900ac72a8959291062eda9ef5eda9fc3f8595f (patch)
tree780e22aa62de9c01e3faf00e5c123b1dfb87ddd3 /src/textprop.c
parentcebe0e68947ec46b44f5c3c9868814f8a5464173 (diff)
downloademacs-27900ac72a8959291062eda9ef5eda9fc3f8595f.tar.gz
emacs-27900ac72a8959291062eda9ef5eda9fc3f8595f.zip
Use AUTO_CONS instead of SCOPED_CONS, etc.
* doc/lispref/internals.texi (Stack-allocated Objects): Adjust to match the revised, less error-prone macros. * src/frame.h (AUTO_FRAME_ARG): Rename from FRAME_PARAMETER. * src/lisp.h (AUTO_CONS): Rename from scoped_cons. (AUTO_LIST1): Rename from scoped_list1. (AUTO_LIST2): Rename from scoped_list2. (AUTO_LIST3): Rename from scoped_list3. (AUTO_LIST4): Rename from scoped_list4. (AUTO_STRING): Rename from SCOPED_STRING. * src/frame.h (AUTO_FRAME_ARG): * src/lisp.h (AUTO_CONS, AUTO_LIST1, AUTO_LIST2, AUTO_LIST3) (AUTO_LIST4, AUTO_STRING): Prepend a new argument 'name'. Declare a variable instead of yielding a value. All uses changed. * src/lisp.h (STACK_CONS, AUTO_CONS_EXPR): New internal macros.
Diffstat (limited to 'src/textprop.c')
-rw-r--r--src/textprop.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/textprop.c b/src/textprop.c
index 146ee9e97d9..91ade8ae298 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1320,7 +1320,8 @@ markers). If OBJECT is a string, START and END are 0-based indices into it. */
1320 (Lisp_Object start, Lisp_Object end, Lisp_Object property, 1320 (Lisp_Object start, Lisp_Object end, Lisp_Object property,
1321 Lisp_Object value, Lisp_Object object) 1321 Lisp_Object value, Lisp_Object object)
1322{ 1322{
1323 Fadd_text_properties (start, end, scoped_list2 (property, value), object); 1323 AUTO_LIST2 (properties, property, value);
1324 Fadd_text_properties (start, end, properties, object);
1324 return Qnil; 1325 return Qnil;
1325} 1326}
1326 1327
@@ -1361,7 +1362,8 @@ into it. */)
1361 (Lisp_Object start, Lisp_Object end, Lisp_Object face, 1362 (Lisp_Object start, Lisp_Object end, Lisp_Object face,
1362 Lisp_Object append, Lisp_Object object) 1363 Lisp_Object append, Lisp_Object object)
1363{ 1364{
1364 add_text_properties_1 (start, end, scoped_list2 (Qface, face), object, 1365 AUTO_LIST2 (properties, Qface, face);
1366 add_text_properties_1 (start, end, properties, object,
1365 (NILP (append) 1367 (NILP (append)
1366 ? TEXT_PROPERTY_PREPEND 1368 ? TEXT_PROPERTY_PREPEND
1367 : TEXT_PROPERTY_APPEND)); 1369 : TEXT_PROPERTY_APPEND));