tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-06-16 11:41:36 +02:00
parent b414844daa 5556865893
commit 1c9aa1e78e
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lisp/org-agenda.el
View File

@ -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 ;; Deactivate `org-agenda-entry-text-mode' when filtering
(if org-agenda-entry-text-mode (org-agenda-entry-text-mode)) (if org-agenda-entry-text-mode (org-agenda-entry-text-mode))
(let (tags cat txt) (let (tags cat txt)
(setq org-agenda-filter-form (setq org-agenda-filter-form (org-agenda-filter-make-matcher filter type))
(org-agenda-filter-make-matcher filter type)) ;; Only set `org-agenda-filtered-by-category' to t when a unique
(if (and (eq type 'category) ;; category is used as the filter:
(not (equal (substring (car filter) 0 1) "-"))) (setq org-agenda-filtered-by-category
;; Only set `org-agenda-filtered-by-category' to t (and (eq type 'category)
;; when a unique category is used as the filter (not (equal (substring (car filter) 0 1) "-"))))
(setq org-agenda-filtered-by-category t))
(org-agenda-set-mode-name) (org-agenda-set-mode-name)
(save-excursion (save-excursion
(goto-char (point-min)) (goto-char (point-min))