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

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-12-18 15:04:43 +01:00
parent 1af0b39c01 9d4dd69b30
commit 4996e5bd8e
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/org.el
View File

@ -21487,9 +21487,9 @@ width for filling.
For convenience, when point is at a plain list, an item or For convenience, when point is at a plain list, an item or
a footnote definition, try to fill the first paragraph within." a footnote definition, try to fill the first paragraph within."
;; Falls back on message-fill-paragraph when necessary
(interactive) (interactive)
(if (and (derived-mode-p 'message-mode) (cond ;; First ensure filling in correct in message-mode
((and (derived-mode-p 'message-mode)
(or (not (message-in-body-p)) (or (not (message-in-body-p))
(save-excursion (move-beginning-of-line 1) (save-excursion (move-beginning-of-line 1)
(looking-at message-cite-prefix-regexp)))) (looking-at message-cite-prefix-regexp))))
@ -21499,7 +21499,11 @@ a footnote definition, try to fill the first paragraph within."
(paragraph-start (cadadr (assoc 'paragraph-start org-fb-vars))) (paragraph-start (cadadr (assoc 'paragraph-start org-fb-vars)))
(paragraph-separate (paragraph-separate
(cadadr (assoc 'paragraph-separate org-fb-vars)))) (cadadr (assoc 'paragraph-separate org-fb-vars))))
(fill-paragraph nil)) (fill-paragraph nil)))
;; Correct filling in source block
((org-in-src-block-p)
(org-babel-do-key-sequence-in-edit-buffer (kbd "M-q")))
(t
(save-excursion (save-excursion
;; Move to end of line in order to get the first paragraph ;; Move to end of line in order to get the first paragraph
;; within a plain list or a footnote definition. ;; within a plain list or a footnote definition.
@ -21585,7 +21589,7 @@ a footnote definition, try to fill the first paragraph within."
;; Fill comments. ;; Fill comments.
(comment (fill-comment-paragraph justify)) (comment (fill-comment-paragraph justify))
;; Ignore every other element. ;; Ignore every other element.
(otherwise t))))))) (otherwise t))))))))
(defun org-auto-fill-function () (defun org-auto-fill-function ()
"Auto-fill function." "Auto-fill function."