Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-12-19 00:23:39 +01:00
commit 57e0814ac0
1 changed files with 1 additions and 1 deletions

View File

@ -3673,7 +3673,7 @@ A good way to set it is through options in `org-agenda-custom-commands'.")
Also moves point to the end of the skipped region, so that search can Also moves point to the end of the skipped region, so that search can
continue from there." continue from there."
(let ((p (point-at-bol)) to) (let ((p (point-at-bol)) to)
(when (org-in-src-block-p) (throw :skip t)) (when (org-in-src-block-p t) (throw :skip t))
(and org-agenda-skip-archived-trees (not org-agenda-archives-mode) (and org-agenda-skip-archived-trees (not org-agenda-archives-mode)
(get-text-property p :org-archived) (get-text-property p :org-archived)
(org-end-of-subtree t) (org-end-of-subtree t)