branch: externals-release/org
commit 42cdf2a90e1db258a3fa911a074dc673d0ee65bc
Author: Ihor Radchenko <[email protected]>
Commit: Ihor Radchenko <[email protected]>

    org-emphasis-alist: Clarify that emphasis markers cannot be changed
    
    * lisp/org.el (org-emphasis-alist): Update the docstring, clarifying
    that emphasis markers cannot be changed to arbitrary markers.
    
    Link: https://orgmode.org/list/[email protected]
---
 lisp/org.el | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index f20cfb8fb4..66dc030444 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3708,8 +3708,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
@@ -3718,7 +3718,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"))

Reply via email to