1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

Merge from origin/emacs-28

f15922a57c Update to Org 9.5.2-25-gaf6f12
9fcdd5b63f Improve doc strings of read-char-from-minibuffer-insert-* ...
This commit is contained in:
Stefan Kangas 2022-03-21 06:30:40 +01:00
commit 7cee796556
3 changed files with 8 additions and 6 deletions

View file

@ -295,7 +295,7 @@ nor a function, elements of KEYWORDS are used directly."
((functionp itemformat) (funcall itemformat keyword))
((stringp itemformat) (format itemformat keyword))
(t keyword))
(list 'funcall function keyword)
`(funcall #',function ,keyword)
:style (cond
((null selected) t)
((functionp selected) 'toggle)

View file

@ -11,7 +11,7 @@ Inserted by installing Org mode or when a release is made."
(defun org-git-version ()
"The Git version of Org mode.
Inserted by installing Org or when a release is made."
(let ((org-git-version "release_9.5.2-24-g668205"))
(let ((org-git-version "release_9.5.2-25-gaf6f12"))
org-git-version))
(provide 'org-version)