mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-07-15 14:46:28 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Nicolas Goaziou 2012-08-25 15:42:26 +02:00
parent 1f3d1f55fe 90f6324dbf
commit 8bf85553a3
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/org.el
View file

@ -21043,9 +21043,7 @@ meant to be filled."
(comment (looking-at "[ \t]*# ?") (match-string 0))
(footnote-definition "")
((item plain-list)
(make-string (org-list-item-body-column
(org-element-property :begin element))
? ))
(make-string (org-list-item-body-column post-affiliated) ? ))
(paragraph
;; Fill prefix is usually the same as the current line,
;; 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)
(org-element-property :contents-begin element)))
(end (min (point-max)
(org-element-property :contents-end element)))
(type (org-element-type element)))
(org-element-property :contents-end element))))
;; Do nothing if point is at an affiliated keyword.
(if (< (point) beg) t
(when (derived-mode-p 'message-mode)