org.el: Fix bugs in `org-indent-line' and `org-fill-paragraph'
* org.el (org-fill-paragraph): Correctly fill paragraph in message-mode. (org-indent-line): Correctly indent according to mode when `orgstruct++-mode' is on. (orgstruct++-mode): Add `fill-prefix' to the variable temporarily stored in `org-fb-vars'.
This commit is contained in:
Bastien Guerry
parent
396e413f6b
commit
3496df0b4d
207
lisp/org.el
207
lisp/org.el
|
|
@ -8469,7 +8469,7 @@ buffer. It will also recognize item context in multiline items."
|
||||||
(mapc
|
(mapc
|
||||||
(lambda (x)
|
(lambda (x)
|
||||||
(when (string-match
|
(when (string-match
|
||||||
"^\\(paragraph-\\|auto-fill\\|normal-auto-fill\\|fill-paragraph\\|indent-\\)"
|
"^\\(paragraph-\\|auto-fill\\|normal-auto-fill\\|fill-paragraph\\|fill-prefix\\|indent-\\)"
|
||||||
(symbol-name (car x)))
|
(symbol-name (car x)))
|
||||||
(setq var (car x) val (nth 1 x))
|
(setq var (car x) val (nth 1 x))
|
||||||
(push (list var `(quote ,(eval var))) org-fb-vars)
|
(push (list var `(quote ,(eval var))) org-fb-vars)
|
||||||
|
|
@ -20732,105 +20732,105 @@ hierarchy of headlines by UP levels before marking the subtree."
|
||||||
(inline-re (and inline-task-p
|
(inline-re (and inline-task-p
|
||||||
(org-inlinetask-outline-regexp)))
|
(org-inlinetask-outline-regexp)))
|
||||||
column)
|
column)
|
||||||
(beginning-of-line 1)
|
(if (and orgstruct-is-++ (eq pos (point)))
|
||||||
(cond
|
(let ((indent-line-function (cadadr (assoc 'indent-line-function org-fb-vars))))
|
||||||
;; Headings
|
(indent-according-to-mode))
|
||||||
((looking-at org-outline-regexp) (setq column 0))
|
(beginning-of-line 1)
|
||||||
;; Included files
|
|
||||||
((looking-at "#\\+include:") (setq column 0))
|
|
||||||
;; Footnote definition
|
|
||||||
((looking-at org-footnote-definition-re) (setq column 0))
|
|
||||||
;; Literal examples
|
|
||||||
((looking-at "[ \t]*:\\( \\|$\\)")
|
|
||||||
(setq column (org-get-indentation))) ; do nothing
|
|
||||||
;; Lists
|
|
||||||
((ignore-errors (goto-char (org-in-item-p)))
|
|
||||||
(setq column (if itemp
|
|
||||||
(org-get-indentation)
|
|
||||||
(org-list-item-body-column (point))))
|
|
||||||
(goto-char pos))
|
|
||||||
;; Drawers
|
|
||||||
((and (looking-at "[ \t]*:END:")
|
|
||||||
(save-excursion (re-search-backward org-drawer-regexp nil t)))
|
|
||||||
(save-excursion
|
|
||||||
(goto-char (1- (match-beginning 1)))
|
|
||||||
(setq column (current-column))))
|
|
||||||
;; Special blocks
|
|
||||||
((and (looking-at "[ \t]*#\\+end_\\([a-z]+\\)")
|
|
||||||
(save-excursion
|
|
||||||
(re-search-backward
|
|
||||||
(concat "^[ \t]*#\\+begin_" (downcase (match-string 1))) nil t)))
|
|
||||||
(setq column (org-get-indentation (match-string 0))))
|
|
||||||
((and (not (looking-at "[ \t]*#\\+begin_"))
|
|
||||||
(org-between-regexps-p "^[ \t]*#\\+begin_" "[ \t]*#\\+end_"))
|
|
||||||
(save-excursion
|
|
||||||
(re-search-backward "^[ \t]*#\\+begin_\\([a-z]+\\)" nil t))
|
|
||||||
(setq column
|
|
||||||
(cond ((equal (downcase (match-string 1)) "src")
|
|
||||||
;; src blocks: let `org-edit-src-exit' handle them
|
|
||||||
(org-get-indentation))
|
|
||||||
((equal (downcase (match-string 1)) "example")
|
|
||||||
(max (org-get-indentation)
|
|
||||||
(org-get-indentation (match-string 0))))
|
|
||||||
(t
|
|
||||||
(org-get-indentation (match-string 0))))))
|
|
||||||
;; This line has nothing special, look at the previous relevant
|
|
||||||
;; line to compute indentation
|
|
||||||
(t
|
|
||||||
(beginning-of-line 0)
|
|
||||||
(while (and (not (bobp))
|
|
||||||
(not (looking-at org-drawer-regexp))
|
|
||||||
;; When point started in an inline task, do not move
|
|
||||||
;; above task starting line.
|
|
||||||
(not (and inline-task-p (looking-at inline-re)))
|
|
||||||
;; Skip drawers, blocks, empty lines, verbatim,
|
|
||||||
;; comments, tables, footnotes definitions, lists,
|
|
||||||
;; inline tasks.
|
|
||||||
(or (and (looking-at "[ \t]*:END:")
|
|
||||||
(re-search-backward org-drawer-regexp nil t))
|
|
||||||
(and (looking-at "[ \t]*#\\+end_")
|
|
||||||
(re-search-backward "[ \t]*#\\+begin_"nil t))
|
|
||||||
(looking-at "[ \t]*[\n:#|]")
|
|
||||||
(looking-at org-footnote-definition-re)
|
|
||||||
(and (ignore-errors (goto-char (org-in-item-p)))
|
|
||||||
(goto-char
|
|
||||||
(org-list-get-top-point (org-list-struct))))
|
|
||||||
(and (not inline-task-p)
|
|
||||||
(featurep 'org-inlinetask)
|
|
||||||
(org-inlinetask-in-task-p)
|
|
||||||
(or (org-inlinetask-goto-beginning) t))))
|
|
||||||
(beginning-of-line 0))
|
|
||||||
(cond
|
(cond
|
||||||
;; There was an heading above.
|
;; Headings
|
||||||
((looking-at "\\*+[ \t]+")
|
((looking-at org-outline-regexp) (setq column 0))
|
||||||
(if (not org-adapt-indentation)
|
;; Included files
|
||||||
(setq column 0)
|
((looking-at "#\\+include:") (setq column 0))
|
||||||
(goto-char (match-end 0))
|
;; Footnote definition
|
||||||
|
((looking-at org-footnote-definition-re) (setq column 0))
|
||||||
|
;; Literal examples
|
||||||
|
((looking-at "[ \t]*:\\( \\|$\\)")
|
||||||
|
(setq column (org-get-indentation))) ; do nothing
|
||||||
|
;; Lists
|
||||||
|
((ignore-errors (goto-char (org-in-item-p)))
|
||||||
|
(setq column (if itemp
|
||||||
|
(org-get-indentation)
|
||||||
|
(org-list-item-body-column (point))))
|
||||||
|
(goto-char pos))
|
||||||
|
;; Drawers
|
||||||
|
((and (looking-at "[ \t]*:END:")
|
||||||
|
(save-excursion (re-search-backward org-drawer-regexp nil t)))
|
||||||
|
(save-excursion
|
||||||
|
(goto-char (1- (match-beginning 1)))
|
||||||
(setq column (current-column))))
|
(setq column (current-column))))
|
||||||
;; A drawer had started and is unfinished
|
;; Special blocks
|
||||||
((looking-at org-drawer-regexp)
|
((and (looking-at "[ \t]*#\\+end_\\([a-z]+\\)")
|
||||||
(goto-char (1- (match-beginning 1)))
|
(save-excursion
|
||||||
(setq column (current-column)))
|
(re-search-backward
|
||||||
;; Else, nothing noticeable found: get indentation and go on.
|
(concat "^[ \t]*#\\+begin_" (downcase (match-string 1))) nil t)))
|
||||||
(t (setq column (org-get-indentation))))))
|
(setq column (org-get-indentation (match-string 0))))
|
||||||
;; Now apply indentation and move cursor accordingly
|
((and (not (looking-at "[ \t]*#\\+begin_"))
|
||||||
(goto-char pos)
|
(org-between-regexps-p "^[ \t]*#\\+begin_" "[ \t]*#\\+end_"))
|
||||||
(if (<= (current-column) (current-indentation))
|
(save-excursion
|
||||||
(org-indent-line-to column)
|
(re-search-backward "^[ \t]*#\\+begin_\\([a-z]+\\)" nil t))
|
||||||
(save-excursion (org-indent-line-to column)))
|
(setq column
|
||||||
;; Special polishing for properties, see `org-property-format'
|
(cond ((equal (downcase (match-string 1)) "src")
|
||||||
(setq column (current-column))
|
;; src blocks: let `org-edit-src-exit' handle them
|
||||||
(beginning-of-line 1)
|
(org-get-indentation))
|
||||||
(if (looking-at
|
((equal (downcase (match-string 1)) "example")
|
||||||
"\\([ \t]*\\)\\(:[-_0-9a-zA-Z]+:\\)[ \t]*\\(\\S-.*\\(\\S-\\|$\\)\\)")
|
(max (org-get-indentation)
|
||||||
(replace-match (concat (match-string 1)
|
(org-get-indentation (match-string 0))))
|
||||||
(format org-property-format
|
(t
|
||||||
(match-string 2) (match-string 3)))
|
(org-get-indentation (match-string 0))))))
|
||||||
t t))
|
;; This line has nothing special, look at the previous relevant
|
||||||
(org-move-to-column column)
|
;; line to compute indentation
|
||||||
(when (and orgstruct-is-++ (eq pos (point)))
|
(t
|
||||||
(org-let org-fb-vars
|
(beginning-of-line 0)
|
||||||
(indent-according-to-mode)))))
|
(while (and (not (bobp))
|
||||||
|
(not (looking-at org-drawer-regexp))
|
||||||
|
;; When point started in an inline task, do not move
|
||||||
|
;; above task starting line.
|
||||||
|
(not (and inline-task-p (looking-at inline-re)))
|
||||||
|
;; Skip drawers, blocks, empty lines, verbatim,
|
||||||
|
;; comments, tables, footnotes definitions, lists,
|
||||||
|
;; inline tasks.
|
||||||
|
(or (and (looking-at "[ \t]*:END:")
|
||||||
|
(re-search-backward org-drawer-regexp nil t))
|
||||||
|
(and (looking-at "[ \t]*#\\+end_")
|
||||||
|
(re-search-backward "[ \t]*#\\+begin_"nil t))
|
||||||
|
(looking-at "[ \t]*[\n:#|]")
|
||||||
|
(looking-at org-footnote-definition-re)
|
||||||
|
(and (ignore-errors (goto-char (org-in-item-p)))
|
||||||
|
(goto-char
|
||||||
|
(org-list-get-top-point (org-list-struct))))
|
||||||
|
(and (not inline-task-p)
|
||||||
|
(featurep 'org-inlinetask)
|
||||||
|
(org-inlinetask-in-task-p)
|
||||||
|
(or (org-inlinetask-goto-beginning) t))))
|
||||||
|
(beginning-of-line 0))
|
||||||
|
(cond
|
||||||
|
;; There was an heading above.
|
||||||
|
((looking-at "\\*+[ \t]+")
|
||||||
|
(if (not org-adapt-indentation)
|
||||||
|
(setq column 0)
|
||||||
|
(goto-char (match-end 0))
|
||||||
|
(setq column (current-column))))
|
||||||
|
;; A drawer had started and is unfinished
|
||||||
|
((looking-at org-drawer-regexp)
|
||||||
|
(goto-char (1- (match-beginning 1)))
|
||||||
|
(setq column (current-column)))
|
||||||
|
;; Else, nothing noticeable found: get indentation and go on.
|
||||||
|
(t (setq column (org-get-indentation))))))
|
||||||
|
;; Now apply indentation and move cursor accordingly
|
||||||
|
(goto-char pos)
|
||||||
|
(if (<= (current-column) (current-indentation))
|
||||||
|
(org-indent-line-to column)
|
||||||
|
(save-excursion (org-indent-line-to column)))
|
||||||
|
;; Special polishing for properties, see `org-property-format'
|
||||||
|
(setq column (current-column))
|
||||||
|
(beginning-of-line 1)
|
||||||
|
(if (looking-at
|
||||||
|
"\\([ \t]*\\)\\(:[-_0-9a-zA-Z]+:\\)[ \t]*\\(\\S-.*\\(\\S-\\|$\\)\\)")
|
||||||
|
(replace-match (concat (match-string 1)
|
||||||
|
(format org-property-format
|
||||||
|
(match-string 2) (match-string 3)))
|
||||||
|
t t))
|
||||||
|
(org-move-to-column column))))
|
||||||
|
|
||||||
(defun org-indent-drawer ()
|
(defun org-indent-drawer ()
|
||||||
"Indent the drawer at point."
|
"Indent the drawer at point."
|
||||||
|
|
@ -20987,11 +20987,12 @@ a footnote definition, try to fill the first paragraph within."
|
||||||
(if (and (derived-mode-p 'message-mode)
|
(if (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 "> "))))
|
(looking-at "^>+ "))))
|
||||||
(org-let org-fb-vars
|
(let ((fill-paragraph-function (cadadr (assoc 'fill-paragraph-function org-fb-vars)))
|
||||||
(or (and (message-point-in-header-p) (message-fill-field))
|
(fill-prefix (cadadr (assoc 'fill-prefix org-fb-vars)))
|
||||||
(and (save-excursion (move-beginning-of-line 1) (looking-at "> "))
|
(paragraph-start (cadadr (assoc 'paragraph-start org-fb-vars)))
|
||||||
(fill-comment-paragraph))))
|
(paragraph-separate (cadadr (assoc 'paragraph-separate org-fb-vars))))
|
||||||
|
(fill-paragraph))
|
||||||
(save-excursion
|
(save-excursion
|
||||||
;; Move to end of line in order to get the first paragraph within
|
;; Move to end of line in order to get the first paragraph within
|
||||||
;; a plain list or a footnote definition.
|
;; a plain list or a footnote definition.
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue