Browse Source

Fix doc and code inconsistency: now use =verbatim= and ~code~.

* org.el (org-emphasis-alist): Use `org-verbatim' for =text=
and `org-code' for ~text~.

* org.texi (Emphasis and monospace): Document the use of
=verbatim= and ~code~ to be consistent with
`org-element-text-markup-successor'.

Thanks to Yasushi for reporting this.
Bastien Guerry 11 years ago
parent
commit
adbb2f7c9f
2 changed files with 4 additions and 4 deletions
  1. 2 2
      doc/org.texi
  2. 2 2
      lisp/org.el

+ 2 - 2
doc/org.texi

@@ -9738,8 +9738,8 @@ multiple footnotes side by side.
 @vindex org-fontify-emphasized-text
 @vindex org-fontify-emphasized-text
 @vindex org-emphasis-regexp-components
 @vindex org-emphasis-regexp-components
 @vindex org-emphasis-alist
 @vindex org-emphasis-alist
-You can make words @b{*bold*}, @i{/italic/}, _underlined_, @code{=code=}
-and @code{~verbatim~}, and, if you must, @samp{+strike-through+}.  Text
+You can make words @b{*bold*}, @i{/italic/}, _underlined_, @code{=verbatim=}
+and @code{~code~}, and, if you must, @samp{+strike-through+}.  Text
 in the code and verbatim string is not processed for Org mode specific
 in the code and verbatim string is not processed for Org mode specific
 syntax, it is exported verbatim.
 syntax, it is exported verbatim.
 
 

+ 2 - 2
lisp/org.el

@@ -4120,8 +4120,8 @@ You need to reload Org or to restart Emacs after customizing this.")
   `(("*" bold)
   `(("*" bold)
     ("/" italic)
     ("/" italic)
     ("_" underline)
     ("_" underline)
-    ("=" org-code verbatim)
-    ("~" org-verbatim verbatim)
+    ("=" org-verbatim verbatim)
+    ("~" org-code verbatim)
     ("+" ,(if (featurep 'xemacs) 'org-table '(:strike-through t))))
     ("+" ,(if (featurep 'xemacs) 'org-table '(:strike-through t))))
   "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,