summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-22 15:39:28 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-22 15:39:28 (GMT)
commit196c5797d20e13c122097d1e3d3adf0969c8e59b (patch)
tree3619888083de3c0927af59debf82e23775d80860
parente79349ad785c970fe41128d1be4886be42679a77 (diff)
parent211b137ef46d04b17b46f256696eb5c1c3a1d2be (diff)
downloadorg-mode-196c5797d20e13c122097d1e3d3adf0969c8e59b.zip
org-mode-196c5797d20e13c122097d1e3d3adf0969c8e59b.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-agenda.el25
1 files changed, 12 insertions, 13 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index a3d713e..48f1dda 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -3753,19 +3753,18 @@ 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
continue from there."
(let ((p (point-at-bol)) to)
- (when (org-in-src-block-p t) (throw :skip t))
- (and org-agenda-skip-archived-trees (not org-agenda-archives-mode)
- (get-text-property p :org-archived)
- (org-end-of-subtree t)
- (throw :skip t))
- (and org-agenda-skip-comment-trees
- (get-text-property p :org-comment)
- (org-end-of-subtree t)
- (throw :skip t))
- (if (equal (char-after p) ?#) (throw :skip t))
- (when (setq to (or (org-agenda-skip-eval org-agenda-skip-function-global)
- (org-agenda-skip-eval org-agenda-skip-function)))
- (goto-char to)
+ (when (or
+ (eq (get-text-property p 'face) 'font-lock-comment-face)
+ (and org-agenda-skip-archived-trees (not org-agenda-archives-mode)
+ (get-text-property p :org-archived)
+ (org-end-of-subtree t))
+ (and org-agenda-skip-comment-trees
+ (get-text-property p :org-comment)
+ (org-end-of-subtree t))
+ (and (setq to (or (org-agenda-skip-eval org-agenda-skip-function-global)
+ (org-agenda-skip-eval org-agenda-skip-function)))
+ (goto-char to))
+ (org-in-src-block-p t))
(throw :skip t))))
(defun org-agenda-skip-eval (form)