浏览代码

Fix compiler warnings.

Bastien Guerry 13 年之前
父节点
当前提交
a6349c2f50
共有 3 个文件被更改,包括 17 次插入11 次删除
  1. 2 0
      lisp/ob.el
  2. 12 11
      lisp/org-agenda.el
  3. 3 0
      lisp/org-bbdb.el

+ 2 - 0
lisp/ob.el

@@ -83,6 +83,8 @@
 (declare-function org-list-prevs-alist "org-list" (struct))
 (declare-function org-list-get-list-end "org-list" (item struct prevs))
 (declare-function org-strip-protective-commas "org" (beg end))
+(declare-function org-remove-if "org" (predicate seq))
+(declare-function org-completing-read "org" (&rest args))
 
 (defgroup org-babel nil
   "Code block evaluation and management in `org-mode' documents."

+ 12 - 11
lisp/org-agenda.el

@@ -1818,6 +1818,17 @@ works you probably want to add it to `org-agenda-custom-commands' for good."
 
 ;;; Multiple agenda buffers support
 
+(defcustom org-agenda-sticky nil
+  "Non-nil means agenda q key will bury agenda buffers.
+Agenda commands will then show existing buffer instead of generating new ones.
+When nil, `q' will kill the single agenda buffer."
+  :group 'org-agenda
+  :type 'boolean
+  :set (lambda (var val)
+	 (if (boundp var)
+	     (org-toggle-sticky-agenda (if val 1 0))
+	   (set var val))))
+
 (defun org-toggle-sticky-agenda (&optional arg)
   "Toggle `org-agenda-sticky'."
   (interactive "P")
@@ -1832,17 +1843,6 @@ works you probably want to add it to `org-agenda-custom-commands' for good."
       (message "Sticky agenda was %s"
 	       (if org-agenda-sticky "enabled" "disabled")))))
 
-(defcustom org-agenda-sticky nil
-  "Non-nil means agenda q key will bury agenda buffers.
-Agenda commands will then show existing buffer instead of generating new ones.
-When nil, `q' will kill the single agenda buffer."
-  :group 'org-agenda
-  :type 'boolean
-  :set (lambda (var val)
-	 (if (boundp var)
-	     (org-toggle-sticky-agenda (if val 1 0))
-	   (set var val))))
-
 (defvar org-agenda-buffer nil
   "Agenda buffer currently being generated.")
 
@@ -5136,6 +5136,7 @@ please use `org-class' instead."
      dayname skip-weeks)))
 (make-obsolete 'org-diary-class 'org-class "")
 
+(defvar org-agenda-show-log-scoped) ;; dynamically scope in ̀org-timeline' or`org-agenda-list'
 (defalias 'org-get-closed 'org-agenda-get-progress)
 (defun org-agenda-get-progress ()
   "Return the logged TODO entries for agenda display."

+ 3 - 0
lisp/org-bbdb.el

@@ -116,6 +116,9 @@
 (declare-function bbdb-search-name "ext:bbdb-com" (regexp &optional layout))
 (declare-function bbdb-search-organization "ext:bbdb-com" (regexp &optional layout))
 
+;; `bbdb-record-note' is part of BBDB v3.x
+(declare-function bbdb-record-note "ext:bbdb" (record label))
+
 (declare-function calendar-leap-year-p "calendar" (year))
 (declare-function diary-ordinal-suffix "diary-lib" (n))