ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint' 

Conflicts:
	lisp/org.el
This commit is contained in:
Bastien Guerry 2013-01-22 13:57:57 +01:00
parent f7f1b4bb7e a85b393994
commit 627b3faa3d
1 changed files with 50 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lisp/org.el
View File

@ -21603,14 +21603,17 @@ function installs the following ones: \"property\",
Return fill prefix, as a string, or nil if current line isn't
meant to be filled."
(let (prefix)
(when (and (derived-mode-p 'message-mode) (message-in-body-p))
(catch 'exit
(when (derived-mode-p 'message-mode)
(save-excursion
(beginning-of-line)
(cond ((looking-at message-cite-prefix-regexp)
(setq prefix (match-string-no-properties 0)))
(cond ((or (not (message-in-body-p))
(looking-at orgtbl-line-start-regexp))
(throw 'exit nil))
((looking-at message-cite-prefix-regexp)
(throw 'exit (match-string-no-properties 0)))
((looking-at org-outline-regexp)
(setq prefix "")))))
(or prefix
(throw 'exit (make-string (length (match-string 0)) ? ))))))
(org-with-wide-buffer
(let* ((p (line-beginning-position))
(element (save-excursion (beginning-of-line)