diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2019-03-12 10:41:36 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2019-03-12 10:43:25 +0100 |
commit | 7e58160367a2dd1c105b764c7c51f5467f05205f (patch) | |
tree | 9777665d36665b6ef2828bae3736e2dcfae609ae | |
parent | b1429cdfe043b199bb7be6dc5c97a299954b4e0d (diff) | |
download | org-mode-7e58160367a2dd1c105b764c7c51f5467f05205f.tar.gz |
Fix "File mode specification error"
This reverts "org-element: Do not require 'org", which does not seem
trivial at the moment.
Reported-by: Amin Bandali <bandali@gnu.org>
<http://lists.gnu.org/r/emacs-orgmode/2019-03/msg00117.html>
-rw-r--r-- | lisp/org-element.el | 7 | ||||
-rw-r--r-- | lisp/org-lint.el | 1 | ||||
-rw-r--r-- | lisp/org-macro.el | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/lisp/org-element.el b/lisp/org-element.el index d9ee8fd..3d6f1f6 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -60,18 +60,21 @@ (require 'avl-tree) (require 'cl-lib) -(require 'org-macs) (require 'ol) +(require 'org) +(require 'org-compat) (require 'org-entities) (require 'org-footnote) (require 'org-list) -(require 'org-macro) +(require 'org-macs) (require 'org-table) (declare-function org-at-heading-p "org" (&optional _)) (declare-function org-end-of-subtree "org" (&optional invisible-ok to-heading)) (declare-function org-escape-code-in-string "org-src" (s)) (declare-function org-find-visible "org" ()) +(declare-function org-macro-escape-arguments "org-macro" (&rest args)) +(declare-function org-macro-extract-arguments "org-macro" (s)) (declare-function org-reduced-level "org" (l)) (declare-function org-unescape-code-in-string "org-src" (s)) (declare-function outline-next-heading "outline" ()) diff --git a/lisp/org-lint.el b/lisp/org-lint.el index 1131ea5..64167cd 100644 --- a/lisp/org-lint.el +++ b/lisp/org-lint.el @@ -108,7 +108,6 @@ (require 'cl-lib) (require 'ob) (require 'ol) -(require 'org-element) (require 'org-macro) (require 'ox) diff --git a/lisp/org-macro.el b/lisp/org-macro.el index c14703c..a3a0d1f 100644 --- a/lisp/org-macro.el +++ b/lisp/org-macro.el @@ -62,7 +62,7 @@ (declare-function org-file-contents "org" (file &optional noerror nocache)) (declare-function org-file-url-p "org" (file)) (declare-function org-in-commented-heading-p "org" (&optional no-inheritance)) -(declare-function org-link-search "org" (s &optional avoid-pos stealth)) +(declare-function org-link-search "ol" (s &optional avoid-pos stealth)) (declare-function org-mode "org" ()) (declare-function vc-backend "vc-hooks" (f)) (declare-function vc-call "vc-hooks" (fun file &rest args) t) @@ -139,6 +139,7 @@ In addition to buffer-defined macros, the function installs the following ones: \"n\", \"author\", \"email\", \"keyword\", \"time\", \"property\", and, if the buffer is associated to a file, \"input-file\" and \"modification-time\"." + (require 'org-element) (org-macro--counter-initialize) ;for "n" macro (setq org-macro-templates (nconc |