mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-12 05:39:55 +00:00
Code Releases Activity

org.el: Fix the contextual check against a function

Browse source 
* org.el (org-contextualize-validate-key): Fix the check
against a function.
This commit is contained in:
Bastien Guerry 2012-08-24 14:22:45 +02:00
parent 10dbdf5fc2
commit bfe3e2102f
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lisp/org.el
View file

@ -8675,17 +8675,17 @@ definitions."
(lambda (rr) (lambda (rr)
(when (when
(and (equal key (car r)) (and (equal key (car r))
(or (and (eq (car rr) 'in-file) (if (functionp rr) (funcall rr)
(buffer-file-name) (or (and (eq (car rr) 'in-file)
(string-match (cdr rr) (buffer-file-name))) (buffer-file-name)
(and (eq (car rr) 'in-mode) (string-match (cdr rr) (buffer-file-name)))
(string-match (cdr rr) (symbol-name major-mode))) (and (eq (car rr) 'in-mode)
(when (and (eq (car rr) 'not-in-file) (string-match (cdr rr) (symbol-name major-mode)))
(buffer-file-name)) (when (and (eq (car rr) 'not-in-file)
(not (string-match (cdr rr) (buffer-file-name)))) (buffer-file-name))
(when (eq (car rr) 'not-in-mode) (not (string-match (cdr rr) (buffer-file-name))))
(not (string-match (cdr rr) (symbol-name major-mode)))) (when (eq (car rr) 'not-in-mode)
(when (functionp rr) (funcall rr)))) (not (string-match (cdr rr) (symbol-name major-mode)))))))
(push r res))) (push r res)))
(car (last r)))) (car (last r))))
(delete-dups (delq nil res)))) (delete-dups (delq nil res))))