mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-30 17:03:09 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Bastien Guerry 2014-05-22 13:39:13 +02:00
parent 21d6d7c3a0 3a262e12e2
commit 9a6234ff81
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lisp/org-agenda.el
View file

@ -2095,6 +2095,7 @@ When nil, `q' will kill the single agenda buffer."
org-agenda-columns-active org-agenda-columns-active
org-agenda-tag-filter org-agenda-tag-filter
org-agenda-category-filter org-agenda-category-filter
org-agenda-top-headline-filter
org-agenda-regexp-filter org-agenda-regexp-filter
org-agenda-markers org-agenda-markers
org-agenda-last-search-view-search-was-boolean org-agenda-last-search-view-search-was-boolean
@ -7324,7 +7325,7 @@ The category is that of the current line."
(org-agenda-filter-apply (org-agenda-filter-apply
(setq org-agenda-category-filter (setq org-agenda-category-filter
(list (concat "+" cat))) 'category)) (list (concat "+" cat))) 'category))
((error "No category at point")))))) (t (error "No category at point"))))))
(defun org-find-top-headline (&optional pos) (defun org-find-top-headline (&optional pos)
"Find the topmost parent headline and return it." "Find the topmost parent headline and return it."
@ -7345,10 +7346,10 @@ The top headline is that of the current line."
(progn (progn
(setq org-agenda-filtered-by-top-headline nil (setq org-agenda-filtered-by-top-headline nil
org-agenda-top-headline-filter nil) org-agenda-top-headline-filter nil)
(org-agenda-filter-show-all-cat)) (org-agenda-filter-show-all-top-filter))
(let ((cat (org-find-top-headline (org-get-at-bol 'org-hd-marker)))) (let ((toph (org-find-top-headline (org-get-at-bol 'org-hd-marker))))
(if cat (org-agenda-filter-top-headline-apply cat strip) (if toph (org-agenda-filter-top-headline-apply toph strip)
(error "No top-level category at point"))))) (error "No top-level headline at point")))))
(defvar org-agenda-regexp-filter nil) (defvar org-agenda-regexp-filter nil)
(defun org-agenda-filter-by-regexp (strip) (defun org-agenda-filter-by-regexp (strip)
@ -7378,6 +7379,8 @@ With two prefix arguments, remove the regexp filters."
(org-agenda-filter-show-all-cat)) (org-agenda-filter-show-all-cat))
(when org-agenda-regexp-filter (when org-agenda-regexp-filter
(org-agenda-filter-show-all-re)) (org-agenda-filter-show-all-re))
(when org-agenda-top-headline-filter
(org-agenda-filter-show-all-top-filter))
(org-agenda-finalize)) (org-agenda-finalize))
(defun org-agenda-filter-by-tag (strip &optional char narrow) (defun org-agenda-filter-by-tag (strip &optional char narrow)
@ -7640,7 +7643,7 @@ When NO-OPERATOR is non-nil, do not add the + operator to returned tags."
(tophl (and pos (org-find-top-headline pos)))) (tophl (and pos (org-find-top-headline pos))))
(if (and tophl (funcall (if negative 'identity 'not) (if (and tophl (funcall (if negative 'identity 'not)
(string= hl tophl))) (string= hl tophl)))
(org-agenda-filter-hide-line 'category))) (org-agenda-filter-hide-line 'top-headline)))
(beginning-of-line 2))) (beginning-of-line 2)))
(if (get-char-property (point) 'invisible) (if (get-char-property (point) 'invisible)
(org-agenda-previous-line)) (org-agenda-previous-line))
@ -7667,7 +7670,8 @@ When NO-OPERATOR is non-nil, do not add the + operator to returned tags."
`(invisible t org-filter-type ,type)))) `(invisible t org-filter-type ,type))))
(set (intern (format "org-agenda-%s-filter" (intern-soft type))) nil) (set (intern (format "org-agenda-%s-filter" (intern-soft type))) nil)
(setq org-agenda-filter-form nil) (setq org-agenda-filter-form nil)
(org-agenda-set-mode-name)) (org-agenda-set-mode-name)
(org-agenda-finalize))
(defun org-agenda-filter-show-all-tag nil (defun org-agenda-filter-show-all-tag nil
(org-agenda-remove-filter 'tag)) (org-agenda-remove-filter 'tag))
@ -7675,6 +7679,8 @@ When NO-OPERATOR is non-nil, do not add the + operator to returned tags."
(org-agenda-remove-filter 'regexp)) (org-agenda-remove-filter 'regexp))
(defun org-agenda-filter-show-all-cat nil (defun org-agenda-filter-show-all-cat nil
(org-agenda-remove-filter 'category)) (org-agenda-remove-filter 'category))
(defun org-agenda-filter-show-all-top-filter nil
(org-agenda-remove-filter 'top-headline))
(defun org-agenda-manipulate-query-add () (defun org-agenda-manipulate-query-add ()
"Manipulate the query by adding a search term with positive selection. "Manipulate the query by adding a search term with positive selection.