From 50da53de5153d03850bab6ca0327018f4fb037c1 Mon Sep 17 00:00:00 2001 From: Nick Dokos Date: Wed, 20 Aug 2014 22:14:53 -0400 Subject: [PATCH] Revert "org-clean-before-export matches non-special columns spuriously" This reverts commit 79873390edd26a44cefc2050c7af470a7ed8fd07. The fix was wrong and gave rise to a different problem - see http://thread.gmane.org/gmane.emacs.orgmode/89945 Revert it for now, since there is a workaround for the original problem and plan on a correct fix in the near future. --- lisp/org-table.el | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lisp/org-table.el b/lisp/org-table.el index f19c0270c..30a66c9c2 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -436,11 +436,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