Browse Source

org-table: Remove outdated functions

* lisp/org-table.el (org-table-colgroup-line-p,
  org-table-cookie-line-p): Remove functions.

* etc/ORG-NEWS: Signal removal.

These functions were used in the pre Org 8.0, specifically in HTML
export back-end.  They are no longer accurate since they tolerate some
HTML entities whereas Org syntax doesn't.
Nicolas Goaziou 9 năm trước cách đây
mục cha
commit
00170d401f
2 tập tin đã thay đổi với 3 bổ sung31 xóa
  1. 3 0
      etc/ORG-NEWS
  2. 0 31
      lisp/org-table.el

+ 3 - 0
etc/ORG-NEWS

@@ -116,6 +116,9 @@ references.  Use ~org-export-get-reference~ instead.
 *** Removed function ~org-end-of-meta-data-and-drawers~
 The function is superseded by ~org-end-of-meta-data~, called with an
 optional argument.
+*** Removed functions ~org-table-colgroup-line-p~, ~org-table-cookie-line-p~
+These functions were left-over from pre 8.0 era.  They are not correct
+anymore.  Since they are not needed, they have no replacement.
 ** Removed options
 *** ~org-list-empty-line-terminates-plain-lists~ is deprecated
 It will be kept in code base until next release, for backward

+ 0 - 31
lisp/org-table.el

@@ -441,37 +441,6 @@ prevents it from hanging emacs."
    "\\(" "@?[-0-9I$&]+" "\\|" "[a-zA-Z]\\{1,2\\}\\([0-9]+\\|&\\)" "\\|" "\\$[a-zA-Z0-9]+" "\\)")
   "Match a range for reference display.")
 
-(defun org-table-colgroup-line-p (line)
-  "Is this a table line colgroup information?"
-  (save-match-data
-    (and (string-match "[<>]\\|&[lg]t;" line)
-	 (string-match "\\`[ \t]*|[ \t]*/[ \t]*\\(|[ \t<>0-9|lgt&;]+\\)\\'"
-		       line)
-	 (not (delq
-	       nil
-	       (mapcar
-		(lambda (s)
-		  (not (member s '("" "<" ">" "<>" "&lt;" "&gt;" "&lt;&gt;"))))
-		(org-split-string (match-string 1 line) "[ \t]*|[ \t]*")))))))
-
-(defun org-table-cookie-line-p (line)
-  "Is this a table line with only alignment/width cookies?"
-  (save-match-data
-    (and (string-match "[<>]\\|&[lg]t;" line)
-	 (or (string-match
-	      "\\`[ \t]*|[ \t]*/[ \t]*\\(|[ \t<>0-9|lrcgt&;]+\\)\\'" line)
-	     (string-match "\\(\\`[ \t<>lrc0-9|gt&;]+\\'\\)" line))
-	 (not (delq nil (mapcar
-			 (lambda (s)
-			   (not (or (equal s "")
-				    (string-match
-				     "\\`<\\([lrc]?[0-9]+\\|[lrc]\\)>\\'" s)
-				    (string-match
-				     "\\`&lt;\\([lrc]?[0-9]+\\|[lrc]\\)&gt;\\'"
-				     s))))
-			 (org-split-string (match-string 1 line)
-					   "[ \t]*|[ \t]*")))))))
-
 (defconst org-table-translate-regexp
   (concat "\\(" "@[-0-9I$]+" "\\|" "[a-zA-Z]\\{1,2\\}\\([0-9]+\\|&\\)" "\\)")
   "Match a reference that needs translation, for reference display.")