Browse Source

Fix some compiler warnings, unbreak CLOCKSUM.

James TD Smith 16 years ago
parent
commit
b8ea014b64
2 changed files with 5 additions and 5 deletions
  1. 2 2
      lisp/org-colview-xemacs.el
  2. 3 3
      lisp/org-colview.el

+ 2 - 2
lisp/org-colview-xemacs.el

@@ -1586,7 +1586,7 @@ and tailing newline characters."
 This will add overlays to the date lines, to show the summary for each day."
 This will add overlays to the date lines, to show the summary for each day."
   (let* ((fmt (mapcar (lambda (x)
   (let* ((fmt (mapcar (lambda (x)
 			(if (equal (car x) "CLOCKSUM")
 			(if (equal (car x) "CLOCKSUM")
-			    (list "CLOCKSUM" (nth 2 x) add_times + identity)
+			    (list "CLOCKSUM" (nth 2 x) nil 'add_times nil '+ 'identity)
 			  (cdr x)))
 			  (cdr x)))
 		      org-columns-current-fmt-compiled))
 		      org-columns-current-fmt-compiled))
 	 line c c1 stype calc sumfunc props lsum entries prop v)
 	 line c c1 stype calc sumfunc props lsum entries prop v)
@@ -1644,7 +1644,7 @@ This will add overlays to the date lines, to show the summary for each day."
 				       (car lsum) stype))
 				       (car lsum) stype))
 				     (t "")))
 				     (t "")))
 			 (put-text-property 0 (length lsum) 'face 'bold lsum)
 			 (put-text-property 0 (length lsum) 'face 'bold lsum)
-			 (if (neq calc 'identity)
+			 (unless (eq calc 'identity)
 			     (put-text-property 0 (length lsum) 'org-computed t lsum))
 			     (put-text-property 0 (length lsum) 'org-computed t lsum))
 			 (cons prop lsum))))
 			 (cons prop lsum))))
 		     fmt))
 		     fmt))

+ 3 - 3
lisp/org-colview.el

@@ -1380,7 +1380,7 @@ and tailing newline characters."
 This will add overlays to the date lines, to show the summary for each day."
 This will add overlays to the date lines, to show the summary for each day."
   (let* ((fmt (mapcar (lambda (x)
   (let* ((fmt (mapcar (lambda (x)
 			(if (equal (car x) "CLOCKSUM")
 			(if (equal (car x) "CLOCKSUM")
-			    (list "CLOCKSUM" (nth 2 x) add_times + identity)
+			    (list "CLOCKSUM" (nth 2 x) nil 'add_times nil '+ 'identity)
 			  (cdr x)))
 			  (cdr x)))
 		      org-columns-current-fmt-compiled))
 		      org-columns-current-fmt-compiled))
 	 line c c1 stype calc sumfunc props lsum entries prop v)
 	 line c c1 stype calc sumfunc props lsum entries prop v)
@@ -1438,8 +1438,8 @@ This will add overlays to the date lines, to show the summary for each day."
 				       (car lsum) stype))
 				       (car lsum) stype))
 				     (t "")))
 				     (t "")))
 			 (put-text-property 0 (length lsum) 'face 'bold lsum)
 			 (put-text-property 0 (length lsum) 'face 'bold lsum)
-			 (if (neq calc 'identity)
-			     (put-text-property 0 (length lsum) 'org-computed t lsum))
+			 (unless (eq calc 'identity)
+			   (put-text-property 0 (length lsum) 'org-computed t lsum))
 			 (cons prop lsum))))
 			 (cons prop lsum))))
 		     fmt))
 		     fmt))
 	      (org-columns-display-here props 'dateline)
 	      (org-columns-display-here props 'dateline)