diff options
| author | Bastien Guerry <bzg@altern.org> | 2014-03-05 15:47:55 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2014-03-05 15:47:55 +0100 |
| commit | 080f1dd5af712c1d23e1740a89ec91ad9c2ef18d (patch) | |
| tree | 3ed3d8a67caabb2d61b9da1ff411cce94b94eff3 | |
| parent | c9e6a07cdf3c86bee2c6435cdd813bd11ca2e40f (diff) | |
| parent | 9639edc5170515ff2eba55fd622dc029d639d711 (diff) | |
| download | org-mode-080f1dd5af712c1d23e1740a89ec91ad9c2ef18d.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | doc/org.texi | 4 | ||||
| -rw-r--r-- | lisp/org-colview.el | 2 | ||||
| -rw-r--r-- | lisp/org.el | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/org.texi b/doc/org.texi index 75dc8e0..7e66034 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -9729,8 +9729,8 @@ multiple footnotes side by side. @vindex org-fontify-emphasized-text @vindex org-emphasis-regexp-components @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 syntax, it is exported verbatim. diff --git a/lisp/org-colview.el b/lisp/org-colview.el index 805882d..705a29c 100644 --- a/lisp/org-colview.el +++ b/lisp/org-colview.el @@ -174,7 +174,7 @@ This is the compiled version of the format.") (face (list color font 'org-column ref-face)) (face1 (list color font 'org-agenda-column-dateline ref-face)) (cphr (get-text-property (point-at-bol) 'org-complex-heading-regexp)) - pom property ass width f fc string ov column val modval s2 title calc) + pom property ass width f fc string fm ov column val modval s2 title calc) ;; Check if the entry is in another buffer. (unless props (if (eq major-mode 'org-agenda-mode) diff --git a/lisp/org.el b/lisp/org.el index 2f0d891..6f4b853 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -4257,8 +4257,8 @@ You need to reload Org or to restart Emacs after customizing this.") `(("*" bold) ("/" italic) ("_" underline) - ("=" org-code verbatim) - ("~" org-verbatim verbatim) + ("=" org-verbatim verbatim) + ("~" org-code verbatim) ("+" ,(if (featurep 'xemacs) 'org-table '(:strike-through t)))) "Alist of characters and faces to emphasize text. Text starting and ending with a special character will be emphasized, |