diff options
| author | Yuuki Harano | 2021-05-03 21:33:53 +0900 |
|---|---|---|
| committer | Yuuki Harano | 2021-05-03 21:33:53 +0900 |
| commit | 704b765eaaee82176e26ab084c26d65311fd46d3 (patch) | |
| tree | 15d9280e45e31f2bff755cd176f498c89a7b3875 /src/comp.c | |
| parent | 66a36f1e5a323aed3d39db1044a1b71373123832 (diff) | |
| parent | 1dafab893652c42be807e9a44005413cb7915f81 (diff) | |
| download | emacs-704b765eaaee82176e26ab084c26d65311fd46d3.tar.gz emacs-704b765eaaee82176e26ab084c26d65311fd46d3.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'src/comp.c')
| -rw-r--r-- | src/comp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/comp.c b/src/comp.c index 5309be46dec..a4dba435b4a 100644 --- a/src/comp.c +++ b/src/comp.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* Compile elisp into native code. | 1 | /* Compile Emacs Lisp into native code. |
| 2 | Copyright (C) 2019-2021 Free Software Foundation, Inc. | 2 | Copyright (C) 2019-2021 Free Software Foundation, Inc. |
| 3 | 3 | ||
| 4 | Author: Andrea Corallo <akrl@sdf.org> | 4 | Author: Andrea Corallo <akrl@sdf.org> |
| @@ -4716,7 +4716,7 @@ maybe_defer_native_compilation (Lisp_Object function_name, | |||
| 4716 | return; | 4716 | return; |
| 4717 | } | 4717 | } |
| 4718 | 4718 | ||
| 4719 | /* This is to have deferred compilaiton able to compile comp | 4719 | /* This is so deferred compilation is able to compile comp |
| 4720 | dependencies breaking circularity. */ | 4720 | dependencies breaking circularity. */ |
| 4721 | if (!NILP (Ffeaturep (Qcomp, Qnil))) | 4721 | if (!NILP (Ffeaturep (Qcomp, Qnil))) |
| 4722 | { | 4722 | { |
| @@ -4949,7 +4949,7 @@ load_comp_unit (struct Lisp_Native_Comp_Unit *comp_u, bool loading_dump, | |||
| 4949 | /* In case another load of the same CU is active on the stack | 4949 | /* In case another load of the same CU is active on the stack |
| 4950 | all ephemeral data is hold by that frame. Re-writing | 4950 | all ephemeral data is hold by that frame. Re-writing |
| 4951 | 'data_ephemeral_vec' would be not only a waste of cycles but | 4951 | 'data_ephemeral_vec' would be not only a waste of cycles but |
| 4952 | more importanly would lead to crashed if the contained data | 4952 | more importantly would lead to crashes if the contained data |
| 4953 | is not cons hashed. */ | 4953 | is not cons hashed. */ |
| 4954 | if (!recursive_load) | 4954 | if (!recursive_load) |
| 4955 | { | 4955 | { |