From adbb2f7c9fcd3c6e0f5d4b8cccf8ac2e2e481597 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 4 Mar 2014 10:49:49 +0100 Subject: [PATCH 1/2] 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. --- doc/org.texi | 4 ++-- lisp/org.el | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/org.texi b/doc/org.texi index 90f1dde49..9b651fd57 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -9738,8 +9738,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.el b/lisp/org.el index 814a16dee..d7b08327e 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -4120,8 +4120,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, From 9639edc5170515ff2eba55fd622dc029d639d711 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Wed, 5 Mar 2014 15:47:41 +0100 Subject: [PATCH 2/2] org-colview.el (org-columns-display-here): Let-bind `fm' * org-colview.el (org-columns-display-here): Let-bind `fm'. --- lisp/org-colview.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-colview.el b/lisp/org-colview.el index 733acc7d4..07ee69f14 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)