From bfe3e2102fa656109e6ec04265c41ca3bd15c417 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 24 Aug 2012 14:22:45 +0200 Subject: [PATCH] org.el: Fix the contextual check against a function * org.el (org-contextualize-validate-key): Fix the check against a function. --- lisp/org.el | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index b3ae268cf..4a8e59086 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -8675,17 +8675,17 @@ definitions." (lambda (rr) (when (and (equal key (car r)) - (or (and (eq (car rr) 'in-file) - (buffer-file-name) - (string-match (cdr rr) (buffer-file-name))) - (and (eq (car rr) 'in-mode) - (string-match (cdr rr) (symbol-name major-mode))) - (when (and (eq (car rr) 'not-in-file) - (buffer-file-name)) - (not (string-match (cdr rr) (buffer-file-name)))) - (when (eq (car rr) 'not-in-mode) - (not (string-match (cdr rr) (symbol-name major-mode)))) - (when (functionp rr) (funcall rr)))) + (if (functionp rr) (funcall rr) + (or (and (eq (car rr) 'in-file) + (buffer-file-name) + (string-match (cdr rr) (buffer-file-name))) + (and (eq (car rr) 'in-mode) + (string-match (cdr rr) (symbol-name major-mode))) + (when (and (eq (car rr) 'not-in-file) + (buffer-file-name)) + (not (string-match (cdr rr) (buffer-file-name)))) + (when (eq (car rr) 'not-in-mode) + (not (string-match (cdr rr) (symbol-name major-mode))))))) (push r res))) (car (last r)))) (delete-dups (delq nil res)))) -- 2.11.4.GIT