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 
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
Download patch file Download diff file Expand all files Collapse all files

2
lisp/org/org-mouse.el
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)

2
lisp/org/org-version.el
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)

10
lisp/subr.el
View file

@ -3118,7 +3118,7 @@ If there is a natural number at point, use it as default."
(make-hash-table :test 'equal))
(defun read-char-from-minibuffer-insert-char ()
"Insert the character you type in the minibuffer and exit.
"Insert the character you type into the minibuffer and exit minibuffer.
Discard all previous input before inserting and exiting the minibuffer."
(interactive)
(when (minibufferp)
@ -3127,9 +3127,11 @@ Discard all previous input before inserting and exiting the minibuffer."
(exit-minibuffer)))
(defun read-char-from-minibuffer-insert-other ()
"Handle inserting of a character other than allowed.
Display an error on trying to insert a disallowed character.
Also discard all previous input in the minibuffer."
"Reject a disallowed character typed into the minibuffer.
This command is intended to be bound to keys that users are not
allowed to type into the minibuffer. When the user types any
such key, this command discard all minibuffer input and displays
an error message."
(interactive)
(when (minibufferp)
(delete-minibuffer-contents)