From 4c7dcd083079584827fbede7997077fe473616cd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 17 Nov 2012 15:51:26 +0100 Subject: [PATCH] Silence byte compiler * contrib/lisp/org-invoice.el (org-invoice-info-to-table, org-invoice-list-to-table): Silence byte compiler. * lisp/org-agenda.el (org-agenda-show-clocking-issues, org-agenda-format-item): Silence byte compiler. * lisp/org-colview-xemacs.el (org-agenda-columns): Silence byte compiler. * lisp/org-colview.el (org-agenda-columns): Silence byte compiler. * lisp/org.el (org-properties-postprocess-alist): Silence byte compiler. Function renaming was necessary as of a00a7b29183798c36ab75698a4ef5c3db4e670ec. --- contrib/lisp/org-invoice.el | 6 +++--- lisp/org-agenda.el | 6 +++--- lisp/org-colview-xemacs.el | 2 +- lisp/org-colview.el | 2 +- lisp/org.el | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/contrib/lisp/org-invoice.el b/contrib/lisp/org-invoice.el index c951d4e7a..59c36e2a7 100644 --- a/contrib/lisp/org-invoice.el +++ b/contrib/lisp/org-invoice.el @@ -226,8 +226,8 @@ looks like tree2, where the level is 2." (setq org-invoice-total-time (+ org-invoice-total-time work) org-invoice-total-price (+ org-invoice-total-price price))) - (setq total (and total (org-minutes-to-hh:mm-string total))) - (setq work (and work (org-minutes-to-hh:mm-string work))) + (setq total (and total (org-minutes-to-clocksum-string total))) + (setq work (and work (org-minutes-to-clocksum-string work))) (insert-before-markers (concat "|" title (cond @@ -251,7 +251,7 @@ looks like tree2, where the level is 2." (when with-summary (insert-before-markers (concat "|-\n|Total:|" - (org-minutes-to-hh:mm-string org-invoice-total-time) + (org-minutes-to-clocksum-string org-invoice-total-time) (and with-price (concat "|" (format "%.2f" org-invoice-total-price))) "|\n"))))) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 7e1d83540..2c484b5fa 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -5732,13 +5732,13 @@ See also the user option `org-agenda-clock-consistency-checks'." ((> dt (* 60 maxtime)) ;; a very long clocking chunk (setq issue (format "Clocking interval is very long: %s" - (org-minutes-to-hh:mm-string + (org-minutes-to-clocksum-string (floor (/ (float dt) 60.)))) face (or (plist-get pl :long-face) face))) ((< dt (* 60 mintime)) ;; a very short clocking chunk (setq issue (format "Clocking interval is very short: %s" - (org-minutes-to-hh:mm-string + (org-minutes-to-clocksum-string (floor (/ (float dt) 60.)))) face (or (plist-get pl :short-face) face))) ((and (> tlend 0) (< ts tlend)) @@ -6240,7 +6240,7 @@ Any match of REMOVE-RE will be removed from TXT." ;; Try to set s2 if s1 and `org-agenda-default-appointment-duration' are set (when (and s1 (not s2) org-agenda-default-appointment-duration) (setq s2 - (org-minutes-to-hh:mm-string + (org-minutes-to-clocksum-string (+ (org-hh:mm-string-to-minutes s1) org-agenda-default-appointment-duration)))) ;; Compute the duration diff --git a/lisp/org-colview-xemacs.el b/lisp/org-colview-xemacs.el index 3da7f8d61..713ad1f95 100644 --- a/lisp/org-colview-xemacs.el +++ b/lisp/org-colview-xemacs.el @@ -1553,7 +1553,7 @@ and tailing newline characters." ;; OK, the property is not defined. Use appointment duration? (when (and org-agenda-columns-add-appointments-to-effort-sum (setq d (get-text-property (point) 'duration))) - (setq d (org-minutes-to-hh:mm-string d)) + (setq d (org-minutes-to-clocksum-string d)) (put-text-property 0 (length d) 'face 'org-warning d) (push (cons org-effort-property d) p))) (push (cons (org-current-line) p) cache)) diff --git a/lisp/org-colview.el b/lisp/org-colview.el index d9afbd1a0..62c8e742a 100644 --- a/lisp/org-colview.el +++ b/lisp/org-colview.el @@ -1403,7 +1403,7 @@ and tailing newline characters." ;; OK, the property is not defined. Use appointment duration? (when (and org-agenda-columns-add-appointments-to-effort-sum (setq d (get-text-property (point) 'duration))) - (setq d (org-minutes-to-hh:mm-string d)) + (setq d (org-minutes-to-clocksum-string d)) (put-text-property 0 (length d) 'face 'org-warning d) (push (cons org-effort-property d) p))) (push (cons (org-current-line) p) cache)) diff --git a/lisp/org.el b/lisp/org.el index 7f22ac327..dc411b84d 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -3203,7 +3203,7 @@ and the clock summary: (let ((clocksum (org-clock-sum-current-item)) (effort (org-duration-string-to-minutes (org-entry-get (point) \"Effort\")))) - (org-minutes-to-hh:mm-string (- effort clocksum))))))" + (org-minutes-to-clocksum-string (- effort clocksum))))))" :group 'org-properties :version "24.1" :type '(alist :key-type (string :tag "Property")