mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-12-02 08:22:16 +00:00
Code

Merge branch 'maint'

Browse Source 
Conflicts:
	lisp/org-clock.el
This commit is contained in:
Bastien Guerry 2014-04-17 11:42:16 +02:00
commit 9448fa263b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/org-clock.el
View File

@ -1855,14 +1855,15 @@ 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* ((c 60) (h (floor (/ time 60))) (m (- time (* 60 h)))
(off 0)
ov tx)
(org-move-to-column c)
(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 (+ off (max 0 (- c (current-column)))) ?.)
(setq ov (make-overlay (1- (point-at-eol)) (point-at-eol))
tx (concat (buffer-substring (1- (point)) (point))
(make-string
(max 0 (- (- c (current-column))
(length (org-get-at-bol 'line-prefix)))) ?.)
(org-add-props
(concat " " (org-minutes-to-clocksum-string time) " ")
(list 'face 'org-clock-overlay))