aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
authorMattias EngdegÄrd2024-03-04 14:14:05 +0100
committerMattias EngdegÄrd2024-03-04 14:14:05 +0100
commit11ffb4656d768b09e1f7dfacc091d85eef4a403a (patch)
tree4469592094317fb49925cf4408516e9349bfeb87 /src/alloc.c
parentb9e8474a4470f71c30a4b89651fd3c5f2ef92ba2 (diff)
downloademacs-11ffb4656d768b09e1f7dfacc091d85eef4a403a.tar.gz
emacs-11ffb4656d768b09e1f7dfacc091d85eef4a403a.zip
Revert "Replace XSETSYMBOL with make_lisp_symbol"
This reverts commit de6b1e1efb1a36c69e7a6e09297e1de5b1477121. While it did simplify code, there aren't much in the way of technical benefits the change at this time, and there were protest against the unwarranted style change.
Diffstat (limited to 'src/alloc.c')
-rw-r--r--src/alloc.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 16257469aa6..2ffd2415447 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3960,7 +3960,7 @@ Its value is void, and its function definition and property list are nil. */)
3960 if (symbol_free_list) 3960 if (symbol_free_list)
3961 { 3961 {
3962 ASAN_UNPOISON_SYMBOL (symbol_free_list); 3962 ASAN_UNPOISON_SYMBOL (symbol_free_list);
3963 val = make_lisp_symbol (symbol_free_list); 3963 XSETSYMBOL (val, symbol_free_list);
3964 symbol_free_list = symbol_free_list->u.s.next; 3964 symbol_free_list = symbol_free_list->u.s.next;
3965 } 3965 }
3966 else 3966 else
@@ -3976,7 +3976,7 @@ Its value is void, and its function definition and property list are nil. */)
3976 } 3976 }
3977 3977
3978 ASAN_UNPOISON_SYMBOL (&symbol_block->symbols[symbol_block_index]); 3978 ASAN_UNPOISON_SYMBOL (&symbol_block->symbols[symbol_block_index]);
3979 val = make_lisp_symbol (&symbol_block->symbols[symbol_block_index]); 3979 XSETSYMBOL (val, &symbol_block->symbols[symbol_block_index]);
3980 symbol_block_index++; 3980 symbol_block_index++;
3981 } 3981 }
3982 3982
@@ -7398,8 +7398,12 @@ process_mark_stack (ptrdiff_t base_sp)
7398 mark_stack_push_value (SYMBOL_VAL (ptr)); 7398 mark_stack_push_value (SYMBOL_VAL (ptr));
7399 break; 7399 break;
7400 case SYMBOL_VARALIAS: 7400 case SYMBOL_VARALIAS:
7401 mark_stack_push_value (make_lisp_symbol (SYMBOL_ALIAS (ptr))); 7401 {
7402 break; 7402 Lisp_Object tem;
7403 XSETSYMBOL (tem, SYMBOL_ALIAS (ptr));
7404 mark_stack_push_value (tem);
7405 break;
7406 }
7403 case SYMBOL_LOCALIZED: 7407 case SYMBOL_LOCALIZED:
7404 { 7408 {
7405 struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (ptr); 7409 struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (ptr);