tec/org-mode
tec/org-mode
1
0
Fork 0
forked from mirrors/org-mode
Code Pull requests Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Nicolas Goaziou 2016-12-16 22:42:53 +01:00
parent 0863f8d1ca 51efd7f1db
commit 81f4e9f651
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/org-list.el
View file

@ -2097,11 +2097,13 @@ Possible values are: `folded', `children' or `subtree'. See
"Return column at which body of ITEM should start." "Return column at which body of ITEM should start."
(save-excursion (save-excursion
(goto-char item) (goto-char item)
(looking-at "[ \t]*\\(\\S-+\\)\\(.*[ \t]+::\\)?\\([ \t]+\\|$\\)") (looking-at "[ \t]*\\(\\S-+\\)\\(.*[ \t]::\\)?\\([ \t]\\|$\\)")
(if (match-beginning 2) (if (match-beginning 2)
(let ((start (1+ (match-end 2))) (let ((start (1+ (match-end 2)))
(ind (org-get-indentation))) (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)) (+ (progn (goto-char (match-end 1)) (current-column))
(if (and org-list-two-spaces-after-bullet-regexp (if (and org-list-two-spaces-after-bullet-regexp
(string-match-p org-list-two-spaces-after-bullet-regexp (string-match-p org-list-two-spaces-after-bullet-regexp