diff options
| author | Paul Eggert | 2014-09-30 20:28:16 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-09-30 20:28:16 -0700 |
| commit | 27900ac72a8959291062eda9ef5eda9fc3f8595f (patch) | |
| tree | 780e22aa62de9c01e3faf00e5c123b1dfb87ddd3 /src/chartab.c | |
| parent | cebe0e68947ec46b44f5c3c9868814f8a5464173 (diff) | |
| download | emacs-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/chartab.c')
| -rw-r--r-- | src/chartab.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/chartab.c b/src/chartab.c index 35362e32a03..bfbbf798f0c 100644 --- a/src/chartab.c +++ b/src/chartab.c | |||
| @@ -1302,8 +1302,8 @@ uniprop_table (Lisp_Object prop) | |||
| 1302 | { | 1302 | { |
| 1303 | struct gcpro gcpro1; | 1303 | struct gcpro gcpro1; |
| 1304 | GCPRO1 (val); | 1304 | GCPRO1 (val); |
| 1305 | result = Fload (concat2 (SCOPED_STRING ("international/"), table), | 1305 | AUTO_STRING (intl, "international/"); |
| 1306 | Qt, Qt, Qt, Qt); | 1306 | result = Fload (concat2 (intl, table), Qt, Qt, Qt, Qt); |
| 1307 | UNGCPRO; | 1307 | UNGCPRO; |
| 1308 | if (NILP (result)) | 1308 | if (NILP (result)) |
| 1309 | return Qnil; | 1309 | return Qnil; |