summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-06-16 09:41:36 (GMT)
committer Bastien Guerry <bzg@altern.org>2014-06-16 09:41:36 (GMT)
commit1c9aa1e78e97078202480f328e0b370f31902123 (patch)
tree98b6e311d85214d887e1fe19f326785e1ff6d85d
parentb414844daac3ef239419168ede9bd15808dc47da (diff)
parent5556865893bd64b3df928968875e08df97ca6b44 (diff)
downloadorg-mode-1c9aa1e78e97078202480f328e0b370f31902123.zip
org-mode-1c9aa1e78e97078202480f328e0b370f31902123.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-agenda.el13
1 files changed, 6 insertions, 7 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 55fc1d3..f11cd08 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -7634,13 +7634,12 @@ When NO-OPERATOR is non-nil, do not add the + operator to returned tags."
;; Deactivate `org-agenda-entry-text-mode' when filtering
(if org-agenda-entry-text-mode (org-agenda-entry-text-mode))
(let (tags cat txt)
- (setq org-agenda-filter-form
- (org-agenda-filter-make-matcher filter type))
- (if (and (eq type 'category)
- (not (equal (substring (car filter) 0 1) "-")))
- ;; Only set `org-agenda-filtered-by-category' to t
- ;; when a unique category is used as the filter
- (setq org-agenda-filtered-by-category t))
+ (setq org-agenda-filter-form (org-agenda-filter-make-matcher filter type))
+ ;; Only set `org-agenda-filtered-by-category' to t when a unique
+ ;; category is used as the filter:
+ (setq org-agenda-filtered-by-category
+ (and (eq type 'category)
+ (not (equal (substring (car filter) 0 1) "-"))))
(org-agenda-set-mode-name)
(save-excursion
(goto-char (point-min))