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

org.el: Fix the contextual check against a function 

* 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

4
lisp/org.el
View File

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