tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-09-03 11:19:28 +02:00
parent f43c8c8100 7efb9cb7ed
commit 0fa4255eab
2 changed files with 1138 additions and 718 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1849
etc/ORG-NEWS
View File

File diff suppressed because it is too large Load Diff

7
lisp/org.el
View File

@ -21222,7 +21222,8 @@ meant to be filled."
(make-string (org-list-item-body-column
(org-element-property :begin parent))
? ))
((looking-at "[ \t]+") (match-string 0))
((save-excursion (beginning-of-line) (looking-at "[ \t]+"))
(match-string 0))
(t ""))))
(comment-block
;; Only fill contents if P is within block boundaries.
@ -21234,7 +21235,9 @@ meant to be filled."
(skip-chars-backward " \r\t\n")
(line-beginning-position))))
(when (and (>= p cbeg) (< p cend))
(if (looking-at "[ \t]+") (match-string 0) ""))))))))))
(if (save-excursion (beginning-of-line) (looking-at "[ \t]+"))
(match-string 0)
""))))))))))
(declare-function message-goto-body "message" ())
(defvar message-cite-prefix-regexp) ; From message.el