From: Stefan Kangas Date: Thu, 3 Feb 2022 05:30:29 +0000 (+0100) Subject: Merge from origin/emacs-28 X-Git-Tag: emacs-29.0.90~2562 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dce93e397d54de19353a9e768757009043be1fc2;p=emacs.git Merge from origin/emacs-28 ab2f275422 Improve documentation of 'emacs-version' --- dce93e397d54de19353a9e768757009043be1fc2 diff --cc lisp/version.el index 45f72b4329f,fa755c78676..7e360209d85 --- a/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")