Merge branch 'maint'

Conflicts:
	lisp/org.el

contrib/oldexp/org-exp.el

@@ -49,12 +49,9 @@
 		  (&optional buffer-or-name norecord label))
 (declare-function org-unescape-code-in-region "org-src" (beg end))
 
-(org-autoload 'org-export-generic
-	      "org-export-generic" "Export using the generic exporter" t)
-(org-autoload 'org-export-as-odt "org-odt"
-	      "Export the outline to a OpenDocument Text file." t)
-(org-autoload 'org-export-as-odt-and-open "org-odt"
-	      "Export the outline to a OpenDocument Text file and open it." t)
+(org-autoload "org-odt" '(org-export-generic
+			  org-export-as-odt
+			  org-export-as-odt-and-open))
 
 (defgroup org-export nil
   "Options for exporting org-listings."

lisp/org-docview.el

@@ -49,7 +49,7 @@
 (declare-function image-mode-window-get "ext:image-mode"
 		  (prop &optional winprops))
 
-(org-autoload 'doc-view-goto-page "doc-view")
+(org-autoload "doc-view" '(doc-view-goto-page))
 
 (org-add-link-type "docview" 'org-docview-open 'org-docview-export)
 (add-hook 'org-store-link-functions 'org-docview-store-link)