From: Bastien Guerry <bzg@altern.org>
Date: Sat, 26 Jan 2013 12:29:49 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.0-pre~498
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/733a6fe0634f6be3157be4183f22317885337143

Merge branch 'maint'
---

733a6fe0634f6be3157be4183f22317885337143
diff --cc lisp/org-agenda.el
index 74ce5fba8,630977113..f3ffa8e78
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@@ -6022,10 -5938,9 +6019,10 @@@ See also the user option `org-agenda-cl
  		      warntime (get-text-property (point) 'org-appt-warntime)
  		      category-pos (get-text-property (point) 'org-category-position))
  		(if (not (re-search-backward "^\\*+[ \t]+" nil t))
- 		    (setq txt org-agenda-no-heading-message)
+ 		    (throw :skip nil)
  		  (goto-char (match-end 0))
  		  (setq pos1 (match-beginning 0))
 +		  (setq level (make-string (org-reduced-level (org-outline-level)) ? ))
  		  (setq inherited-tags
  			(or (eq org-agenda-show-inherited-tags 'always)
  			    (and (listp org-agenda-show-inherited-tags)