summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-24 15:36:36 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-24 15:36:36 (GMT)
commitf11accd3ee8f4a2eaaf570ecd6b93d862b1fc9f4 (patch)
treee4c1f1ca63fdd57bd4dda92e4f64bbab803fa79b
parent6f3cb7a8b5cb66d2ffe07fdcfb59e8fd983539f9 (diff)
parent97f0951d142e78e31f7fccb9a4dd79f3578a194f (diff)
downloadorg-mode-f11accd3ee8f4a2eaaf570ecd6b93d862b1fc9f4.zip
org-mode-f11accd3ee8f4a2eaaf570ecd6b93d862b1fc9f4.tar.gz
Merge branch 'maint'
Conflicts: lisp/org.el
-rw-r--r--lisp/org.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/org.el b/lisp/org.el
index dca4a1c..718848c 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -21609,6 +21609,7 @@ function installs the following ones: \"property\",
(looking-at "\\\\\\\\\\($\\|[^\\\\]\\)")))
(declare-function message-in-body-p "message" ())
+(defvar orgtbl-line-start-regexp) ; From org-table.el
(defun org-adaptive-fill-function ()
"Compute a fill prefix for the current line.
Return fill prefix, as a string, or nil if current line isn't