aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/comp.c3
-rw-r--r--src/data.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/comp.c b/src/comp.c
index 82224845bff..ba3ed95bcce 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -5858,7 +5858,8 @@ The last directory of this list is assumed to be the system one. */);
5858 dump reload. */ 5858 dump reload. */
5859 Vnative_comp_eln_load_path = Fcons (build_string ("../native-lisp/"), Qnil); 5859 Vnative_comp_eln_load_path = Fcons (build_string ("../native-lisp/"), Qnil);
5860 5860
5861 DEFVAR_LISP ("comp-enable-subr-trampolines", Vcomp_enable_subr_trampolines, 5861 DEFVAR_LISP ("native-comp-enable-subr-trampolines",
5862 Vnative_comp_enable_subr_trampolines,
5862 doc: /* If non-nil, enable primitive trampoline synthesis. 5863 doc: /* If non-nil, enable primitive trampoline synthesis.
5863This makes Emacs respect redefinition or advises of primitive functions 5864This makes Emacs respect redefinition or advises of primitive functions
5864when they are called from Lisp code natively-compiled at `native-comp-speed' 5865when they are called from Lisp code natively-compiled at `native-comp-speed'
diff --git a/src/data.c b/src/data.c
index a43fa8991fe..0f1d881e00b 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 (!NILP (Vcomp_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);