aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2021-10-25 09:34:37 -0700
committerGlenn Morris2021-10-25 09:34:37 -0700
commitf2dfe1e780f0a779f50650fcf457b33031fa9584 (patch)
tree8bfd35530648a3aedf6a66a92bda21c61db96ad9 /src
parentd1e4d89b325af255644cb030ba9e5bdae7c2d69c (diff)
parent817c929edaf77dbdcd2ce7b9e6bbd3a5c57604f1 (diff)
downloademacs-f2dfe1e780f0a779f50650fcf457b33031fa9584.tar.gz
emacs-f2dfe1e780f0a779f50650fcf457b33031fa9584.zip
Merge from origin/emacs-28
817c929eda Doc fix for concat 3eca2ad2a1 * lisp/image-dired.el (image-dired-external-viewer): Suppo...
Diffstat (limited to 'src')
-rw-r--r--src/fns.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/fns.c b/src/fns.c
index 61182852ba7..76c76c92ba9 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -672,6 +672,9 @@ DEFUN ("concat", Fconcat, Sconcat, 0, MANY, 0,
672 doc: /* Concatenate all the arguments and make the result a string. 672 doc: /* Concatenate all the arguments and make the result a string.
673The result is a string whose elements are the elements of all the arguments. 673The result is a string whose elements are the elements of all the arguments.
674Each argument may be a string or a list or vector of characters (integers). 674Each argument may be a string or a list or vector of characters (integers).
675
676Values of the `composition' property of the result are not guaranteed
677to be `eq'.
675usage: (concat &rest SEQUENCES) */) 678usage: (concat &rest SEQUENCES) */)
676 (ptrdiff_t nargs, Lisp_Object *args) 679 (ptrdiff_t nargs, Lisp_Object *args)
677{ 680{