From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bernt Hansen Subject: [PATCH] Typo: left-over -> leftover Date: Sun, 28 Mar 2010 22:16:44 -0400 Message-ID: <1269829005-25254-4-git-send-email-bernt@norang.ca> References: <1269829005-25254-1-git-send-email-bernt@norang.ca> Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nw4XQ-0001nf-V3 for emacs-orgmode@gnu.org; Sun, 28 Mar 2010 22:17:13 -0400 Received: from [140.186.70.92] (port=33704 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nw4XP-0001nQ-Tw for emacs-orgmode@gnu.org; Sun, 28 Mar 2010 22:17:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nw4XO-0001Sf-Fm for emacs-orgmode@gnu.org; Sun, 28 Mar 2010 22:17:11 -0400 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:62593) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nw4XO-0001SX-Dc for emacs-orgmode@gnu.org; Sun, 28 Mar 2010 22:17:10 -0400 Received: from cpe000102d0fe75-cm0012256ecbde.cpe.net.cable.rogers.com ([99.239.148.180] helo=mail.norang.ca) by mho-02-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1Nw4XO-0002tl-5E for emacs-orgmode@gnu.org; Mon, 29 Mar 2010 02:17:10 +0000 In-Reply-To: <1269829005-25254-1-git-send-email-bernt@norang.ca> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Cc: Bernt Hansen 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