diff options
| author | João Távora | 2018-06-09 15:49:04 +0100 |
|---|---|---|
| committer | João Távora | 2018-06-09 15:49:04 +0100 |
| commit | 16a7bce700f4b90bd6b2d7ab4bb860a3c29cb764 (patch) | |
| tree | 48b02e12d83195e21658476dfd56caa1af71c557 /src/eval.c | |
| parent | 4aed7ee79cbea9963a84d5d925d39f7bc07aed98 (diff) | |
| parent | 38111b5e98380c518aeb1bb7be52b7972a248332 (diff) | |
| download | emacs-scratch/allow-custom-null-and-false-objects-in-jsonc.tar.gz emacs-scratch/allow-custom-null-and-false-objects-in-jsonc.zip | |
Merge branch 'master' into this scratch branchscratch/allow-custom-null-and-false-objects-in-jsonc
scratch/allow-custom-null-and-false-objects-in-jsonc
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c index 90d8c335185..86011a234c0 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -3415,6 +3415,12 @@ record_unwind_protect_int (void (*function) (int), int arg) | |||
| 3415 | } | 3415 | } |
| 3416 | 3416 | ||
| 3417 | void | 3417 | void |
| 3418 | record_unwind_protect_excursion (void) | ||
| 3419 | { | ||
| 3420 | record_unwind_protect (save_excursion_restore, save_excursion_save ()); | ||
| 3421 | } | ||
| 3422 | |||
| 3423 | void | ||
| 3418 | record_unwind_protect_void (void (*function) (void)) | 3424 | record_unwind_protect_void (void (*function) (void)) |
| 3419 | { | 3425 | { |
| 3420 | specpdl_ptr->unwind_void.kind = SPECPDL_UNWIND_VOID; | 3426 | specpdl_ptr->unwind_void.kind = SPECPDL_UNWIND_VOID; |