Browse Source

Keep compiler happy

Carsten Dominik 16 years ago
parent
commit
5a24f6c9d2
2 changed files with 5 additions and 3 deletions
  1. 2 2
      lisp/org-clock.el
  2. 3 1
      lisp/org.el

+ 2 - 2
lisp/org-clock.el

@@ -246,7 +246,7 @@ to add an effort property.")
 
 
 (defvar org-clock-mode-line-timer nil)
 (defvar org-clock-mode-line-timer nil)
 (defvar org-clock-idle-timer nil)
 (defvar org-clock-idle-timer nil)
-(defvar org-clock-heading "")
+(defvar org-clock-heading) ; defined in org.el
 (defvar org-clock-heading-for-remember "")
 (defvar org-clock-heading-for-remember "")
 (defvar org-clock-start-time "")
 (defvar org-clock-start-time "")
 
 
@@ -806,7 +806,7 @@ so long."
 	   (function
 	   (function
 	    (lambda (clock)
 	    (lambda (clock)
 	      (format "Clocked in & idle for %d mins"
 	      (format "Clocked in & idle for %d mins"
-		      (/ (time-to-seconds
+		      (/ (org-float-time
 			  (time-subtract (current-time)
 			  (time-subtract (current-time)
 					 org-clock-user-idle-start)) 60))))
 					 org-clock-user-idle-start)) 60))))
 	   (time-subtract (current-time)
 	   (time-subtract (current-time)

+ 3 - 1
lisp/org.el

@@ -3210,6 +3210,8 @@ If TABLE-TYPE is non-nil, also check for table.el-type tables."
   "Marker recording the last clock-in.")
   "Marker recording the last clock-in.")
 (defvar org-clock-hd-marker (make-marker)
 (defvar org-clock-hd-marker (make-marker)
   "Marker recording the last clock-in, but the headline position.")
   "Marker recording the last clock-in, but the headline position.")
+(defvar org-clock-heading ""
+  "The heading of the current clock entry.")
 (defun org-clock-is-active ()
 (defun org-clock-is-active ()
  "Return non-nil if clock is currently running.
  "Return non-nil if clock is currently running.
 The return value is actually the clock marker."
 The return value is actually the clock marker."
@@ -10827,7 +10829,7 @@ ACTION can be `set', `up', `down', or a character."
 	(setq current org-default-priority))
 	(setq current org-default-priority))
       (cond
       (cond
        ((eq action 'remove)
        ((eq action 'remove)
-	(setq remote t new ?\ ))
+	(setq remove t new ?\ ))
        ((or (eq action 'set)
        ((or (eq action 'set)
 	    (if (featurep 'xemacs) (characterp action) (integerp action)))
 	    (if (featurep 'xemacs) (characterp action) (integerp action)))
 	(if (not (eq action 'set))
 	(if (not (eq action 'set))