summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-26 12:29:49 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-26 12:29:49 (GMT)
commit733a6fe0634f6be3157be4183f22317885337143 (patch)
treef5244b95e9c857a3d588b2ca19f50f8b28c51bce
parenteab0cd025c7f2f1b4f185dc9325b684b46a6f10c (diff)
parenta5ed80fb32e6d1495bafeef0e3e05fd8a968c62e (diff)
downloadorg-mode-733a6fe0634f6be3157be4183f22317885337143.zip
org-mode-733a6fe0634f6be3157be4183f22317885337143.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-agenda.el13
1 files changed, 5 insertions, 8 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 74ce5fb..f3ffa8e 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -5469,9 +5469,6 @@ Do we have a reason to ignore this TODO entry because it has a time stamp?
\(fn &optional END)" nil nil)
-(defconst org-agenda-no-heading-message
- "No heading for this item in buffer or region.")
-
(defun org-agenda-get-timestamps (&optional deadline-results)
"Return the date stamp information for agenda display."
(let* ((props (list 'face 'org-agenda-calendar-event
@@ -5551,7 +5548,7 @@ Do we have a reason to ignore this TODO entry because it has a time stamp?
category-pos (get-text-property b0 'org-category-position))
(save-excursion
(if (not (re-search-backward org-outline-regexp-bol nil t))
- (setq txt org-agenda-no-heading-message)
+ (throw :skip nil)
(goto-char (match-beginning 0))
(if (and (eq t org-agenda-skip-timestamp-if-deadline-is-shown)
(assoc (point) deadline-position-alist))
@@ -5789,7 +5786,7 @@ please use `org-class' instead."
(and (looking-at ".*\n[ \t]*-[ \t]+\\([^-\n \t].*?\\)[ \t]*$")
(match-string 1)))))
(if (not (re-search-backward org-outline-regexp-bol nil t))
- (setq txt org-agenda-no-heading-message)
+ (throw :skip nil)
(goto-char (match-beginning 0))
(setq hdmarker (org-agenda-new-marker)
inherited-tags
@@ -6022,7 +6019,7 @@ See also the user option `org-agenda-clock-consistency-checks'."
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)) ? ))
@@ -6149,7 +6146,7 @@ FRACTION is what fraction of the head-warning time has passed."
(setq category (org-get-category)
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))
(if habitp
@@ -6253,7 +6250,7 @@ FRACTION is what fraction of the head-warning time has passed."
(setq category (org-get-category)
category-pos (get-text-property (point) 'org-category-position))
(if (not (re-search-backward org-outline-regexp-bol nil t))
- (setq txt org-agenda-no-heading-message)
+ (throw :skip nil)
(goto-char (match-beginning 0))
(setq hdmarker (org-agenda-new-marker (point))
inherited-tags