浏览代码

Keep compiler happy

Carsten Dominik 15 年之前
父节点
当前提交
79031ab5ab
共有 3 个文件被更改,包括 11 次插入4 次删除
  1. 6 0
      lisp/org-agenda.el
  2. 2 2
      lisp/org-clock.el
  3. 3 2
      lisp/org-mobile.el

+ 6 - 0
lisp/org-agenda.el

@@ -54,8 +54,14 @@
 (declare-function calendar-persian-date-string  "cal-persia" (&optional date))
 (declare-function org-columns-quit              "org-colview" ())
 (declare-function org-mobile-write-agenda-for-mobile "org-mobile" (file))
+(declare-function org-habit-insert-consistency-graphs
+		  "org-habit" (&optional line))
+(declare-function org-is-habit-p "org-habit" (&optional pom))
+(declare-function org-habit-parse-todo "org-habit" (&optional pom))
 (defvar calendar-mode-map)
 (defvar org-mobile-force-id-on-agenda-items) ; defined in org-mobile.el
+(defvar org-habit-show-habits)
+(defvar org-habit-show-habits-only-for-today)
 
 ;; Defined somewhere in this file, but used before definition.
 (defvar org-agenda-buffer-name)

+ 2 - 2
lisp/org-clock.el

@@ -918,8 +918,8 @@ the clocking selection, associated with the letter `d'."
 			     (y-or-n-p
 			      (format
 			       "You stopped another clock %d mins ago; start this one from then? "
-			       (/ (- (time-to-seconds (current-time))
-				     (time-to-seconds left-over)) 60)))
+			       (/ (- (org-float-time (current-time))
+				     (org-float-time left-over)) 60)))
 			     left-over)
 			(current-time)))
 	      (setq ts (org-insert-time-stamp org-clock-start-time

+ 3 - 2
lisp/org-mobile.el

@@ -33,6 +33,7 @@
 
 (require 'org)
 (require 'org-agenda)
+(eval-when-compile (require 'cl))
 
 (defgroup org-mobile nil
   "Options concerning support for a viewer/editor on a mobile device."
@@ -337,7 +338,7 @@ agenda view showing the flagged items."
 (defun org-mobile-copy-agenda-files ()
   "Copy all agenda files to the stage or WebDAV directory."
   (let ((files-alist org-mobile-files-alist)
-	file buf entry link-name target-path target-dir)
+	file buf entry link-name target-path target-dir check)
     (while (setq entry (pop files-alist))
       (setq file (car entry) link-name (cdr entry))
       (when (file-exists-p file)
@@ -654,7 +655,7 @@ If BEG and END are given, only do this in that region."
 	    (goto-char (+ 2 bos-marker))
 	    (unless (markerp id-pos)
 	      (insert "BAD REFERENCE ")
-	      (incf cnd-error)
+	      (incf cnt-error)
 	      (throw 'next t))
 	    (unless cmd
 	      (insert "BAD FLAG ")