diff options
| author | Po Lu | 2023-02-18 23:13:51 +0800 |
|---|---|---|
| committer | Po Lu | 2023-02-18 23:13:51 +0800 |
| commit | c045d5322c2c1658f215bf59d431fcc8f96ffc12 (patch) | |
| tree | e273d3eaedf5a109f5e18b6581b41e9dec9412e0 /src/data.c | |
| parent | a61f9cb77ced0607e4607bc5d82ae06165e6138d (diff) | |
| parent | 97f24924df62303c944176510038f398370f8fb6 (diff) | |
| download | emacs-c045d5322c2c1658f215bf59d431fcc8f96ffc12.tar.gz emacs-c045d5322c2c1658f215bf59d431fcc8f96ffc12.zip | |
Merge remote-tracking branch 'origin/master' into feature/android
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/data.c b/src/data.c index 04ac2b09ac3..1fa8b0358b5 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -855,7 +855,7 @@ DEFUN ("fset", Ffset, Sfset, 2, 2, 0, | |||
| 855 | #ifdef HAVE_NATIVE_COMP | 855 | #ifdef HAVE_NATIVE_COMP |
| 856 | register Lisp_Object function = XSYMBOL (symbol)->u.s.function; | 856 | register Lisp_Object function = XSYMBOL (symbol)->u.s.function; |
| 857 | 857 | ||
| 858 | if (comp_enable_subr_trampolines | 858 | if (!NILP (Vnative_comp_enable_subr_trampolines) |
| 859 | && SUBRP (function) | 859 | && SUBRP (function) |
| 860 | && !SUBR_NATIVE_COMPILEDP (function)) | 860 | && !SUBR_NATIVE_COMPILEDP (function)) |
| 861 | CALLN (Ffuncall, Qcomp_subr_trampoline_install, symbol); | 861 | CALLN (Ffuncall, Qcomp_subr_trampoline_install, symbol); |