Since this is not an exposed variable we can rename it so that it is spelled correctly. --- lisp/ChangeLog | 2 +- lisp/org-clock.el | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a027996..c787f1b 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -773,7 +773,7 @@ * org.el (org-offer-links-in-entry): Make RET open all links. - * org-html.el (org-export-as-html): Remove any left-over display + * org-html.el (org-export-as-html): Remove any leftover display properties in the html file. * org-wl.el (org-wl-store-link): Work-around for format bug with diff --git a/lisp/org-clock.el b/lisp/org-clock.el index d8d1fe0..42ff593 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -273,7 +273,7 @@ to add an effort property.") (defvar org-clock-heading-for-remember "") (defvar org-clock-start-time "") -(defvar org-clock-left-over-time nil +(defvar org-clock-leftover-time nil "If non-nil, user cancelled a clock; this is when leftover time started.") (defvar org-clock-effort "" @@ -713,7 +713,7 @@ This routine can do one of many things: (org-clock-clock-out clock fail-quietly resolve-to) (unless org-clock-clocking-in (if close-p - (setq org-clock-left-over-time resolve-to) + (setq org-clock-leftover-time resolve-to) (org-clock-clock-in clock))))))) (defun org-clock-resolve (clock &optional prompt-fn last-valid fail-quietly) @@ -896,14 +896,14 @@ the clocking selection, associated with the letter `d'." (let ((interrupting (and (not org-clock-resolving-clocks-due-to-idleness) (org-clocking-p))) ts selected-task target-pos (msg-extra "") - (left-over (and (not org-clock-resolving-clocks) - org-clock-left-over-time))) + (leftover (and (not org-clock-resolving-clocks) + org-clock-leftover-time))) (when (and org-clock-auto-clock-resolution (or (not interrupting) (eq t org-clock-auto-clock-resolution)) (not org-clock-clocking-in) (not org-clock-resolving-clocks)) - (setq org-clock-left-over-time nil) + (setq org-clock-leftover-time nil) (let ((org-clock-clocking-in t)) (org-resolve-clocks))) ; check if any clocks are dangling (when (equal select '(4)) @@ -1021,13 +1021,13 @@ the clocking selection, associated with the letter `d'." (setq org-clock-total-time (org-clock-sum-current-item (org-clock-get-sum-start))) (setq org-clock-start-time - (or (and left-over + (or (and leftover (y-or-n-p (format "You stopped another clock %d mins ago; start this one from then? " (/ (- (org-float-time (current-time)) - (org-float-time left-over)) 60))) - left-over) + (org-float-time leftover)) 60))) + leftover) (current-time))) (setq ts (org-insert-time-stamp org-clock-start-time 'with-hm 'inactive)))) -- 1.7.0.2.279.gf1ba1c _______________________________________________ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode