diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-12-15 22:26:01 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-12-15 22:26:01 +0100 |
commit | 2646271789d09ef39b354d0e91c4e2a980c71424 (patch) | |
tree | dac36213fde94ee3887cf75294d614f209d72d8e | |
parent | 5d4691dfbfea29cf2ecf8df8a97378082a573564 (diff) | |
parent | 46124812d2f4b2bdadb6e41fbd07c98b8a7727d9 (diff) | |
download | org-mode-2646271789d09ef39b354d0e91c4e2a980c71424.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/ob-core.el | 3 | ||||
-rw-r--r-- | lisp/org-compat.el | 4 | ||||
-rw-r--r-- | lisp/org-duration.el | 1 | ||||
-rw-r--r-- | lisp/org-footnote.el | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/lisp/ob-core.el b/lisp/ob-core.el index fbde08c..ade39ec 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -74,7 +74,6 @@ (declare-function org-mark-ring-push "org" (&optional pos buffer)) (declare-function org-narrow-to-subtree "org" ()) (declare-function org-next-block "org" (arg &optional backward block-regexp)) -(declare-function org-number-sequence "org-compat" (from &optional to inc)) (declare-function org-open-at-point "org" (&optional in-emacs reference-buffer)) (declare-function org-outline-overlay-data "org" (&optional use-markers)) (declare-function org-previous-block "org" (arg &optional block-regexp)) @@ -82,7 +81,7 @@ (declare-function org-reverse-string "org" (string)) (declare-function org-set-outline-overlay-data "org" (data)) (declare-function org-show-context "org" (&optional key)) -(declare-function org-src-coderef-format "org-src" (element)) +(declare-function org-src-coderef-format "org-src" (&optional element)) (declare-function org-src-coderef-regexp "org-src" (fmt &optional label)) (declare-function org-table-align "org-table" ()) (declare-function org-table-end "org-table" (&optional table-type)) diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 387831a..6a18ac8 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -34,7 +34,7 @@ (declare-function org-agenda-maybe-redo "org-agenda" ()) (declare-function org-at-heading-p "org" (&optional ignored)) -(declare-function org-at-table.el-p "org" (&optional table-type)) +(declare-function org-at-table.el-p "org" ()) (declare-function org-element-at-point "org-element" ()) (declare-function org-element-context "org-element" (&optional element)) (declare-function org-element-lineage "org-element" (blob &optional types with-self)) @@ -47,7 +47,7 @@ (declare-function org-log-into-drawer "org" ()) (declare-function org-reduced-level "org" (l)) (declare-function org-show-context "org" (&optional key)) -(declare-function org-table-end (&optional table-type)) +(declare-function org-table-end "org-table" (&optional table-type)) (declare-function outline-next-heading "outline" ()) (declare-function speedbar-line-directory "speedbar" (&optional depth)) (declare-function table--at-cell-p "table" (position &optional object at-column)) diff --git a/lisp/org-duration.el b/lisp/org-duration.el index f98c600..80c130f 100644 --- a/lisp/org-duration.el +++ b/lisp/org-duration.el @@ -51,7 +51,6 @@ (require 'cl-lib) (require 'org-macs) -(declare-function org-trim "org-trim" (s &optional keep-lead)) ;;; Public variables diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el index e039ab7..5df0efc 100644 --- a/lisp/org-footnote.el +++ b/lisp/org-footnote.el @@ -45,7 +45,7 @@ (declare-function org-element-property "org-element" (property element)) (declare-function org-element-type "org-element" (element)) (declare-function org-end-of-subtree "org" (&optional invisible-ok to-heading)) -(declare-function org-fill-paragraph "org" (&optional justify)) +(declare-function org-fill-paragraph "org" (&optional justify region)) (declare-function org-in-block-p "org" (names)) (declare-function org-in-regexp "org" (re &optional nlines visually)) (declare-function org-in-verbatim-emphasis "org" ()) |