summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2015-02-27 18:25:03 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2015-02-27 18:25:03 +0100
commitb8921e8c78bbe20369745c30b30a280c7f9a78d3 (patch)
treec6624b9b1f19741e03a3ee8cada6428d43321600
parent8c54b254b12d07136dc1720d2161b8a6db1f50b9 (diff)
downloadorg-mode-b8921e8c78bbe20369745c30b30a280c7f9a78d3.tar.gz
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 <eric@ericabrahamsen.net> <http://permalink.gmane.org/gmane.emacs.orgmode/95500>
-rwxr-xr-xlisp/org.el5
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/org.el b/lisp/org.el
index c72f48c..d05a7b8 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)