diff options
author | Sébastien Delafond <sdelafond@gmail.com> | 2015-08-25 12:27:35 +0200 |
---|---|---|
committer | Sébastien Delafond <sdelafond@gmail.com> | 2015-08-25 12:27:35 +0200 |
commit | 1be13d57dc8357576a8285c6dadc03db9e3ed7b0 (patch) | |
tree | e35b32d4dbd60cb6cea09f3c0797cc8877352def /contrib/lisp/org-wikinodes.el | |
parent | 4dc4918d0d667f18f3d5e3dd71e6f117ddb8af8a (diff) |
Imported Upstream version 8.3.1
Diffstat (limited to 'contrib/lisp/org-wikinodes.el')
-rw-r--r-- | contrib/lisp/org-wikinodes.el | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/contrib/lisp/org-wikinodes.el b/contrib/lisp/org-wikinodes.el index 015e001..ff2d55a 100644 --- a/contrib/lisp/org-wikinodes.el +++ b/contrib/lisp/org-wikinodes.el @@ -82,8 +82,6 @@ to `directory'." ;; in heading - deactivate flyspell (org-remove-flyspell-overlays-in (match-beginning 0) (match-end 0)) - (add-text-properties (match-beginning 0) (match-end 0) - '(org-no-flyspell t)) t) ;; this is a wiki link (org-remove-flyspell-overlays-in (match-beginning 0) @@ -270,7 +268,6 @@ If there is no such wiki target, return nil." (car org-export-target-aliases)))) (push (caar target-alist) (cdr a))))) -(defvar org-current-export-file) (defun org-wikinodes-process-links-for-export () "Process Wiki links in the export preprocess buffer. @@ -296,12 +293,6 @@ with working links." ((eq org-wikinodes-scope 'file) ;; No match in file, and other files are not allowed (insert (format "%s" link))) - ((setq file - (and (org-string-nw-p org-current-export-file) - (org-wikinodes-which-file - link (file-name-directory org-current-export-file)))) - ;; Match in another file in the current directory - (insert (format "[[file:%s::%s][%s]]" file link link))) (t ;; No match for this link (insert (format "%s" link))))))))) @@ -325,11 +316,10 @@ with working links." (defun org-wikinodes-add-to-font-lock-keywords () "Add wikinode CamelCase highlighting to `org-font-lock-extra-keywords'." - (let ((m (member '(org-activate-plain-links) org-font-lock-extra-keywords))) - (if m - (setcdr m (cons '(org-wikinodes-activate-links) (cdr m))) - (message - "Failed to add wikinodes to `org-font-lock-extra-keywords'.")))) + (let ((m (member '(org-activate-plain-links (0 'org-link t)) + org-font-lock-extra-keywords))) + (if m (push '(org-wikinodes-activate-links) (cdr m)) + (message "Failed to add wikinodes to `org-font-lock-extra-keywords'.")))) (add-hook 'org-font-lock-set-keywords-hook 'org-wikinodes-add-to-font-lock-keywords) |