ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2013-11-18 20:49:43 +01:00
parent 818c821684 c5aad89f5a
commit d35233f84a
1 changed files with 95 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/org.el
View File

@ -15244,15 +15244,14 @@ is a string only get exactly this property. SPECIFIC can be a string, the
specific property we are interested in. Specifying it can speed specific property we are interested in. Specifying it can speed
things up because then unnecessary parsing is avoided." things up because then unnecessary parsing is avoided."
(setq which (or which 'all)) (setq which (or which 'all))
(org-with-wide-buffer
(org-with-point-at pom (org-with-point-at pom
(let ((clockstr (substring org-clock-string 0 -1)) (let ((clockstr (substring org-clock-string 0 -1))
(excluded '("TODO" "TAGS" "ALLTAGS" "PRIORITY" "BLOCKED")) (excluded '("TODO" "TAGS" "ALLTAGS" "PRIORITY" "BLOCKED"))
(case-fold-search nil) (case-fold-search nil)
beg end range props sum-props key key1 value string clocksum clocksumt) beg end range props sum-props key key1 value string clocksum clocksumt)
(save-excursion (when (and (derived-mode-p 'org-mode)
(when (condition-case nil (ignore-errors (org-back-to-heading t)))
(and (derived-mode-p 'org-mode) (org-back-to-heading t))
(error nil))
(setq beg (point)) (setq beg (point))
(setq sum-props (get-text-property (point) 'org-summaries)) (setq sum-props (get-text-property (point) 'org-summaries))
(setq clocksum (get-text-property (point) :org-clock-minutes) (setq clocksum (get-text-property (point) :org-clock-minutes)