From 27900ac72a8959291062eda9ef5eda9fc3f8595f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 30 Sep 2014 20:28:16 -0700 Subject: 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. --- src/minibuf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/minibuf.c') diff --git a/src/minibuf.c b/src/minibuf.c index ea525ba0f25..0b455157d52 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1157,9 +1157,10 @@ function, instead of the usual behavior. */) STRING_MULTIBYTE (prompt)); } + AUTO_STRING (format, "%s (default %s): "); prompt = Fformat (3, ((Lisp_Object []) - { SCOPED_STRING ("%s (default %s): "), - prompt, CONSP (def) ? XCAR (def) : def })); + {format, prompt, + CONSP (def) ? XCAR (def) : def})); } result = Fcompleting_read (prompt, intern ("internal-complete-buffer"), -- cgit v1.2.1