diff options
author | Bastien Guerry <bzg@altern.org> | 2014-04-18 21:33:52 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2014-04-18 21:33:52 +0200 |
commit | 51c37c5c19492322c7d332a192a5609e66a18bf2 (patch) | |
tree | b0818ce5620f043accd59985de945bf803d8e1fc | |
parent | 7656f689acbd0c73e04270588b7a25a98e6ed620 (diff) | |
parent | 7c5cf02e2f88ccd5f90756a0cc25dc30c159fd6a (diff) | |
download | org-mode-51c37c5c19492322c7d332a192a5609e66a18bf2.tar.gz |
Merge branch 'maint'
Conflicts:
lisp/org-clock.el
-rw-r--r-- | lisp/org-clock.el | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/lisp/org-clock.el b/lisp/org-clock.el index b3a18e9..7dc0809 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -1855,17 +1855,20 @@ Use \\[org-clock-remove-overlays] to remove the subtree times." This creates a new overlay and stores it in `org-clock-overlays', so that it will be easy to remove." (let (ov tx) - (org-move-to-column 60) - (unless (eolp) (skip-chars-backward "^ \t")) - (skip-chars-backward " \t") - (setq ov (make-overlay (point-at-bol) (point-at-eol)) - tx (concat (buffer-substring (point-at-bol) (point)) - (make-string - (max 0 (- (- 60 (current-column)) - (length (org-get-at-bol 'line-prefix)))) ?·) + (beginning-of-line) + (when (looking-at org-complex-heading-regexp) + (goto-char (match-beginning 4))) + (setq ov (make-overlay (point) (point-at-eol)) + tx (concat (buffer-substring-no-properties (point) (match-end 4)) + (org-add-props + (make-string + (max 0 (- (- 60 (current-column)) + (- (match-end 4) (match-beginning 4)) + (length (org-get-at-bol 'line-prefix)))) ?·) + '(face shadow)) (org-add-props (format " %9s " (org-minutes-to-clocksum-string time)) - (list 'face 'org-clock-overlay)) + '(face org-clock-overlay)) "")) (if (not (featurep 'xemacs)) (overlay-put ov 'display tx) |