diff options
Diffstat (limited to 'src/comp.c')
| -rw-r--r-- | src/comp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/comp.c b/src/comp.c index 5cf94762a92..5128755bf18 100644 --- a/src/comp.c +++ b/src/comp.c | |||
| @@ -4095,11 +4095,11 @@ directory in `comp-eln-load-path' otherwise. */) | |||
| 4095 | Lisp_Object source_filename = filename; | 4095 | Lisp_Object source_filename = filename; |
| 4096 | filename = Fcomp_el_to_eln_rel_filename (filename); | 4096 | filename = Fcomp_el_to_eln_rel_filename (filename); |
| 4097 | 4097 | ||
| 4098 | /* If base_dir was not specified search inside Vcomp_eln_load_path | 4098 | /* If base_dir was not specified search inside Vnative_comp_eln_load_path |
| 4099 | for the first directory where we have write access. */ | 4099 | for the first directory where we have write access. */ |
| 4100 | if (NILP (base_dir)) | 4100 | if (NILP (base_dir)) |
| 4101 | { | 4101 | { |
| 4102 | Lisp_Object eln_load_paths = Vcomp_eln_load_path; | 4102 | Lisp_Object eln_load_paths = Vnative_comp_eln_load_path; |
| 4103 | FOR_EACH_TAIL (eln_load_paths) | 4103 | FOR_EACH_TAIL (eln_load_paths) |
| 4104 | { | 4104 | { |
| 4105 | Lisp_Object dir = XCAR (eln_load_paths); | 4105 | Lisp_Object dir = XCAR (eln_load_paths); |
| @@ -4630,7 +4630,7 @@ void | |||
| 4630 | eln_load_path_final_clean_up (void) | 4630 | eln_load_path_final_clean_up (void) |
| 4631 | { | 4631 | { |
| 4632 | #ifdef WINDOWSNT | 4632 | #ifdef WINDOWSNT |
| 4633 | Lisp_Object dir_tail = Vcomp_eln_load_path; | 4633 | Lisp_Object dir_tail = Vnative_comp_eln_load_path; |
| 4634 | FOR_EACH_TAIL (dir_tail) | 4634 | FOR_EACH_TAIL (dir_tail) |
| 4635 | { | 4635 | { |
| 4636 | Lisp_Object files_in_dir = | 4636 | Lisp_Object files_in_dir = |
| @@ -4755,7 +4755,7 @@ void | |||
| 4755 | fixup_eln_load_path (Lisp_Object eln_filename) | 4755 | fixup_eln_load_path (Lisp_Object eln_filename) |
| 4756 | { | 4756 | { |
| 4757 | Lisp_Object last_cell = Qnil; | 4757 | Lisp_Object last_cell = Qnil; |
| 4758 | Lisp_Object tem = Vcomp_eln_load_path; | 4758 | Lisp_Object tem = Vnative_comp_eln_load_path; |
| 4759 | FOR_EACH_TAIL (tem) | 4759 | FOR_EACH_TAIL (tem) |
| 4760 | if (CONSP (tem)) | 4760 | if (CONSP (tem)) |
| 4761 | last_cell = tem; | 4761 | last_cell = tem; |
| @@ -5127,7 +5127,7 @@ static bool | |||
| 5127 | file_in_eln_sys_dir (Lisp_Object filename) | 5127 | file_in_eln_sys_dir (Lisp_Object filename) |
| 5128 | { | 5128 | { |
| 5129 | Lisp_Object eln_sys_dir = Qnil; | 5129 | Lisp_Object eln_sys_dir = Qnil; |
| 5130 | Lisp_Object tmp = Vcomp_eln_load_path; | 5130 | Lisp_Object tmp = Vnative_comp_eln_load_path; |
| 5131 | FOR_EACH_TAIL (tmp) | 5131 | FOR_EACH_TAIL (tmp) |
| 5132 | eln_sys_dir = XCAR (tmp); | 5132 | eln_sys_dir = XCAR (tmp); |
| 5133 | return !NILP (Fstring_match (Fregexp_quote (Fexpand_file_name (eln_sys_dir, | 5133 | return !NILP (Fstring_match (Fregexp_quote (Fexpand_file_name (eln_sys_dir, |
| @@ -5369,7 +5369,7 @@ For internal use. */); | |||
| 5369 | doc: /* Hash table eln-filename -> el-filename. */); | 5369 | doc: /* Hash table eln-filename -> el-filename. */); |
| 5370 | Vcomp_eln_to_el_h = CALLN (Fmake_hash_table, QCtest, Qequal); | 5370 | Vcomp_eln_to_el_h = CALLN (Fmake_hash_table, QCtest, Qequal); |
| 5371 | 5371 | ||
| 5372 | DEFVAR_LISP ("comp-eln-load-path", Vcomp_eln_load_path, | 5372 | DEFVAR_LISP ("native-comp-eln-load-path", Vnative_comp_eln_load_path, |
| 5373 | doc: /* List of eln cache directories. | 5373 | doc: /* List of eln cache directories. |
| 5374 | 5374 | ||
| 5375 | If a directory is non absolute is assumed to be relative to | 5375 | If a directory is non absolute is assumed to be relative to |
| @@ -5381,7 +5381,7 @@ The last directory of this list is assumed to be the system one. */); | |||
| 5381 | /* Temporary value in use for bootstrap. We can't do better as | 5381 | /* Temporary value in use for bootstrap. We can't do better as |
| 5382 | `invocation-directory' is still unset, will be fixed up during | 5382 | `invocation-directory' is still unset, will be fixed up during |
| 5383 | dump reload. */ | 5383 | dump reload. */ |
| 5384 | Vcomp_eln_load_path = Fcons (build_string ("../native-lisp/"), Qnil); | 5384 | Vnative_comp_eln_load_path = Fcons (build_string ("../native-lisp/"), Qnil); |
| 5385 | 5385 | ||
| 5386 | DEFVAR_BOOL ("comp-enable-subr-trampolines", comp_enable_subr_trampolines, | 5386 | DEFVAR_BOOL ("comp-enable-subr-trampolines", comp_enable_subr_trampolines, |
| 5387 | doc: /* If non-nil enable primitive trampoline synthesis. | 5387 | doc: /* If non-nil enable primitive trampoline synthesis. |