0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-22 21:10:42 +00:00

Merge branch 'hotfix-7.8.06'

This commit is contained in:
Bastien Guerry 2012-03-20 02:58:01 +01:00
commit 34a9780378

View file

@ -1917,10 +1917,14 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
'org-label raw-table) 'org-label raw-table)
longtblp (and attr (stringp attr) longtblp (and attr (stringp attr)
(string-match "\\<longtable\\>" attr)) (string-match "\\<longtable\\>" attr))
tblenv (if (and attr (stringp attr) tblenv (if (and attr (stringp attr))
(or (string-match (regexp-quote "table*") attr) (cond ((string-match "\\<sidewaystable\\>" attr)
(string-match "\\<multicolumn\\>" attr))) "sidewaystable")
"table*" "table") ((or (string-match (regexp-quote "table*") attr)
(string-match "\\<multicolumn\\>" attr))
"table*")
(t "table"))
"table")
tabular-env tabular-env
(if (and attr (stringp attr) (if (and attr (stringp attr)
(string-match "\\(tabular.\\)" attr)) (string-match "\\(tabular.\\)" attr))