From 43e24aa8ed1fcbe8edb19eb1ac338581c2d812b0 Mon Sep 17 00:00:00 2001
From: James TD Smith <ahktenzero@mohorovi.cc>
Date: Wed, 11 Nov 2009 04:53:17 +0000
Subject: [PATCH] Remove calc functions from summary types which don't need
 them.

---
 lisp/org-colview.el | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index ba99ff76e..0785ac251 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -712,23 +712,21 @@ around it."
 (eval-when-compile (defvar org-columns-time))
 
 (defvar org-columns-compile-map
-  '(("none" none + identity)
-    (":" add_times + identity)
-    ("+" add_numbers + identity)
-    ("$" currency + identity)
-    ("X" checkbox + identity)
-    ("X/" checkbox-n-of-m + identity)
-    ("X%" checkbox-percent + identity)
-    ("max" max_numbers max identity)
-    ("min" min_numbers min identity)
+  '(("none" none +)
+    (":" add_times +)
+    ("+" add_numbers +)
+    ("$" currency +)
+    ("X" checkbox +)
+    ("X/" checkbox-n-of-m +)
+    ("X%" checkbox-percent +)
+    ("max" max_numbers max)
+    ("min" min_numbers min)
     ("mean" mean_numbers
-     (lambda (&rest x) (/ (apply '+ x) (float (length x))))
-     identity)
-    (":max" max_times max identity)
-    (":min" min_times min identity)
+     (lambda (&rest x) (/ (apply '+ x) (float (length x)))))
+    (":max" max_times max)
+    (":min" min_times min)
     (":mean" mean_times
-     (lambda (&rest x) (/ (apply '+ x) (float (length x))))
-     identity)
+     (lambda (&rest x) (/ (apply '+ x) (float (length x)))))
     ("@min" min_age min (lambda (x) (- org-columns-time x)))
     ("@max" max_age max (lambda (x) (- org-columns-time x)))
     ("@mean" mean_age
@@ -739,14 +737,15 @@ Used to compile/uncompile columns format and completing read in
 interactive function org-columns-new.
 
 operator    string used in #+COLUMNS definition describing the
-            summary type
+	    summary type
 format      symbol describing summary type selected interactively in
-            org-columns-new and internally in
-            org-columns-number-to-string and
-            org-columns-string-to-number 
+	    org-columns-new and internally in
+	    org-columns-number-to-string and
+	    org-columns-string-to-number
 function    called with a list of values as argument to calculate
-            the summary value
-calc        function called on every element before summarizing")
+	    the summary value
+calc        function called on every element before summarizing. This is
+	    optional and should only be specified if needed")
 
 (defun org-columns-new (&optional prop title width op fmt fun &rest rest)
   "Insert a new column, to the left of the current column."