mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-20 15:18:33 +00:00
Merge branch 'maint'
This commit is contained in:
commit
8bf85553a3
|
@ -21043,9 +21043,7 @@ meant to be filled."
|
||||||
(comment (looking-at "[ \t]*# ?") (match-string 0))
|
(comment (looking-at "[ \t]*# ?") (match-string 0))
|
||||||
(footnote-definition "")
|
(footnote-definition "")
|
||||||
((item plain-list)
|
((item plain-list)
|
||||||
(make-string (org-list-item-body-column
|
(make-string (org-list-item-body-column post-affiliated) ? ))
|
||||||
(org-element-property :begin element))
|
|
||||||
? ))
|
|
||||||
(paragraph
|
(paragraph
|
||||||
;; Fill prefix is usually the same as the current line,
|
;; Fill prefix is usually the same as the current line,
|
||||||
;; except if the paragraph is at the beginning of an item.
|
;; except if the paragraph is at the beginning of an item.
|
||||||
|
@ -21119,8 +21117,7 @@ a footnote definition, try to fill the first paragraph within."
|
||||||
(let ((beg (max (point-min)
|
(let ((beg (max (point-min)
|
||||||
(org-element-property :contents-begin element)))
|
(org-element-property :contents-begin element)))
|
||||||
(end (min (point-max)
|
(end (min (point-max)
|
||||||
(org-element-property :contents-end element)))
|
(org-element-property :contents-end element))))
|
||||||
(type (org-element-type element)))
|
|
||||||
;; Do nothing if point is at an affiliated keyword.
|
;; Do nothing if point is at an affiliated keyword.
|
||||||
(if (< (point) beg) t
|
(if (< (point) beg) t
|
||||||
(when (derived-mode-p 'message-mode)
|
(when (derived-mode-p 'message-mode)
|
||||||
|
|
Loading…
Reference in a new issue