forked from mirrors/org-mode
org.el (org-indent-line-function): Fix bug.
* org.el (org-indent-line-function): Fix bug. Don't fall back systematically on `org-fb-vars' to do the indentation. Only fall back at then end, when no modification has been done by indenting a la Org. In that case, use `indent-according-to-mode' instead of using `indent-line-function' to avoid a possible loop. Thanks to Eric Fraga, Christopher Schmidt and Nicolas Goaziou who reported problems with this.
This commit is contained in:
Bastien Guerry
parent
0a1fe26054
commit
73ec767458
216
lisp/org.el
216
lisp/org.el
|
|
@ -20426,116 +20426,116 @@ If point is in an inline task, mark that task instead."
|
|||
(defun org-indent-line-function ()
|
||||
"Indent line depending on context."
|
||||
(interactive)
|
||||
(if orgstruct-is-++
|
||||
(orgstruct++-ignore-org-filling
|
||||
(funcall indent-line-function))
|
||||
(let* ((pos (point))
|
||||
(itemp (org-at-item-p))
|
||||
(case-fold-search t)
|
||||
(org-drawer-regexp (or org-drawer-regexp "\000"))
|
||||
(inline-task-p (and (featurep 'org-inlinetask)
|
||||
(org-inlinetask-in-task-p)))
|
||||
(inline-re (and inline-task-p
|
||||
(org-inlinetask-outline-regexp)))
|
||||
column)
|
||||
(beginning-of-line 1)
|
||||
(let* ((pos (point))
|
||||
(itemp (org-at-item-p))
|
||||
(case-fold-search t)
|
||||
(org-drawer-regexp (or org-drawer-regexp "\000"))
|
||||
(inline-task-p (and (featurep 'org-inlinetask)
|
||||
(org-inlinetask-in-task-p)))
|
||||
(inline-re (and inline-task-p
|
||||
(org-inlinetask-outline-regexp)))
|
||||
column)
|
||||
(beginning-of-line 1)
|
||||
(cond
|
||||
;; Comments
|
||||
((looking-at "# ") (setq column 0))
|
||||
;; Headings
|
||||
((looking-at org-outline-regexp) (setq column 0))
|
||||
;; 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
|
||||
;; Comments
|
||||
((looking-at "# ") (setq column 0))
|
||||
;; Headings
|
||||
((looking-at org-outline-regexp) (setq column 0))
|
||||
;; 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)))
|
||||
;; 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))))
|
||||
;; 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
|
||||
;; 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))))
|
||||
;; 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)
|
||||
(when (and orgstruct-is-++ (eq pos (point)))
|
||||
(orgstruct++-ignore-org-filling
|
||||
(indent-according-to-mode)))))
|
||||
|
||||
(defun org-indent-drawer ()
|
||||
"Indent the drawer at point."
|
||||
|
|
|
|||
Loading…
Reference in New Issue