瀏覽代碼

Cleanup compiler messages.

Carsten Dominik 17 年之前
父節點
當前提交
8b79f0b650
共有 3 個文件被更改,包括 6 次插入3 次删除
  1. 2 1
      lisp/org-agenda.el
  2. 3 1
      lisp/org-colview.el
  3. 1 1
      lisp/org.el

+ 2 - 1
lisp/org-agenda.el

@@ -53,6 +53,7 @@
 (declare-function calendar-julian-date-string   "cal-julian" (&optional date))
 (declare-function calendar-mayan-date-string    "cal-mayan"  (&optional date))
 (declare-function calendar-persian-date-string  "cal-persia" (&optional date))
+(declare-function org-columns-quit              "org-colview" ())
 (defvar calendar-mode-map)
 
 ;; Defined somewhere in this file, but used before definition.
@@ -3558,7 +3559,7 @@ Any match of REMOVE-RE will be removed from TXT."
 	   time effort neffort
 	   (ts (if dotime (concat (if (stringp dotime) dotime "") txt)))
 	   (time-of-day (and dotime (org-get-time-of-day ts)))
-	   stamp plain s0 s1 s2 rtn srp
+	   stamp plain s0 s1 s2 t1 t2 rtn srp
 	   duration)
       (and (org-mode-p) buffer-file-name
 	   (add-to-list 'org-agenda-contributing-files buffer-file-name))

+ 3 - 1
lisp/org-colview.el

@@ -284,6 +284,7 @@ This is the compiled version of the format.")
   (let ((value (get-char-property (point) 'org-columns-value)))
     (message "Value is: %s" (or value ""))))
 
+(defvar org-agenda-columns-active) ;; defined in org-agenda.el
 (defun org-columns-quit ()
   "Remove the column overlays and in this way exit column editing."
   (interactive)
@@ -1033,6 +1034,7 @@ and tailing newline characters."
 
 (defvar org-agenda-columns-show-summaries) ; defined in org-agenda.el
 (defvar org-agenda-columns-compute-summary-properties); defined in org-agenda.el
+(defvar org-agenda-columns-add-appointments-to-effort-sum); as well
 
 (defun org-agenda-columns ()
   "Turn on column view in the agenda."
@@ -1040,7 +1042,7 @@ and tailing newline characters."
   (org-verify-version 'columns)
   (org-columns-remove-overlays)
   (move-marker org-columns-begin-marker (point))
-  (let (fmt cache maxwidths m p a)
+  (let (fmt cache maxwidths m p a d)
     (cond
      ((and (local-variable-p 'org-overriding-columns-format)
 	   org-overriding-columns-format)

+ 1 - 1
lisp/org.el

@@ -12899,7 +12899,7 @@ archive file is."
 	    (if (string-match "\\(.*\\)::\\(.*\\)" org-archive-location)
 		(setq afile (format (match-string 1 org-archive-location)
 				    buffer-file-name))
-	      (setq arch nil))
+	      (setq afile nil))
 	    (if (and afile (file-exists-p afile))
 		(list f afile)
 	      (list f)))))