master dce93e397d: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit dce93e397d54de19353a9e768757009043be1fc2
Merge: 3d7f17bf80 ab2f275422
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    ab2f275422 Improve documentation of 'emacs-version'
---
 doc/emacs/trouble.texi | 10 ++++++----
 lisp/version.el        |  9 +++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index e966565f00..93f9c779db 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -782,10 +782,12 @@ Emacs, so you will have to report the bug somewhere else.
 
 @item
 The type of machine you are using, and the operating system name and
-version number (again, automatically included by @kbd{M-x
-report-emacs-bug}).  @kbd{M-x emacs-version @key{RET}} provides this
-information too.  Copy its output from the @file{*Messages*} buffer,
-so that you get it all and get it accurately.
+version number (again, automatically included by @w{@kbd{M-x
+report-emacs-bug}}).  @w{@kbd{M-x emacs-version @key{RET}}} provides
+this information too.  Copy its output from the @file{*Messages*}
+buffer, so that you get it all and get it accurately, or use
+@w{@kbd{C-u M-x emacs-version @key{RET}}} to insert the version
+information into the current buffer.
 
 @item
 The operands given to the @code{configure} command when Emacs was
diff --git a/lisp/version.el b/lisp/version.el
index 45f72b4329..7e360209d8 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -56,8 +56,13 @@ developing Emacs.")
 (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")