aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Kangas2025-02-28 19:59:12 +0100
committerStefan Kangas2025-02-28 20:20:55 +0100
commit678fdcc16594aaedb319fe145d039aa118174f5d (patch)
tree5f2648a1bca73d40827fd48a45098658baefbbd3 /src
parent0b0bf7c07f2ecaca1e9b25d72139af0dd7e49832 (diff)
downloademacs-678fdcc16594aaedb319fe145d039aa118174f5d.tar.gz
emacs-678fdcc16594aaedb319fe145d039aa118174f5d.zip
; Grammar fixes for "native-compiled"
1. Prefer "native-compiled" to "native compiled". The adjective "native-compiled" with the hyphen is generally more consistent with the typical pattern in English, especially when the compound modifies a noun (e.g., "native-compiled code"). 2. Prefer "natively compiled" to "natively-compiled". The adverb "natively" modifies "compiled", and it is standard not to hyphenate an adverb + adjective combination when the adverb ends in -ly (e.g., "code that is natively compiled"). For example, note that we say "high-speed internet" but "highly performant code". * Makefile.in (dest): * configure.ac (HAVE_NATIVE_COMP): * doc/emacs/building.texi (Lisp Libraries): * doc/lispref/compile.texi (Native Compilation) (Native-Compilation Functions, Native-Compilation Variables): * doc/lispref/functions.texi (What Is a Function, Declare Form): * doc/lispref/loading.texi (How Programs Do Loading, Library Search): * etc/NEWS: * etc/NEWS.28: * etc/NEWS.29: * etc/NEWS.30: * lisp/emacs-lisp/comp-common.el (native-comp-never-optimize-functions) (comp-function-type-spec): * lisp/emacs-lisp/comp-cstr.el: * lisp/subr.el (locate-eln-file): * src/comp.c (SETJMP_NAME, syms_of_comp): * src/data.c (Fsubrp, Fnative_comp_function_p, Fsubr_native_lambda_list): * src/lread.c (Fload): * src/pdumper.c (dump_do_dump_relocation): * test/src/comp-tests.el (lambda-return2): Avoid grammatically incorrect variations on "natively compiled" and "native-compiled". (Bug#56727)
Diffstat (limited to 'src')
-rw-r--r--src/comp.c14
-rw-r--r--src/data.c6
-rw-r--r--src/lread.c4
-rw-r--r--src/pdumper.c2
4 files changed, 13 insertions, 13 deletions
diff --git a/src/comp.c b/src/comp.c
index 692b28e00cb..219a482931e 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -518,7 +518,7 @@ load_gccjit_if_necessary (bool mandatory)
518#endif 518#endif
519#define SETJMP_NAME SETJMP 519#define SETJMP_NAME SETJMP
520 520
521/* Max number function importable by native compiled code. */ 521/* Max number function importable by native-compiled code. */
522#define F_RELOC_MAX_SIZE 1600 522#define F_RELOC_MAX_SIZE 1600
523 523
524typedef struct { 524typedef struct {
@@ -5556,7 +5556,7 @@ syms_of_comp (void)
5556 doc: /* If non-nil, compile loaded .elc files asynchronously. 5556 doc: /* If non-nil, compile loaded .elc files asynchronously.
5557 5557
5558After compilation, each function definition is updated to use the 5558After compilation, each function definition is updated to use the
5559natively-compiled one. */); 5559natively compiled one. */);
5560 native_comp_jit_compilation = true; 5560 native_comp_jit_compilation = true;
5561 5561
5562 DEFSYM (Qnative_comp_speed, "native-comp-speed"); 5562 DEFSYM (Qnative_comp_speed, "native-comp-speed");
@@ -5726,7 +5726,7 @@ For internal use. */);
5726 Vcomp_eln_to_el_h = CALLN (Fmake_hash_table, QCtest, Qequal); 5726 Vcomp_eln_to_el_h = CALLN (Fmake_hash_table, QCtest, Qequal);
5727 5727
5728 DEFVAR_LISP ("native-comp-eln-load-path", Vnative_comp_eln_load_path, 5728 DEFVAR_LISP ("native-comp-eln-load-path", Vnative_comp_eln_load_path,
5729 doc: /* List of directories to look for natively-compiled *.eln files. 5729 doc: /* List of directories to look for native-compiled *.eln files.
5730 5730
5731The *.eln files are actually looked for in a version-specific 5731The *.eln files are actually looked for in a version-specific
5732subdirectory of each directory in this list. That subdirectory 5732subdirectory of each directory in this list. That subdirectory
@@ -5746,11 +5746,11 @@ Emacs. */);
5746 Vnative_comp_enable_subr_trampolines, 5746 Vnative_comp_enable_subr_trampolines,
5747 doc: /* If non-nil, enable generation of trampolines for calling primitives. 5747 doc: /* If non-nil, enable generation of trampolines for calling primitives.
5748Trampolines are needed so that Emacs respects redefinition or advice of 5748Trampolines are needed so that Emacs respects redefinition or advice of
5749primitive functions when they are called from Lisp code natively-compiled 5749primitive functions when they are called from native-compiled Lisp code
5750at `native-comp-speed' of 2. 5750at `native-comp-speed' of 2.
5751 5751
5752By default, the value is t, and when Emacs sees a redefined or advised 5752By default, the value is t, and when Emacs sees a redefined or advised
5753primitive called from natively-compiled Lisp, it generates a trampoline 5753primitive called from native-compiled Lisp, it generates a trampoline
5754for it on-the-fly. 5754for it on-the-fly.
5755 5755
5756If the value is a file name (a string), it specifies the directory in 5756If the value is a file name (a string), it specifies the directory in
@@ -5762,8 +5762,8 @@ When this variable is nil, generation of trampolines is disabled.
5762Disabling the generation of trampolines, when a trampoline for a redefined 5762Disabling the generation of trampolines, when a trampoline for a redefined
5763or advised primitive is not already available from previous compilations, 5763or advised primitive is not already available from previous compilations,
5764means that such redefinition or advice will not have effect when calling 5764means that such redefinition or advice will not have effect when calling
5765primitives from natively-compiled Lisp code. That is, calls to primitives 5765primitives from native-compiled Lisp code. That is, calls to primitives
5766without existing trampolines from natively-compiled Lisp will behave as if 5766without existing trampolines from native-compiled Lisp will behave as if
5767the primitive was called directly from C, and will ignore its redefinition 5767the primitive was called directly from C, and will ignore its redefinition
5768and advice. */); 5768and advice. */);
5769 5769
diff --git a/src/data.c b/src/data.c
index 5fcdda1b6e8..b2e5ffe4eed 100644
--- a/src/data.c
+++ b/src/data.c
@@ -499,7 +499,7 @@ DEFUN ("user-ptrp", Fuser_ptrp, Suser_ptrp, 1, 1, 0,
499#endif 499#endif
500 500
501DEFUN ("subrp", Fsubrp, Ssubrp, 1, 1, 0, 501DEFUN ("subrp", Fsubrp, Ssubrp, 1, 1, 0,
502 doc: /* Return t if OBJECT is a built-in or native compiled Lisp function. 502 doc: /* Return t if OBJECT is a built-in or native-compiled Lisp function.
503 503
504See also `primitive-function-p' and `native-comp-function-p'. */) 504See also `primitive-function-p' and `native-comp-function-p'. */)
505 (Lisp_Object object) 505 (Lisp_Object object)
@@ -1046,7 +1046,7 @@ SUBR must be a built-in function. */)
1046} 1046}
1047 1047
1048DEFUN ("native-comp-function-p", Fnative_comp_function_p, Snative_comp_function_p, 1, 1, 1048DEFUN ("native-comp-function-p", Fnative_comp_function_p, Snative_comp_function_p, 1, 1,
1049 0, doc: /* Return t if the object is native compiled Lisp function, nil otherwise. */) 1049 0, doc: /* Return t if the object is native-compiled Lisp function, nil otherwise. */)
1050 (Lisp_Object object) 1050 (Lisp_Object object)
1051{ 1051{
1052 return NATIVE_COMP_FUNCTIONP (object) ? Qt : Qnil; 1052 return NATIVE_COMP_FUNCTIONP (object) ? Qt : Qnil;
@@ -1054,7 +1054,7 @@ DEFUN ("native-comp-function-p", Fnative_comp_function_p, Snative_comp_function_
1054 1054
1055DEFUN ("subr-native-lambda-list", Fsubr_native_lambda_list, 1055DEFUN ("subr-native-lambda-list", Fsubr_native_lambda_list,
1056 Ssubr_native_lambda_list, 1, 1, 0, 1056 Ssubr_native_lambda_list, 1, 1, 0,
1057 doc: /* Return the lambda list for a native compiled lisp/d 1057 doc: /* Return the lambda list for a native-compiled lisp/d
1058function or t otherwise. */) 1058function or t otherwise. */)
1059 (Lisp_Object subr) 1059 (Lisp_Object subr)
1060{ 1060{
diff --git a/src/lread.c b/src/lread.c
index df1caaf5732..d45860fd470 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1680,7 +1680,7 @@ Return t if the file exists and loads successfully. */)
1680 if (is_module) 1680 if (is_module)
1681 message_with_string ("Loading %s (module)...", file, 1); 1681 message_with_string ("Loading %s (module)...", file, 1);
1682 else if (is_native_elisp) 1682 else if (is_native_elisp)
1683 message_with_string ("Loading %s (native compiled elisp)...", file, 1); 1683 message_with_string ("Loading %s (native-compiled elisp)...", file, 1);
1684 else if (!compiled) 1684 else if (!compiled)
1685 message_with_string ("Loading %s (source)...", file, 1); 1685 message_with_string ("Loading %s (source)...", file, 1);
1686 else if (newer) 1686 else if (newer)
@@ -1759,7 +1759,7 @@ Return t if the file exists and loads successfully. */)
1759 if (is_module) 1759 if (is_module)
1760 message_with_string ("Loading %s (module)...done", file, 1); 1760 message_with_string ("Loading %s (module)...done", file, 1);
1761 else if (is_native_elisp) 1761 else if (is_native_elisp)
1762 message_with_string ("Loading %s (native compiled elisp)...done", file, 1); 1762 message_with_string ("Loading %s (native-compiled elisp)...done", file, 1);
1763 else if (!compiled) 1763 else if (!compiled)
1764 message_with_string ("Loading %s (source)...done", file, 1); 1764 message_with_string ("Loading %s (source)...done", file, 1);
1765 else if (newer) 1765 else if (newer)
diff --git a/src/pdumper.c b/src/pdumper.c
index b954421e225..7a8c5bba9ad 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -5503,7 +5503,7 @@ dump_do_dump_relocation (const uintptr_t dump_base,
5503 case RELOC_NATIVE_SUBR: 5503 case RELOC_NATIVE_SUBR:
5504 { 5504 {
5505 /* When resurrecting from a dump given non all the original 5505 /* When resurrecting from a dump given non all the original
5506 native compiled subrs may be still around we can't rely on 5506 native-compiled subrs may be still around we can't rely on
5507 a 'top_level_run' mechanism, we revive them one-by-one 5507 a 'top_level_run' mechanism, we revive them one-by-one
5508 here. */ 5508 here. */
5509 struct Lisp_Subr *subr = dump_ptr (dump_base, reloc_offset); 5509 struct Lisp_Subr *subr = dump_ptr (dump_base, reloc_offset);