mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2012-12-18 19:33:47 +01:00
parent 0f3264f690 7739e8b5f7
commit 76cf2538bb
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lisp/org.el
View File

@ -21485,22 +21485,18 @@ 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."
(interactive) (interactive)
(cond ;; First ensure filling in correct in message-mode (if (and (derived-mode-p '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))))
;; First ensure filling is correct in message-mode.
(let ((fill-paragraph-function (let ((fill-paragraph-function
(cadadr (assoc 'fill-paragraph-function org-fb-vars))) (cadadr (assoc 'fill-paragraph-function org-fb-vars)))
(fill-prefix (cadadr (assoc 'fill-prefix org-fb-vars))) (fill-prefix (cadadr (assoc 'fill-prefix org-fb-vars)))
(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.
@ -21510,6 +21506,8 @@ a footnote definition, try to fill the first paragraph within."
;; the buffer. In that case, ignore filling. ;; the buffer. In that case, ignore filling.
(if (< (point) (org-element-property :begin element)) t (if (< (point) (org-element-property :begin element)) t
(case (org-element-type element) (case (org-element-type element)
;; Use major mode filling function is src blocks.
(src-block (org-babel-do-key-sequence-in-edit-buffer (kbd "M-q")))
;; Align Org tables, leave table.el tables as-is. ;; Align Org tables, leave table.el tables as-is.
(table-row (org-table-align) t) (table-row (org-table-align) t)
(table (table
@ -21586,7 +21584,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."