diff options
author | Bastien Guerry <bzg@altern.org> | 2014-05-22 12:56:18 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2014-05-22 12:56:18 +0200 |
commit | 92d84410efeef733725d397fc3719cf02ea75816 (patch) | |
tree | a818eb81df1d63c5d8824b674970a0881c9e371c | |
parent | 1ca86f555ffd2dd8e0097f4474c7ac029fd00712 (diff) | |
parent | 445a8ec66efce091da92d9d65471fcaaa7b27cc0 (diff) | |
download | org-mode-92d84410efeef733725d397fc3719cf02ea75816.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-agenda.el | 9 | ||||
-rw-r--r-- | lisp/org.el | 5 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 3a8f1fd..6a2aa48 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -7293,9 +7293,12 @@ in the agenda." (put 'org-agenda-tag-filter :preset-filter tag-preset) (put 'org-agenda-category-filter :preset-filter cat-preset) (put 'org-agenda-regexp-filter :preset-filter re-preset) - (and (or tag-filter tag-preset) (org-agenda-filter-apply tag-filter 'tag)) - (and (or cat-filter cat-preset) (org-agenda-filter-apply cat-filter 'category)) - (and (or re-filter re-preset) (org-agenda-filter-apply re-filter 'regexp)) + (let ((tag (or tag-filter tag-preset)) + (cat (or cat-filter cat-preset)) + (re (or re-filter re-preset))) + (when tag (org-agenda-filter-apply tag 'tag)) + (when cat (org-agenda-filter-apply cat 'category)) + (when re (org-agenda-filter-apply re 'regexp))) (and top-hl-filter (org-agenda-filter-top-headline-apply top-hl-filter)) (and cols (org-called-interactively-p 'any) (org-agenda-columns)) (org-goto-line line) diff --git a/lisp/org.el b/lisp/org.el index 3825eca..b16515e 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -15393,7 +15393,10 @@ things up because then unnecessary parsing is avoided." '("SCHEDULED" "DEADLINE" "CLOCK" "CLOSED" "TIMESTAMP" "TIMESTAMP_IA"))) (catch 'match - (while (re-search-forward org-maybe-keyword-time-regexp end t) + (while (and (re-search-forward org-maybe-keyword-time-regexp end t) + (not (text-property-any 0 (length (match-string 0)) + 'face 'font-lock-comment-face + (match-string 0)))) (setq key (if (match-end 1) (substring (org-match-string-no-properties 1) 0 -1)) |