瀏覽代碼

Fix some compilation problem

* lisp/org-element.el (org-element-nested-p): Do not inline function.
* lisp/org.el: Do not autoload functions.
Nicolas Goaziou 12 年之前
父節點
當前提交
6b7101b910
共有 2 個文件被更改,包括 2 次插入6 次删除
  1. 1 1
      lisp/org-element.el
  2. 1 5
      lisp/org.el

+ 1 - 1
lisp/org-element.el

@@ -4789,7 +4789,7 @@ Providing it allows for quicker computation."
 			     end cend)))))))
 	   parent))))))
 
-(defsubst org-element-nested-p (elem-A elem-B)
+(defun org-element-nested-p (elem-A elem-B)
   "Non-nil when elements ELEM-A and ELEM-B are nested."
   (let ((beg-A (org-element-property :begin elem-A))
 	(beg-B (org-element-property :begin elem-B))

+ 1 - 5
lisp/org.el

@@ -137,9 +137,6 @@ Stars are put in group 1 and the trimmed body in group 2.")
 (declare-function org-table-maybe-eval-formula "org-table" ())
 (declare-function org-table-maybe-recalculate-line "org-table" ())
 
-(autoload 'org-element-at-point "org-element")
-(autoload 'org-element-type "org-element")
-
 (declare-function org-element--parse-objects "org-element"
 		  (beg end acc restriction))
 (declare-function org-element-at-point "org-element" (&optional keep-trail))
@@ -160,8 +157,7 @@ Stars are put in group 1 and the trimmed body in group 2.")
 		  (beg end acc restriction))
 (declare-function org-element-parse-buffer "org-element"
 		  (&optional granularity visible-only))
-(declare-function org-element-interpret-data "org-element"
-		  (data &optional parent))
+(declare-function org-element-type "org-element" (element))
 
 ;; load languages based on value of `org-babel-load-languages'
 (defvar org-babel-load-languages)