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 2013-07-25 19:00:51 +02:00
parent f00d759765 af300bd5b0
commit 6f20e3f0ff
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/org.el
View File

@ -22019,12 +22019,9 @@ hierarchy of headlines by UP levels before marking the subtree."
(beginning-of-line 0))
(cond
;; There was a list item above.
((save-excursion
(and (ignore-errors (goto-char (org-in-item-p)))
(goto-char
(org-list-get-top-point (org-list-struct)))))
(looking-at org-list-full-item-re)
(setq column (length (match-string 0))))
((ignore-errors (goto-char (org-in-item-p)))
(goto-char (org-list-get-top-point (org-list-struct)))
(setq column (org-get-indentation)))
;; There was an heading above.
((looking-at "\\*+[ \t]+")
(if (not org-adapt-indentation)