mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-26 04:02:52 +00:00
Code Releases Activity

Merge branch 'master' of orgmode.org:org-mode

Browse source
This commit is contained in:
Bastien Guerry 2013-03-26 16:00:56 +01:00
parent 4184699910 9594249b4d
commit aa7b1e0b39
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lisp/org-agenda.el
View file

@ -6493,12 +6493,15 @@ Any match of REMOVE-RE will be removed from TXT."
(match-string 2 txt)) (match-string 2 txt))
t t txt)))) t t txt))))
(when (derived-mode-p 'org-mode) (when (derived-mode-p 'org-mode)
(setq effort (ignore-errors (get-text-property 0 'org-effort txt))) (setq effort (ignore-errors (get-text-property 0 'org-effort txt))))
(if effort
(setq neffort (org-duration-string-to-minutes effort) ;; org-agenda-add-time-grid-maybe calls us with *Agenda* as
effort (setq effort (concat "[" effort "]"))) ;; current buffer, so move this check outside of above
;; prevent erroring out with %e format when there is no effort (if effort
(setq effort ""))) (setq neffort (org-duration-string-to-minutes effort)
effort (setq effort (concat "[" effort "]")))
;; prevent erroring out with %e format when there is no effort
(setq effort ""))
(when remove-re (when remove-re
(while (string-match remove-re txt) (while (string-match remove-re txt)