mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-22 17:10:43 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
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

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