mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-22 15:10:42 +00:00
Code Releases Activity

Fix commit b508ff69 again (second take).

Browse source
This commit is contained in:
Bastien Guerry 2012-09-12 18:03:41 +02:00
parent 25a1f226ec
commit b645e8ab22
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lisp/org-agenda.el
View file

@ -4283,7 +4283,7 @@ in `org-agenda-text-search-extra-files'."
(goto-char beg) (goto-char beg)
(setq marker (org-agenda-new-marker (point)) (setq marker (org-agenda-new-marker (point))
category (org-get-category) category (org-get-category)
level (make-string (1- (org-outline-level)) ? ) level (make-string (1- (or (org-outline-level) 1)) ? )
category-pos (get-text-property (point) 'org-category-position) category-pos (get-text-property (point) 'org-category-position)
tags (org-get-tags-at (point)) tags (org-get-tags-at (point))
txt (org-agenda-format-item txt (org-agenda-format-item
@ -5010,7 +5010,7 @@ the documentation of `org-diary'."
txt (org-trim txt (org-trim
(buffer-substring (match-beginning 2) (match-end 0))) (buffer-substring (match-beginning 2) (match-end 0)))
tags (org-get-tags-at (point)) tags (org-get-tags-at (point))
level (make-string (1- (org-outline-level)) ? ) level (make-string (1- (or (org-outline-level) 1)) ? )
txt (org-agenda-format-item "" txt level category tags) txt (org-agenda-format-item "" txt level category tags)
priority (1+ (org-get-priority txt)) priority (1+ (org-get-priority txt))
todo-state (org-get-todo-state)) todo-state (org-get-todo-state))
@ -5186,7 +5186,7 @@ This function is invoked if `org-agenda-todo-ignore-deadlines',
(throw :skip nil)) (throw :skip nil))
(setq hdmarker (org-agenda-new-marker) (setq hdmarker (org-agenda-new-marker)
tags (org-get-tags-at) tags (org-get-tags-at)
level (make-string (1- (org-outline-level)) ? )) level (make-string (1- (or (org-outline-level) 1)) ? ))
(looking-at "\\*+[ \t]+\\([^\r\n]+\\)") (looking-at "\\*+[ \t]+\\([^\r\n]+\\)")
(setq head (or (match-string 1) "")) (setq head (or (match-string 1) ""))
(setq txt (org-agenda-format-item (setq txt (org-agenda-format-item
@ -5234,7 +5234,7 @@ This function is invoked if `org-agenda-todo-ignore-deadlines',
(setq result (org-diary-sexp-entry sexp sexp-entry date)) (setq result (org-diary-sexp-entry sexp sexp-entry date))
(when result (when result
(setq marker (org-agenda-new-marker beg) (setq marker (org-agenda-new-marker beg)
level (make-string (1- (org-outline-level)) ? ) level (make-string (1- (or (org-outline-level) 1)) ? )
category (org-get-category beg) category (org-get-category beg)
category-pos (get-text-property beg 'org-category-position) category-pos (get-text-property beg 'org-category-position)
tags (save-excursion (org-backward-heading-same-level 0) tags (save-excursion (org-backward-heading-same-level 0)
@ -5408,7 +5408,7 @@ please use `org-class' instead."
(goto-char (match-beginning 0)) (goto-char (match-beginning 0))
(setq hdmarker (org-agenda-new-marker) (setq hdmarker (org-agenda-new-marker)
tags (org-get-tags-at) tags (org-get-tags-at)
level (make-string (1- (org-outline-level)) ? )) level (make-string (1- (or (org-outline-level) 1)) ? ))
(looking-at "\\*+[ \t]+\\([^\r\n]+\\)") (looking-at "\\*+[ \t]+\\([^\r\n]+\\)")
(setq txt (match-string 1)) (setq txt (match-string 1))
(when extra (when extra
@ -5619,7 +5619,7 @@ See also the user option `org-agenda-clock-consistency-checks'."
(setq txt org-agenda-no-heading-message) (setq txt org-agenda-no-heading-message)
(goto-char (match-end 0)) (goto-char (match-end 0))
(setq pos1 (match-beginning 0)) (setq pos1 (match-beginning 0))
(setq level (make-string (1- (org-outline-level)) ? )) (setq level (make-string (1- (or (org-outline-level) 1)) ? ))
(setq tags (org-get-tags-at pos1)) (setq tags (org-get-tags-at pos1))
(setq head (buffer-substring-no-properties (setq head (buffer-substring-no-properties
(point) (point)
@ -5750,7 +5750,7 @@ FRACTION is what fraction of the head-warning time has passed."
(setq mm (assoc pos1 deadline-position-alist))) (setq mm (assoc pos1 deadline-position-alist)))
(throw :skip nil))) (throw :skip nil)))
(setq tags (org-get-tags-at)) (setq tags (org-get-tags-at))
(setq level (make-string (1- (org-outline-level)) ? )) (setq level (make-string (1- (or (org-outline-level) 1)) ? ))
(setq head (buffer-substring-no-properties (setq head (buffer-substring-no-properties
(point) (point)
(progn (skip-chars-forward "^\r\n") (point)))) (progn (skip-chars-forward "^\r\n") (point))))
@ -5834,7 +5834,7 @@ FRACTION is what fraction of the head-warning time has passed."
(goto-char (match-beginning 0)) (goto-char (match-beginning 0))
(setq hdmarker (org-agenda-new-marker (point))) (setq hdmarker (org-agenda-new-marker (point)))
(setq tags (org-get-tags-at)) (setq tags (org-get-tags-at))
(setq level (make-string (1- (org-outline-level)) ? )) (setq level (make-string (1- (or (org-outline-level) 1)) ? ))
(looking-at "\\*+[ \t]+\\([^\r\n]+\\)") (looking-at "\\*+[ \t]+\\([^\r\n]+\\)")
(setq head (match-string 1)) (setq head (match-string 1))
(let ((remove-re (let ((remove-re