From 9f337ee06caab6998a0ce6734b27afda2dbc36d7 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Thu, 18 Aug 2011 09:00:20 +0200 Subject: [PATCH] org-clock.el: remove `org-clocktable-sort-clock-data'. This function by Max Mikhanosha was added accidently. We are waiting for the FSF to process Max copyright assignement to get this function in org-mode. Thanks to Achim Gratz for spotting at this. --- lisp/org-clock.el | 47 +++++------------------------------------------ 1 file changed, 5 insertions(+), 42 deletions(-) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 7c5182c3e..4138b9686 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -2038,7 +2038,8 @@ the currently selected interval size." (encode-time 0 0 0 (+ d n) m y)))) ((and wp (string-match "w\\|W" wp) mw (> (length wp) 0)) (require 'cal-iso) - (setq date (calendar-gregorian-from-absolute (calendar-absolute-from-iso (list (+ mw n) 1 y)))) + (setq date (calendar-gregorian-from-absolute + (calendar-absolute-from-iso (list (+ mw n) 1 y)))) (setq ins (format-time-string "%G-W%V" (encode-time 0 0 0 (nth 1 date) (car date) (nth 2 date))))) @@ -2054,7 +2055,8 @@ the currently selected interval size." (setq mw 5 y (- y 1)) ()) - (setq date (calendar-gregorian-from-absolute (calendar-absolute-from-iso (org-quarter-to-date (+ mw n) y)))) + (setq date (calendar-gregorian-from-absolute + (calendar-absolute-from-iso (org-quarter-to-date (+ mw n) y)))) (setq ins (format-time-string (concatenate 'string (number-to-string y) "-Q" (number-to-string (+ mw n))) (encode-time 0 0 0 (nth 1 date) (car date) (nth 2 date))))) @@ -2073,44 +2075,6 @@ the currently selected interval size." (org-update-dblock) t))))) -(defun org-clocktable-sort-clock-data (tables params) - "TABLES is a list of tables with clocking data as produced by -`org-clock-get-table-data'. PARAMS is the parameter property -list obtained from the dynamic block defintion. - -When PARAMS contains a :SORT entry, sort the tables and the entries -inside them accordnly: - -:SORT time-up or T, sorts by most time spent on top -:SORT time-down, sorts by least time spent on top - -Returns the sorted table list" - (let ((sort (plist-get params :sort))) - (if (not sort) tables - (sort (mapcar - (lambda (table) - (list (nth 0 table) - (nth 1 table) - (sort - (third table) - (lambda (elem1 elem2) - (let ((d1 (nth 3 elem1)) - (d2 (nth 3 elem2))) - (cond ((memq sort '(t time-up)) - (> d1 d2)) - ((eq sort 'time-down) - (< d1 d2)) - (t (error "Invalid :sort parameter %s" sort)))))))) - tables) - (lambda (table1 table2) - (let ((d1 (nth 1 table1)) - (d2 (nth 1 table2))) - (cond ((memq sort '(t time-up)) - (> d1 d2)) - ((eq sort 'time-down) - (< d1 d2)) - (t (error "Invalid :sort parameter %s" sort))))))))) - (defun org-dblock-write:clocktable (params) "Write the standard clocktable." (setq params (org-combine-plists org-clocktable-defaults params)) @@ -2196,8 +2160,7 @@ Returns the sorted table list" (setq params (plist-put params :one-file-with-archives one-file-with-archives)) - (funcall formatter ipos - (org-clocktable-sort-clock-data tbls params) params)))) + (funcall formatter ipos tbls params)))) (defun org-clocktable-write-default (ipos tables params) "Write out a clock table at position IPOS in the current buffer. -- 2.11.4.GIT