Procházet zdrojové kódy

org-element: Remove dependency on `org-at-table-p'

* lisp/org-element.el (org-element-table-parser): Do not call
  `org-at-table.el-p'.
(org-element--current-element): Do not call `org-at-table-p'.
Nicolas Goaziou před 10 roky
rodič
revize
aa9c4bfb6f
1 změnil soubory, kde provedl 3 přidání a 2 odebrání
  1. 3 2
      lisp/org-element.el

+ 3 - 2
lisp/org-element.el

@@ -2492,7 +2492,7 @@ Assume point is at the beginning of the table."
   (save-excursion
     (let* ((case-fold-search t)
 	   (table-begin (point))
-	   (type (if (org-at-table.el-p) 'table.el 'org))
+	   (type (if (looking-at "[ \t]*|") 'org 'table.el))
 	   (begin (car affiliated))
 	   (table-end
 	    (if (re-search-forward org-table-any-border-regexp limit 'm)
@@ -3787,7 +3787,8 @@ element it has to parse."
 	     ((looking-at "%%(")
 	      (org-element-diary-sexp-parser limit affiliated))
 	     ;; Table.
-	     ((org-at-table-p t) (org-element-table-parser limit affiliated))
+	     ((looking-at "[ \t]*\\(|\\|\\+\\(-+\\+\\)+[ \t]*$\\)")
+	      (org-element-table-parser limit affiliated))
 	     ;; List.
 	     ((looking-at (org-item-re))
 	      (org-element-plain-list-parser