Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-06-04 09:32:16 +02:00
commit 1e872ea624
1 changed files with 1 additions and 2 deletions

View File

@ -316,8 +316,7 @@ with working links."
(defun org-wikinodes-add-to-font-lock-keywords () (defun org-wikinodes-add-to-font-lock-keywords ()
"Add wikinode CamelCase highlighting to `org-font-lock-extra-keywords'." "Add wikinode CamelCase highlighting to `org-font-lock-extra-keywords'."
(let ((m (member '(org-activate-plain-links (0 'org-link t)) (let ((m (member '(org-activate-links) org-font-lock-extra-keywords)))
org-font-lock-extra-keywords)))
(if m (push '(org-wikinodes-activate-links) (cdr m)) (if m (push '(org-wikinodes-activate-links) (cdr m))
(message "Failed to add wikinodes to `org-font-lock-extra-keywords'.")))) (message "Failed to add wikinodes to `org-font-lock-extra-keywords'."))))