From b8921e8c78bbe20369745c30b30a280c7f9a78d3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 27 Feb 2015 18:25:03 +0100 Subject: [PATCH] Fix void `orgtbl-line-start-regexp' in orgstruct++ mode * lisp/org.el (org-adaptive-fill-function): Use `org-table-line-regexp' instead of `orgtbl-line-start-regexp', which may not be defined. Reported-by: Eric Abrahamsen --- lisp/org.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index c72f48c56..d05a7b8d5 100755 --- a/lisp/org.el +++ b/lisp/org.el @@ -22962,9 +22962,8 @@ matches in paragraphs or comments, use it." (when (derived-mode-p 'message-mode) (save-excursion (beginning-of-line) - (cond ((or (not (message-in-body-p)) - (looking-at orgtbl-line-start-regexp)) - (throw 'exit nil)) + (cond ((not (message-in-body-p)) (throw 'exit nil)) + ((org-looking-at-p org-table-line-regexp) (throw 'exit nil)) ((looking-at message-cite-prefix-regexp) (throw 'exit (match-string-no-properties 0))) ((looking-at org-outline-regexp)