Fix some warnings.

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ob.el b/lisp/ob.el
index a6d1359..0c7e647 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -50,7 +50,7 @@
                   (&optional context code edit-buffer-name quietp))
 (declare-function org-edit-src-exit "org-src"  (&optional context))
 (declare-function org-open-at-point "org" (&optional in-emacs reference-buffer))
-(declare-function org-save-outline-visibility "org" (use-markers &rest body))
+(declare-function org-save-outline-visibility "org-macs" (use-markers &rest body))
 (declare-function org-outline-overlay-data "org" (&optional use-markers))
 (declare-function org-set-outline-overlay-data "org" (data))
 (declare-function org-narrow-to-subtree "org" ())
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 87459e8..c29f350 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -46,6 +46,7 @@
 ;;; Code:
 
 (require 'org)
+(require 'org-macs)
 (eval-when-compile
   (require 'cl))
 
@@ -80,6 +81,8 @@
 (declare-function org-habit-get-priority "org-habit" (habit &optional moment))
 (declare-function org-pop-to-buffer-same-window "org-compat"
 		  (&optional buffer-or-name norecord label))
+(declare-function org-agenda-columns "org-colview" ())
+(declare-function org-add-archive-files "org-archive" (files))
 
 (defvar calendar-mode-map)
 (defvar org-clock-current-task) ; defined in org-clock.el
@@ -3334,6 +3337,7 @@ generating a new one."
 	   (org-set-local 'org-agenda-name name)))
     (setq buffer-read-only nil)))
 
+(defvar org-agenda-overriding-columns-format)  ; From org-colview.el
 (defun org-finalize-agenda ()
   "Finishing touch for the agenda buffer, called just before displaying it."
   (unless org-agenda-multi
@@ -3976,6 +3980,7 @@ given in `org-agenda-start-on-weekday'."
 In this table, we have single quotes not as word constituents, to
 that when \"+Ameli\" is searched as a work, it will also match \"Ameli's\"")
 
+(defvar org-mode-syntax-table) ; From org.el
 (defun org-search-syntax-table ()
   (unless org-search-syntax-table
     (setq org-search-syntax-table (copy-syntax-table org-mode-syntax-table))