Merge from origin/emacs-28

ab2f275422 Improve documentation of 'emacs-version'

diff --cc lisp/version.el
index 45f72b4329f7aea34e111a2479fe7f79657b5cf8,fa755c78676ff71b9dfdd50693d1a2c51467de28..7e360209d85d39684d1f745f4a07f1403b4dddab
--- 1/lisp/version.el
--- 2/lisp/version.el
+++ b/lisp/version.el
@@@ -53,11 -53,14 +53,16 @@@ developing Emacs."
  (defvar ns-version-string)
  (defvar cairo-version-string)
  
 +(declare-function haiku-get-version-string "haikufns.c")
 +
  (defun emacs-version (&optional here)
-   "Return string describing the version of Emacs that is running.
- If optional argument HERE is non-nil, insert string at point.
+   "Display the version of Emacs that is running in this session.
+ With a prefix argument, insert the Emacs version string at point
+ instead of displaying it.
+ If called from Lisp, by default return the version string; but
+ if the optional argument HERE is non-nil, insert the string at
+ point instead.
+ 
  Don't use this function in programs to choose actions according
  to the system configuration; look at `system-configuration' instead."
    (interactive "P")