diff options
| author | Stefan Monnier | 2012-11-20 15:06:17 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2012-11-20 15:06:17 -0500 |
| commit | eadf1faa3cb5eea8c25a5166a9a97ebd63525c56 (patch) | |
| tree | c5b92de52e664400cbc79f7dd344cbf440fb7e2a /src/alloc.c | |
| parent | 2e31777bd1354d22319cf6de4085ccc362cff42c (diff) | |
| download | emacs-eadf1faa3cb5eea8c25a5166a9a97ebd63525c56.tar.gz emacs-eadf1faa3cb5eea8c25a5166a9a97ebd63525c56.zip | |
Conflate Qnil and Qunbound for `symbol-function'.
* src/alloc.c (Fmake_symbol): Initialize `function' to Qnil.
* src/lread.c (init_obarray): Set `function' fields to Qnil.
* src/eval.c (Fcommandp): Ignore Qunbound.
(Fautoload, eval_sub, Fapply, Ffuncall, Fmacroexpand):
* src/data.c (Ffset, Ffboundp, indirect_function, Findirect_function):
Test NILP rather than Qunbound.
(Ffmakunbound): Set to Qnil.
(Fsymbol_function): Never signal an error.
(Finteractive_form): Ignore Qunbound.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/alloc.c b/src/alloc.c index a66a752f5dc..22e3db3cc77 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -3212,7 +3212,7 @@ static struct Lisp_Symbol *symbol_free_list; | |||
| 3212 | 3212 | ||
| 3213 | DEFUN ("make-symbol", Fmake_symbol, Smake_symbol, 1, 1, 0, | 3213 | DEFUN ("make-symbol", Fmake_symbol, Smake_symbol, 1, 1, 0, |
| 3214 | doc: /* Return a newly allocated uninterned symbol whose name is NAME. | 3214 | doc: /* Return a newly allocated uninterned symbol whose name is NAME. |
| 3215 | Its value and function definition are void, and its property list is nil. */) | 3215 | Its value is void, and its function definition and property list are nil. */) |
| 3216 | (Lisp_Object name) | 3216 | (Lisp_Object name) |
| 3217 | { | 3217 | { |
| 3218 | register Lisp_Object val; | 3218 | register Lisp_Object val; |
| @@ -3249,7 +3249,7 @@ Its value and function definition are void, and its property list is nil. */) | |||
| 3249 | set_symbol_plist (val, Qnil); | 3249 | set_symbol_plist (val, Qnil); |
| 3250 | p->redirect = SYMBOL_PLAINVAL; | 3250 | p->redirect = SYMBOL_PLAINVAL; |
| 3251 | SET_SYMBOL_VAL (p, Qunbound); | 3251 | SET_SYMBOL_VAL (p, Qunbound); |
| 3252 | set_symbol_function (val, Qunbound); | 3252 | set_symbol_function (val, Qnil); |
| 3253 | set_symbol_next (val, NULL); | 3253 | set_symbol_next (val, NULL); |
| 3254 | p->gcmarkbit = 0; | 3254 | p->gcmarkbit = 0; |
| 3255 | p->interned = SYMBOL_UNINTERNED; | 3255 | p->interned = SYMBOL_UNINTERNED; |