summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2016-05-15 19:15:28 -0400
committerKyle Meyer <kyle@kyleam.com>2016-05-15 19:16:30 -0400
commitd38e91867cf5a1bf948d7b6efbb08a0db742c829 (patch)
treeb8978158b8502bbc3bfac88ee6a8c3fc976ed8c0
parent4925d5be7be9b82ff54e07b82a6d20bb27c15c6f (diff)
downloadorg-mode-d38e91867cf5a1bf948d7b6efbb08a0db742c829.tar.gz
Fix remaining declare-function issues on master
* lisp/org-list.el (org-export-create-backend): Indicate that FN is not a defun. * lisp/org-list.el (org-export-create-backend): (org-export-data-with-backend): (org-export-get-backend): (org-export-get-environment): (org-export-get-next-element): (org-export-with-backend): Correct source file name. * lisp/org.el (calendar-check-holidays): (org-agenda-format-item): Correct argument list.
-rw-r--r--lisp/org-list.el12
-rw-r--r--lisp/org.el4
2 files changed, 8 insertions, 8 deletions
diff --git a/lisp/org-list.el b/lisp/org-list.el
index da688d1..f9c1c4c 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -120,14 +120,14 @@
(declare-function org-element-update-syntax "org-element" ())
(declare-function org-entry-get "org"
(pom property &optional inherit literal-nil))
-(declare-function org-export-create-backend "org-export" (&rest rest))
-(declare-function org-export-data-with-backend "org-export" (data backend info))
-(declare-function org-export-get-backend "org-export" (name))
-(declare-function org-export-get-environment "org-export"
+(declare-function org-export-create-backend "ox" (&rest rest) t)
+(declare-function org-export-data-with-backend "ox" (data backend info))
+(declare-function org-export-get-backend "ox" (name))
+(declare-function org-export-get-environment "ox"
(&optional backend subtreep ext-plist))
-(declare-function org-export-get-next-element "org-export"
+(declare-function org-export-get-next-element "ox"
(blob info &optional n))
-(declare-function org-export-with-backend "org-export"
+(declare-function org-export-with-backend "ox"
(backend data &optional contents info))
(declare-function org-fix-tags-on-the-fly "org" ())
(declare-function org-get-indentation "org" (&optional line))
diff --git a/lisp/org.el b/lisp/org.el
index 1f341df..c667eab 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -109,7 +109,7 @@ sure that we are at the beginning of the line.")
"Matches a headline, putting stars and text into groups.
Stars are put in group 1 and the trimmed body in group 2.")
-(declare-function calendar-check-holidays "holidays" (&optional date))
+(declare-function calendar-check-holidays "holidays" (date))
(declare-function cdlatex-environment "ext:cdlatex" (environment item))
(declare-function org-add-archive-files "org-archive" (files))
(declare-function org-agenda-entry-get-agenda-timestamp "org-agenda" (pom))
@@ -4428,7 +4428,7 @@ This is needed for font-lock setup.")
(declare-function org-agenda-copy-local-variable "org-agenda" (var))
(declare-function org-agenda-format-item
"org-agenda"
- (extra txt &optional level category tags dotime noprefix
+ (extra txt &optional level category tags dotime
remove-re habitp))
(declare-function org-agenda-maybe-redo "org-agenda" ())
(declare-function org-agenda-new-marker "org-agenda" (&optional pos))