diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2024-03-16 05:47:41 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2024-03-16 05:47:41 -0400 |
| commit | cc8a2c57b5eed4045035dfeaf129ce33d7f74733 (patch) | |
| tree | 793edac12eec2ecc8539441e152e7b33fad9ab78 /src | |
| parent | 899ea79310d1b8ed78c3fd8ac1784043dd732dbf (diff) | |
| parent | 3b791ebbe173fa18515558acaafbef1f88c51791 (diff) | |
| download | emacs-cc8a2c57b5eed4045035dfeaf129ce33d7f74733.tar.gz | |
Merge from origin/emacs-29
3b791ebbe17 ; Fix 'usage:' keyword in Ffile_name_concat doc.
ed48b0d657c ; * CONTRIBUTE: Ask not to use non-ASCII unless necessary.
b708e639d63 ; * src/lread.c (maybe_swap_for_eln): Clarify warning mes...
db027a06976 ; Fix bibtex-biblatex-field-alist docstring typo.
a9be5c7ea92 ; * doc/lispref/control.texi (Conditionals): Add missing ...
db5915f30ba Fix 'with-sqlite-transaction'
fe491173e8f ; * doc/emacs/files.texi (Image Mode): Fix typo (bug#69671).
Diffstat (limited to 'src')
| -rw-r--r-- | src/fileio.c | 2 | ||||
| -rw-r--r-- | src/lread.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/fileio.c b/src/fileio.c index 483498fd879..12da7a9ed3a 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -847,7 +847,7 @@ Each element in COMPONENTS must be a string or nil. DIRECTORY or the non-final elements in COMPONENTS may or may not end with a slash -- if they don't end with a slash, a slash will be inserted before concatenating. -usage: (record DIRECTORY &rest COMPONENTS) */) +usage: (file-name-concat DIRECTORY &rest COMPONENTS) */) (ptrdiff_t nargs, Lisp_Object *args) { ptrdiff_t chars = 0, bytes = 0, multibytes = 0, eargs = 0; diff --git a/src/lread.c b/src/lread.c index 49683d02401..1cb941e84fc 100644 --- a/src/lread.c +++ b/src/lread.c @@ -1950,9 +1950,9 @@ maybe_swap_for_eln (bool no_native, Lisp_Object *filename, int *fd, = Fcons (list2 (Qcomp, CALLN (Fformat, - build_string ("Cannot look up eln " - "file as no source file " - "was found for %s"), + build_string ("Cannot look up .eln file " + "for %s because no source " + "file was found for it"), *filename)), Vdelayed_warnings_list); return; |