forked from mirrors/org-mode
Merge branch 'maint'
This commit is contained in:
commit
783eb3170c
|
@ -21640,7 +21640,8 @@ function installs the following ones: \"property\",
|
||||||
(org-uniquify
|
(org-uniquify
|
||||||
(append fill-nobreak-predicate
|
(append fill-nobreak-predicate
|
||||||
'(org-fill-paragraph-separate-nobreak-p
|
'(org-fill-paragraph-separate-nobreak-p
|
||||||
org-fill-line-break-nobreak-p)))))
|
org-fill-line-break-nobreak-p
|
||||||
|
org-fill-paragraph-with-timestamp-nobreak-p)))))
|
||||||
(org-set-local 'fill-paragraph-function 'org-fill-paragraph)
|
(org-set-local 'fill-paragraph-function 'org-fill-paragraph)
|
||||||
(org-set-local 'auto-fill-inhibit-regexp nil)
|
(org-set-local 'auto-fill-inhibit-regexp nil)
|
||||||
(org-set-local 'adaptive-fill-function 'org-adaptive-fill-function)
|
(org-set-local 'adaptive-fill-function 'org-adaptive-fill-function)
|
||||||
|
@ -21659,6 +21660,11 @@ function installs the following ones: \"property\",
|
||||||
(skip-chars-backward "\\\\")
|
(skip-chars-backward "\\\\")
|
||||||
(looking-at "\\\\\\\\\\($\\|[^\\\\]\\)")))
|
(looking-at "\\\\\\\\\\($\\|[^\\\\]\\)")))
|
||||||
|
|
||||||
|
(defun org-fill-paragraph-with-timestamp-nobreak-p ()
|
||||||
|
"Non-nil when a line break at point would insert a new item."
|
||||||
|
(and (org-at-timestamp-p t)
|
||||||
|
(not (looking-at org-ts-regexp-both))))
|
||||||
|
|
||||||
(declare-function message-in-body-p "message" ())
|
(declare-function message-in-body-p "message" ())
|
||||||
(defvar orgtbl-line-start-regexp) ; From org-table.el
|
(defvar orgtbl-line-start-regexp) ; From org-table.el
|
||||||
(defun org-adaptive-fill-function ()
|
(defun org-adaptive-fill-function ()
|
||||||
|
|
Loading…
Reference in a new issue