Merge branch 'maint' of orgmode.org:org-mode into maint

This commit is contained in:
Bastien Guerry 2012-09-03 11:19:14 +02:00
commit 7efb9cb7ed
1 changed files with 5 additions and 2 deletions

View File

@ -21061,7 +21061,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.
@ -21073,7 +21074,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