Merge branch 'maint'

Conflicts: lisp/org.el
2013-01-24 16:36:36 +01:00 · 2013-01-24 16:36:36 +01:00 · f11accd3ee
parent 6f3cb7a8b5 97f0951d14
commit f11accd3ee
1 changed files with 1 additions and 0 deletions
--- 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