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.

1 files changed, 11 insertions, 11 deletions

diff --git a/src/lread.c b/src/lread.c
index 799635e3c83..0e71b13c5c8 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -969,9 +969,10 @@ static void
 load_warn_old_style_backquotes (Lisp_Object file)
 {
   if (!NILP (Vold_style_backquotes))
-    Fmessage (2, ((Lisp_Object [])
-      { SCOPED_STRING ("Loading `%s': old-style backquotes detected!"),
-        file }));
+    {
+      AUTO_STRING (format, "Loading `%s': old-style backquotes detected!");
+      Fmessage (2, (Lisp_Object []) {format, file});
+    }
 }
 
 DEFUN ("get-load-suffixes", Fget_load_suffixes, Sget_load_suffixes, 0, 0, 0,
@@ -2888,11 +2889,8 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list)
                   if (c == '=')
                     {
                       /* Make a placeholder for #n# to use temporarily.  */
-                      Lisp_Object placeholder;
-                      Lisp_Object cell;
-
-                      placeholder = scoped_cons (Qnil, Qnil);
-                      cell = Fcons (make_number (n), placeholder);
+                      AUTO_CONS (placeholder, Qnil, Qnil);
+                      Lisp_Object cell = Fcons (make_number (n), placeholder);
                       read_objects = Fcons (cell, read_objects);
 
                       /* Read the object itself.  */
@@ -3371,7 +3369,7 @@ substitute_object_recurse (Lisp_Object object, Lisp_Object placeholder, Lisp_Obj
            substitute_in_interval contains part of the logic.  */
 
         INTERVAL root_interval = string_intervals (subtree);
-        Lisp_Object arg = scoped_cons (object, placeholder);
+        AUTO_CONS (arg, object, placeholder);
 
         traverse_intervals_noorder (root_interval,
                                     &substitute_in_interval, arg);
@@ -3678,8 +3676,10 @@ read_list (bool flag, Lisp_Object readcharfun)
                in the installed Lisp directory.
                We don't use Fexpand_file_name because that would make
                the directory absolute now.  */
-            elt = concat2 (SCOPED_STRING ("../lisp/"),
-                           Ffile_name_nondirectory (elt));
+            {
+              AUTO_STRING (dotdotlisp, "../lisp/");
+              elt = concat2 (dotdotlisp, Ffile_name_nondirectory (elt));
+            }
         }
       else if (EQ (elt, Vload_file_name)
                && ! NILP (elt)