From 0a6d23ac0f865829701f21a1d460cdf0647473c7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 31 Oct 2011 20:21:06 +0100 Subject: [PATCH] Do not rely on variables defined in Org buffers only for export * lisp/org-html.el (org-export-as-html): Revert changes effectued on patch dfcb6faef11a2439b56b18a6289803361d402130. `org-heading-keyword-regexp-format' may not be defined during all the export stages. * lisp/org-docbook.el (org-export-as-docbook): Ditto. --- lisp/org-docbook.el | 5 ++--- lisp/org-html.el | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lisp/org-docbook.el b/lisp/org-docbook.el index 6b10354..5cb9722 100644 --- a/lisp/org-docbook.el +++ b/lisp/org-docbook.el @@ -502,9 +502,8 @@ publishing directory." ;; We will use HTML table formatter to export tables to DocBook ;; format, so need to set html-table-tag here. (html-table-tag (plist-get opt-plist :html-table-tag)) - (quote-re0 (concat "^ *" org-quote-string "\\( +\\|[ \t]*$\\)")) - (quote-re (format org-heading-keyword-regexp-format - org-quote-string)) + (quote-re0 (concat "^[ \t]*" org-quote-string "\\>")) + (quote-re (concat "^\\(\\*+\\)\\([ \t]+" org-quote-string "\\>\\)")) (inquote nil) (infixed nil) (inverse nil) diff --git a/lisp/org-html.el b/lisp/org-html.el index fa3811f..8908198 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -1179,9 +1179,8 @@ PUB-DIR is set, use this as the publishing directory." (plist-get opt-plist :link-home))) (dummy (setq opt-plist (plist-put opt-plist :title title))) (html-table-tag (plist-get opt-plist :html-table-tag)) - (quote-re0 (concat "^ *" org-quote-string "\\( +\\|[ \t]*$\\)")) - (quote-re (format org-heading-keyword-regexp-format - org-quote-string)) + (quote-re0 (concat "^[ \t]*" org-quote-string "\\>")) + (quote-re (concat "^\\(\\*+\\)\\([ \t]+" org-quote-string "\\>\\)")) (inquote nil) (infixed nil) (inverse nil) -- 1.7.7.1