diff options
| author | Bastien Guerry <bzg@altern.org> | 2012-08-11 10:39:23 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2012-08-11 10:39:23 +0200 |
| commit | ae21293a2eaac3e58855dc0c36d1b121dd86230f (patch) | |
| tree | 8ff66973a35a9be733cbb99e1332f65e55c55c2c | |
| parent | 8fb39ad25bb7cea71e4e751dbd10e88add506337 (diff) | |
| download | org-mode-ae21293a2eaac3e58855dc0c36d1b121dd86230f.tar.gz | |
Revert "org.el (org-emph-re): Tiny formatting fix"
This reverts commit 8fb39ad25bb7cea71e4e751dbd10e88add506337.
Er. Some changed should not be here.
| -rw-r--r-- | lisp/org.el | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/lisp/org.el b/lisp/org.el index 6e72497..16b40cb 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -3653,7 +3653,7 @@ When nil, the \\name form remains in the buffer." "Regular expression for matching emphasis. After a match, the match groups contain these elements: 0 The match of the full regular expression, including the characters - before and after the proper match + before and after the proper match 1 The character before the proper match, or empty at beginning of line 2 The proper match, including the leading and trailing markers 3 The leading marker like * or /, indicating the type of highlighting @@ -3745,13 +3745,15 @@ Use customize to modify this, or restart Emacs after changing it." (integer :tag "number of newlines allowed") (option (boolean :tag "Please ignore this button")))) -(defconst org-emphasis-alist +(defcustom org-emphasis-alist `(("*" bold "<b>" "</b>") ("/" italic "<i>" "</i>") ("_" underline "<span style=\"text-decoration:underline;\">" "</span>") ("=" org-code "<code>" "</code>" verbatim) ("~" org-verbatim "<code>" "</code>" verbatim) - ("+" ,(if (featurep 'xemacs) 'org-table '(:strike-through t)) "<del>" "</del>")) + ("+" ,(if (featurep 'xemacs) 'org-table '(:strike-through t)) + "<del>" "</del>") + ) "Special syntax for emphasized text. Text starting and ending with a special character will be emphasized, for example *bold*, _underlined_ and /italic/. This variable sets the marker @@ -3759,7 +3761,18 @@ characters, the face to be used by font-lock for highlighting in Org-mode Emacs buffers, and the HTML tags to be used for this. For LaTeX export, see the variable `org-export-latex-emphasis-alist'. For DocBook export, see the variable `org-export-docbook-emphasis-alist'. -Use customize to modify this, or restart Emacs after changing it.") +Use customize to modify this, or restart Emacs after changing it." + :group 'org-appearance + :set 'org-set-emph-re + :type '(repeat + (list + (string :tag "Marker character") + (choice + (face :tag "Font-lock-face") + (plist :tag "Face property list")) + (string :tag "HTML start tag") + (string :tag "HTML end tag") + (option (const verbatim))))) (defvar org-protecting-blocks '("src" "example" "latex" "ascii" "html" "docbook" "ditaa" "dot" "r" "R") |