mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2025-01-30 20:41:41 +00:00
Code

Merge branch 'maint'

Browse Source
This commit is contained in:
Nicolas Goaziou 2016-12-19 12:07:07 +01:00
commit 9ea8e46df0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/org-list.el
View File

@ -2097,13 +2097,19 @@ 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]\\|$\\)")
(if (match-beginning 2)
(let ((start (1+ (match-end 2)))
(if (save-excursion
(end-of-line)
(re-search-backward
"[ \t]::\\([ \t]\\|$\\)" (line-beginning-position) t))
;; Descriptive list item. Body starts after item's tag, if
;; possible.
(let ((start (1+ (- (match-beginning 1) (line-beginning-position))))
(ind (org-get-indentation)))
(if (> start (+ ind org-list-description-max-indent))
(+ ind 5)
start))
;; Regular item. Body starts after bullet.
(looking-at "[ \t]*\\(\\S-+\\)")
(+ (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