diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-12-16 22:42:53 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-12-16 22:42:53 +0100 |
commit | 81f4e9f651312ce563c0fefa03d477ded2f2a826 (patch) | |
tree | 26625406ef47618245c4a39d041cd5937385d7be | |
parent | 0863f8d1ca46f4f25fa6bc6273a9695ec404bb76 (diff) | |
parent | 51efd7f1db1ca651a267920bd92fbeec4c12eb75 (diff) | |
download | org-mode-81f4e9f651312ce563c0fefa03d477ded2f2a826.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-list.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/org-list.el b/lisp/org-list.el index e3a51d0..021f1c6 100644 --- a/lisp/org-list.el +++ b/lisp/org-list.el @@ -2097,11 +2097,13 @@ Possible values are: `folded', `children' or `subtree'. See "Return column at which body of ITEM should start." (save-excursion (goto-char item) - (looking-at "[ \t]*\\(\\S-+\\)\\(.*[ \t]+::\\)?\\([ \t]+\\|$\\)") + (looking-at "[ \t]*\\(\\S-+\\)\\(.*[ \t]::\\)?\\([ \t]\\|$\\)") (if (match-beginning 2) (let ((start (1+ (match-end 2))) (ind (org-get-indentation))) - (if (> start (+ ind org-list-description-max-indent)) (+ ind 5) start)) + (if (> start (+ ind org-list-description-max-indent)) + (+ ind 5) + start)) (+ (progn (goto-char (match-end 1)) (current-column)) (if (and org-list-two-spaces-after-bullet-regexp (string-match-p org-list-two-spaces-after-bullet-regexp |