mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-28

Browse source 
ab2f275422 Improve documentation of 'emacs-version'
This commit is contained in:
Stefan Kangas 2022-02-03 06:30:29 +01:00
commit dce93e397d
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
doc/emacs/trouble.texi
View file

@ -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

9
lisp/version.el
View file

@ -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")