소스 검색

Fix some compiler warnings, unbreak CLOCKSUM.

James TD Smith 15 년 전
부모
커밋
b8ea014b64
2개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  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."
   (let* ((fmt (mapcar (lambda (x)
 			(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)))
 		      org-columns-current-fmt-compiled))
 	 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))
 				     (t "")))
 			 (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))
 			 (cons prop lsum))))
 		     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."
   (let* ((fmt (mapcar (lambda (x)
 			(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)))
 		      org-columns-current-fmt-compiled))
 	 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))
 				     (t "")))
 			 (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))))
 		     fmt))
 	      (org-columns-display-here props 'dateline)