diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2015-07-29 00:04:24 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2015-08-02 17:55:55 +0200 |
| commit | 00170d401f6b6f51a4bdbc4fd5fc17b2ae21d82b (patch) | |
| tree | 75ab8d0efaf365f23ab38ce337aaeb4eab5ffa16 | |
| parent | 4117e398e62d0f22548192bd2a9fcfccfd6e6a6c (diff) | |
| download | org-mode-00170d401f6b6f51a4bdbc4fd5fc17b2ae21d82b.tar.gz | |
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.
| -rw-r--r-- | etc/ORG-NEWS | 3 | ||||
| -rw-r--r-- | lisp/org-table.el | 31 |
2 files changed, 3 insertions, 31 deletions
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index cb56c79..a0b3634 100644 --- a/etc/ORG-NEWS +++ b/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 diff --git a/lisp/org-table.el b/lisp/org-table.el index de9946b..eb74ddb 100644 --- a/lisp/org-table.el +++ b/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 '("" "<" ">" "<>" "<" ">" "<>")))) - (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 - "\\`<\\([lrc]?[0-9]+\\|[lrc]\\)>\\'" - 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.") |