summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <n.goaziou@gmail.com>2010-09-18 19:39:04 +0200
committerDavid Maus <dmaus@ictsoc.de>2010-09-19 10:31:49 +0200
commitda92f40876942b4117b65695f3da3ad4feffd80a (patch)
treed5d690e802c95e1d72a176904568062228817550
parentcf5fbad49b3e23a40158fdb832dd44eedbc82340 (diff)
downloadorg-mode-da92f40876942b4117b65695f3da3ad4feffd80a.tar.gz
Correct LaTeX export with sublists. Minor fix of bullet cycling.
* org-list.el (org-cycle-list-bullet): follow order of bullets indicated in doc-string. * org-list.el (org-list-bottom-point-with-indent): list is ended when a line is less indented that the last item, not the less indented item.
-rw-r--r--lisp/org-list.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/org-list.el b/lisp/org-list.el
index d9fc24e..e5f607c 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -515,7 +515,7 @@ List ending is determined by the indentation of text. See
(skip-chars-forward " \r\t\n")
(beginning-of-line))
((org-at-item-p)
- (setq ind-ref (min ind ind-ref))
+ (setq ind-ref ind)
(forward-line 1))
((<= ind ind-ref)
(throw 'exit (point-at-bol)))
@@ -1644,11 +1644,11 @@ is an integer, 0 means `-', 1 means `+' etc. If WHICH is
(looking-at "\\S-")) '("*"))
;; Description items cannot be numbered
(unless (and bullet-rule-p
- (or (eq org-plain-list-ordered-item-terminator ?.)
- (org-at-item-description-p))) '("1)"))
- (unless (and bullet-rule-p
(or (eq org-plain-list-ordered-item-terminator ?\))
- (org-at-item-description-p))) '("1."))))
+ (org-at-item-description-p))) '("1."))
+ (unless (and bullet-rule-p
+ (or (eq org-plain-list-ordered-item-terminator ?.)
+ (org-at-item-description-p))) '("1)"))))
(len (length bullet-list))
(item-index (- len (length (member current bullet-list))))
(get-value (lambda (index) (nth (mod index len) bullet-list)))