diff options
| author | Tom Tromey | 2013-08-27 12:54:38 -0600 |
|---|---|---|
| committer | Tom Tromey | 2013-08-27 12:54:38 -0600 |
| commit | 07efb140348b4a4015c69ed102a5fa216978506f (patch) | |
| tree | 01d2671a02f9bf86b618dd0190d6229525fe82cd /src/eval.c | |
| parent | c44fedc6039bd96e908f5df25c5816abf7fc87e7 (diff) | |
| download | emacs-07efb140348b4a4015c69ed102a5fa216978506f.tar.gz emacs-07efb140348b4a4015c69ed102a5fa216978506f.zip | |
remove binding_symbol
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/eval.c b/src/eval.c index d36defc8fe4..68a3691ad9b 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -3171,14 +3171,6 @@ let_shadows_global_binding_p (Lisp_Object symbol) | |||
| 3171 | return 0; | 3171 | return 0; |
| 3172 | } | 3172 | } |
| 3173 | 3173 | ||
| 3174 | static Lisp_Object | ||
| 3175 | binding_symbol (union specbinding *bind) | ||
| 3176 | { | ||
| 3177 | if (!CONSP (specpdl_symbol (bind))) | ||
| 3178 | return specpdl_symbol (bind); | ||
| 3179 | return XCAR (specpdl_symbol (bind)); | ||
| 3180 | } | ||
| 3181 | |||
| 3182 | void | 3174 | void |
| 3183 | do_specbind (struct Lisp_Symbol *sym, union specbinding *bind, | 3175 | do_specbind (struct Lisp_Symbol *sym, union specbinding *bind, |
| 3184 | Lisp_Object value) | 3176 | Lisp_Object value) |
| @@ -3209,7 +3201,7 @@ do_specbind (struct Lisp_Symbol *sym, union specbinding *bind, | |||
| 3209 | } | 3201 | } |
| 3210 | } | 3202 | } |
| 3211 | 3203 | ||
| 3212 | set_internal (binding_symbol (bind), value, Qnil, 1); | 3204 | set_internal (specpdl_symbol (bind), value, Qnil, 1); |
| 3213 | break; | 3205 | break; |
| 3214 | 3206 | ||
| 3215 | default: | 3207 | default: |
| @@ -3350,7 +3342,7 @@ rebind_for_thread_switch (void) | |||
| 3350 | Lisp_Object value = specpdl_saved_value (bind); | 3342 | Lisp_Object value = specpdl_saved_value (bind); |
| 3351 | 3343 | ||
| 3352 | bind->let.saved_value = Qnil; | 3344 | bind->let.saved_value = Qnil; |
| 3353 | do_specbind (XSYMBOL (binding_symbol (bind)), bind, value); | 3345 | do_specbind (XSYMBOL (specpdl_symbol (bind)), bind, value); |
| 3354 | } | 3346 | } |
| 3355 | } | 3347 | } |
| 3356 | } | 3348 | } |
| @@ -3500,7 +3492,7 @@ unbind_for_thread_switch (void) | |||
| 3500 | { | 3492 | { |
| 3501 | if (bind->kind >= SPECPDL_LET) | 3493 | if (bind->kind >= SPECPDL_LET) |
| 3502 | { | 3494 | { |
| 3503 | bind->let.saved_value = find_symbol_value (binding_symbol (bind)); | 3495 | bind->let.saved_value = find_symbol_value (specpdl_symbol (bind)); |
| 3504 | do_one_unbind (bind, 0); | 3496 | do_one_unbind (bind, 0); |
| 3505 | } | 3497 | } |
| 3506 | } | 3498 | } |