mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 22:37:47 +00:00
Merge branch 'maint'
Revert commit 79873390ed
.
The fix was wrong and gave rise to a different problem - see
http://thread.gmane.org/gmane.emacs.orgmode/89945
This commit is contained in:
commit
f15a83ab9f
|
@ -443,11 +443,15 @@ available parameters."
|
|||
"[ \t]*|[ \t]*")))))))
|
||||
|
||||
(defvar org-table-clean-did-remove-column nil) ; dynamically scoped
|
||||
(defun org-table-clean-before-export (lines)
|
||||
(defun org-table-clean-before-export (lines &optional maybe-quoted)
|
||||
"Check if the table has a marking column.
|
||||
If yes remove the column and the special lines."
|
||||
(let ((special "^[ \t]*| *[#!$*_^/] *|")
|
||||
(ignore "^[ \t]*| *[!$_^/] *|"))
|
||||
(let ((special (if maybe-quoted
|
||||
"^[ \t]*| *\\\\?[\#!$*_^/ ] *|"
|
||||
"^[ \t]*| *[\#!$*_^/ ] *|"))
|
||||
(ignore (if maybe-quoted
|
||||
"^[ \t]*| *\\\\?[!$_^/] *|"
|
||||
"^[ \t]*| *[!$_^/] *|")))
|
||||
(setq org-table-clean-did-remove-column
|
||||
(not (memq nil
|
||||
(mapcar
|
||||
|
|
Loading…
Reference in a new issue