mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'bugfix'

This commit is contained in:
Ihor Radchenko 2024-04-10 11:18:25 +03:00
parent 9d636473be 42cdf2a90e
commit 85389da8cf
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/org.el
View File

@ -3781,8 +3781,8 @@ You need to reload Org or to restart Emacs after setting this.")
"Alist of characters and faces to emphasize text. "Alist of characters and faces to emphasize text.
Text starting and ending with a special character will be emphasized, Text starting and ending with a special character will be emphasized,
for example *bold*, _underlined_ and /italic/. This variable sets the for example *bold*, _underlined_ and /italic/. This variable sets the
marker characters and the face to be used by font-lock for highlighting the face to be used by font-lock for highlighting in Org buffers.
in Org buffers. Marker characters must be one of */_=~+.
You need to reload Org or to restart Emacs after customizing this." You need to reload Org or to restart Emacs after customizing this."
:group 'org-appearance :group 'org-appearance
@ -3791,7 +3791,13 @@ You need to reload Org or to restart Emacs after customizing this."
:package-version '(Org . "8.0") :package-version '(Org . "8.0")
:type '(repeat :type '(repeat
(list (list
(string :tag "Marker character") (choice
(const :tag "Bold" "*")
(const :tag "Italic" "/")
(const :tag "Underline" "_")
(const :tag "Verbatim" "=")
(const :tag "Code" "~")
(const :tag "Strike through" "+"))
(choice (choice
(face :tag "Font-lock-face") (face :tag "Font-lock-face")
(plist :tag "Face property list")) (plist :tag "Face property list"))