ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-03-05 15:47:55 +01:00
parent c9e6a07cdf 9639edc517
commit 080f1dd5af
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/org.texi
View File

@ -9729,8 +9729,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=} You can make words @b{*bold*}, @i{/italic/}, _underlined_, @code{=verbatim=}
and @code{~verbatim~}, and, if you must, @samp{+strike-through+}. Text 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
lisp/org-colview.el
View File

@ -174,7 +174,7 @@ This is the compiled version of the format.")
(face (list color font 'org-column ref-face)) (face (list color font 'org-column ref-face))
(face1 (list color font 'org-agenda-column-dateline ref-face)) (face1 (list color font 'org-agenda-column-dateline ref-face))
(cphr (get-text-property (point-at-bol) 'org-complex-heading-regexp)) (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. ;; Check if the entry is in another buffer.
(unless props (unless props
(if (eq major-mode 'org-agenda-mode) (if (eq major-mode 'org-agenda-mode)

4
lisp/org.el
View File

@ -4257,8 +4257,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,