forked from mirrors/org-mode
org-clock: Add a trailing space to the mode line string
* lisp/org-clock.el (org-clock-get-clock-string): End the mode line element in a space, instead of beginning with space, to make it play well with other mode line strings, which typically end a space. For reference, see the mode line string of the Display Time mode.
This commit is contained in:
parent
233a8479ca
commit
3d817c52c9
|
@ -726,9 +726,9 @@ If not, show simply the clocked time like 01:50."
|
||||||
'org-mode-line-clock-overrun
|
'org-mode-line-clock-overrun
|
||||||
'org-mode-line-clock)))
|
'org-mode-line-clock)))
|
||||||
(effort-str (org-duration-from-minutes effort-in-minutes)))
|
(effort-str (org-duration-from-minutes effort-in-minutes)))
|
||||||
(format (propertize " [%s/%s] (%s)" 'face 'org-mode-line-clock)
|
(format (propertize "[%s/%s] (%s) " 'face 'org-mode-line-clock)
|
||||||
work-done-str effort-str org-clock-heading))
|
work-done-str effort-str org-clock-heading))
|
||||||
(format (propertize " [%s] (%s)" 'face 'org-mode-line-clock)
|
(format (propertize "[%s] (%s) " 'face 'org-mode-line-clock)
|
||||||
(org-duration-from-minutes clocked-time)
|
(org-duration-from-minutes clocked-time)
|
||||||
org-clock-heading))))
|
org-clock-heading))))
|
||||||
|
|
||||||
|
|
|
@ -1276,5 +1276,40 @@ CLOCK: [2012-03-29 Thu 16:00]--[2012-03-29 Thu 17:00] => 1:00"
|
||||||
(test-org-clock-clocktable-contents
|
(test-org-clock-clocktable-contents
|
||||||
(format ":hidefiles t :scope (lambda () (list %S))" the-file))))))))
|
(format ":hidefiles t :scope (lambda () (list %S))" the-file))))))))
|
||||||
|
|
||||||
|
;;; Mode line
|
||||||
|
|
||||||
|
(ert-deftest test-org-clock/mode-line ()
|
||||||
|
"Test mode line string ends in a space.
|
||||||
|
|
||||||
|
\"Elements that are added to [the mode line] should normally end
|
||||||
|
in a space (to ensure that consecutive 'global-mode-string'
|
||||||
|
elements display properly)\" per Emacs manual, Section 24.4.4
|
||||||
|
Variables Used in the Mode Line."
|
||||||
|
;; Test the variant without effort.
|
||||||
|
(should
|
||||||
|
(equal
|
||||||
|
"<before> [0:00] (Heading) <after> "
|
||||||
|
(org-test-with-temp-text
|
||||||
|
"* Heading"
|
||||||
|
(org-clock-in)
|
||||||
|
(prog1 (concat "<before> "
|
||||||
|
(org-clock-get-clock-string)
|
||||||
|
"<after> ")
|
||||||
|
(org-clock-out)))))
|
||||||
|
;; Test the variant with effort.
|
||||||
|
(should
|
||||||
|
(equal
|
||||||
|
"<before> [0:00/1:00] (Heading) <after> "
|
||||||
|
(org-test-with-temp-text
|
||||||
|
"* Heading
|
||||||
|
:PROPERTIES:
|
||||||
|
:EFFORT: 1h
|
||||||
|
:END:"
|
||||||
|
(org-clock-in)
|
||||||
|
(prog1 (concat "<before> "
|
||||||
|
(org-clock-get-clock-string)
|
||||||
|
"<after> ")
|
||||||
|
(org-clock-out))))))
|
||||||
|
|
||||||
(provide 'test-org-clock)
|
(provide 'test-org-clock)
|
||||||
;;; test-org-clock.el end here
|
;;; test-org-clock.el end here
|
||||||
|
|
Loading…
Reference in New Issue