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

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2018-01-28 17:10:13 +01:00
parent 00dbb3089f 5b4a711949
commit 55e8c6f9c3
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lisp/org.el
View File

@ -5973,17 +5973,21 @@ by a #."
(defun org-fontify-macros (limit) (defun org-fontify-macros (limit)
"Fontify macros." "Fontify macros."
(when (re-search-forward "\\({{{\\).+?\\(}}}\\)" limit t) (when (re-search-forward "{{{\\([a-zA-Z][-a-zA-Z0-9_]*\\)" limit t)
(add-text-properties (let ((begin (match-beginning 0))
(match-beginning 0) (match-end 0) (opening-end (match-beginning 1)))
'(font-lock-fontified t face org-macro)) (when (and (re-search-forward "\n[ \t]*\n\\|\\(}}}\\)" limit t)
(when org-hide-macro-markers (match-string 1))
(add-text-properties (match-end 2) (match-beginning 2) (let ((end (match-end 1))
'(invisible t)) (closing-start (match-beginning 1)))
(add-text-properties (match-beginning 1) (match-end 1) (add-text-properties
'(invisible t))) begin end
(org-remove-flyspell-overlays-in (match-beginning 0) (match-end 0)) '(font-lock-multiline t font-lock-fontified t face org-macro))
t)) (org-remove-flyspell-overlays-in begin end)
(when org-hide-macro-markers
(add-text-properties begin opening-end '(invisible t))
(add-text-properties closing-start end '(invisible t)))
t)))))
(defun org-activate-footnote-links (limit) (defun org-activate-footnote-links (limit)
"Add text properties for footnotes." "Add text properties for footnotes."