diff options
author | Bastien Guerry <bzg@altern.org> | 2014-04-18 16:41:29 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2014-04-18 16:41:29 +0200 |
commit | d52572d1bc3fd864d47c89899bc8317e6cc6badd (patch) | |
tree | 44e98a0037316c035d16c8a4331d3381ab150bec | |
parent | 7925d42d43c35093c2a7b943fc44d36043f9786d (diff) | |
parent | bcbc97d902b9fe01fa5126313ae08b16ba2421b8 (diff) | |
download | org-mode-d52572d1bc3fd864d47c89899bc8317e6cc6badd.tar.gz |
Merge branch 'maint'
Conflicts:
lisp/org-clock.el
-rw-r--r-- | lisp/org-clock.el | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lisp/org-clock.el b/lisp/org-clock.el index c4a5ba1..b3a18e9 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -1854,16 +1854,15 @@ Use \\[org-clock-remove-overlays] to remove the subtree times." "Put an overlays on the current line, displaying TIME. This creates a new overlay and stores it in `org-clock-overlays', so that it will be easy to remove." - (let* ((c 60) (h (floor (/ time 60))) (m (- time (* 60 h))) - ov tx) - (org-move-to-column c) + (let (ov tx) + (org-move-to-column 60) (unless (eolp) (skip-chars-backward "^ \t")) (skip-chars-backward " \t") - (setq ov (make-overlay (1- (point-at-eol)) (point-at-eol)) - tx (concat (buffer-substring (1- (point)) (point)) + (setq ov (make-overlay (point-at-bol) (point-at-eol)) + tx (concat (buffer-substring (point-at-bol) (point)) (make-string - (max 0 (- (- c (current-column)) - (length (org-get-at-bol 'line-prefix)))) ? ) + (max 0 (- (- 60 (current-column)) + (length (org-get-at-bol 'line-prefix)))) ?ยท) (org-add-props (format " %9s " (org-minutes-to-clocksum-string time)) (list 'face 'org-clock-overlay)) |