Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2013-01-08 10:36:47 +01:00
commit d9649ca7a2
1 changed files with 1 additions and 1 deletions

View File

@ -21545,7 +21545,7 @@ function installs the following ones: \"property\",
'(org-fill-paragraph-separate-nobreak-p
org-fill-line-break-nobreak-p)))))
(org-set-local 'fill-paragraph-function 'org-fill-paragraph)
(org-set-local 'auto-fill-inhibit-regexp org-outline-regexp)
(org-set-local 'auto-fill-inhibit-regexp nil)
(org-set-local 'adaptive-fill-function 'org-adaptive-fill-function)
(org-set-local 'normal-auto-fill-function 'org-auto-fill-function)
(org-set-local 'comment-line-break-function 'org-comment-line-break-function))