diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-03-21 06:30:40 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2022-03-21 06:30:40 +0100 |
| commit | 7cee79655656f02c36fb2858eccce477b7d90b6b (patch) | |
| tree | 8befaf2f83bf75eea544ee6996fc16386abc34b4 /lisp | |
| parent | a379f50acb023e37c1731a41c49e1d3d8a34e858 (diff) | |
| parent | f15922a57cd6177c9c945d3390a6b9918883415d (diff) | |
| download | emacs-7cee79655656f02c36fb2858eccce477b7d90b6b.tar.gz emacs-7cee79655656f02c36fb2858eccce477b7d90b6b.tar.bz2 emacs-7cee79655656f02c36fb2858eccce477b7d90b6b.zip | |
Merge from origin/emacs-28
f15922a57c Update to Org 9.5.2-25-gaf6f12
9fcdd5b63f Improve doc strings of read-char-from-minibuffer-insert-* ...
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/org/org-mouse.el | 2 | ||||
| -rw-r--r-- | lisp/org/org-version.el | 2 | ||||
| -rw-r--r-- | lisp/subr.el | 10 |
3 files changed, 8 insertions, 6 deletions
diff --git a/lisp/org/org-mouse.el b/lisp/org/org-mouse.el index 8d5be425453..20c20acc320 100644 --- a/lisp/org/org-mouse.el +++ b/lisp/org/org-mouse.el @@ -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) diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index a38b79304ef..e82dbbf398c 100644 --- a/lisp/org/org-version.el +++ b/lisp/org/org-version.el @@ -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) diff --git a/lisp/subr.el b/lisp/subr.el index 2321765f953..8aadcfd453c 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -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) |