summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <n.goaziou@gmail.com>2013-07-25 17:00:51 (GMT)
committer Nicolas Goaziou <n.goaziou@gmail.com>2013-07-25 17:00:51 (GMT)
commit6f20e3f0ffb771aaa6582780d9f2bc1977824b2d (patch)
tree7e769930930ae62b5d9cbb8ad41a86439b58b90d
parentf00d759765bfa94adeea53eed23bb642424d04e6 (diff)
parentaf300bd5b0b77086c5b4589f823dcb783e1e7c56 (diff)
downloadorg-mode-6f20e3f0ffb771aaa6582780d9f2bc1977824b2d.zip
org-mode-6f20e3f0ffb771aaa6582780d9f2bc1977824b2d.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el9
1 files changed, 3 insertions, 6 deletions
diff --git a/lisp/org.el b/lisp/org.el
index fb5099e..2f619cc 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -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)