diff options
| author | Gregory Heytings | 2022-11-24 14:21:30 +0100 |
|---|---|---|
| committer | Gregory Heytings | 2022-11-24 14:21:30 +0100 |
| commit | ba9315b1641b483f2bf843c38dcdba0cd1643a55 (patch) | |
| tree | d119cae86c7386db66be72972d90f6c83215974d /src/comp.c | |
| parent | aef803d6c3d61004f15d0bc82fa7bf9952302312 (diff) | |
| parent | a3b654e069e563b0a2a6335ec310ada51400ac09 (diff) | |
| download | emacs-ba9315b1641b483f2bf843c38dcdba0cd1643a55.tar.gz emacs-ba9315b1641b483f2bf843c38dcdba0cd1643a55.zip | |
Merge master into feature/improved-locked-narrowing.
Diffstat (limited to 'src/comp.c')
| -rw-r--r-- | src/comp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/comp.c b/src/comp.c index 14012634ccc..b6072a866e6 100644 --- a/src/comp.c +++ b/src/comp.c | |||
| @@ -947,7 +947,7 @@ obj_to_reloc (Lisp_Object obj) | |||
| 947 | } | 947 | } |
| 948 | 948 | ||
| 949 | xsignal1 (Qnative_ice, | 949 | xsignal1 (Qnative_ice, |
| 950 | build_string ("cant't find data in relocation containers")); | 950 | build_string ("can't find data in relocation containers")); |
| 951 | assume (false); | 951 | assume (false); |
| 952 | 952 | ||
| 953 | found: | 953 | found: |
| @@ -5609,7 +5609,7 @@ file_in_eln_sys_dir (Lisp_Object filename) | |||
| 5609 | /* Load related routines. */ | 5609 | /* Load related routines. */ |
| 5610 | DEFUN ("native-elisp-load", Fnative_elisp_load, Snative_elisp_load, 1, 2, 0, | 5610 | DEFUN ("native-elisp-load", Fnative_elisp_load, Snative_elisp_load, 1, 2, 0, |
| 5611 | doc: /* Load native elisp code FILENAME. | 5611 | doc: /* Load native elisp code FILENAME. |
| 5612 | LATE_LOAD has to be non-nil when loading for deferred compilation. */) | 5612 | LATE-LOAD has to be non-nil when loading for deferred compilation. */) |
| 5613 | (Lisp_Object filename, Lisp_Object late_load) | 5613 | (Lisp_Object filename, Lisp_Object late_load) |
| 5614 | { | 5614 | { |
| 5615 | CHECK_STRING (filename); | 5615 | CHECK_STRING (filename); |