branch: externals/org
commit 85389da8cfe1a86934a2765c30c41f969a9c6f28
Merge: 9d636473be 42cdf2a90e
Author: Ihor Radchenko <[email protected]>
Commit: Ihor Radchenko <[email protected]>
Merge branch 'bugfix'
---
lisp/org.el | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index d64b15477b..d9d4290e90 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3781,8 +3781,8 @@ You need to reload Org or to restart Emacs after setting
this.")
"Alist of characters and faces to emphasize text.
Text starting and ending with a special character will be emphasized,
for example *bold*, _underlined_ and /italic/. This variable sets the
-marker characters and the face to be used by font-lock for highlighting
-in Org buffers.
+the face to be used by font-lock for highlighting in Org buffers.
+Marker characters must be one of */_=~+.
You need to reload Org or to restart Emacs after customizing this."
:group 'org-appearance
@@ -3791,7 +3791,13 @@ You need to reload Org or to restart Emacs after
customizing this."
:package-version '(Org . "8.0")
:type '(repeat
(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
(face :tag "Font-lock-face")
(plist :tag "Face property list"))
