diff options
| author | Nicolas Goaziou <n.goaziou@gmail.com> | 2010-07-22 09:29:10 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | 2010-09-01 19:05:50 +0200 |
| commit | a13ee91cbe27b0950e8ae596b6601c1645a1b3ea (patch) | |
| tree | 5cd548e2b48c0a2862116c24917db323acb7c8af | |
| parent | 330c27e4ecec96ea4e3aee9d9e30cabc0489254d (diff) | |
| download | org-mode-a13ee91cbe27b0950e8ae596b6601c1645a1b3ea.tar.gz | |
Rules preserving integrity of a list now apply when moving subtree.
* org-list.el (org-indent-item-tree): when outdenting a subtree, the
last item shouldn't have a children.
| -rw-r--r-- | lisp/org-list.el | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/lisp/org-list.el b/lisp/org-list.el index c95b845..7ef7fb0 100644 --- a/lisp/org-list.el +++ b/lisp/org-list.el @@ -807,23 +807,26 @@ children. Return t if sucessful." ;; Apply indent rules if activated. ((cdr (assq 'indent org-list-automatic-rules)) (cond - ;; If at top-point move the whole list. Moreover, if *-list - ;; is going to column 0, change bullet to "-". + ;; 1. If at top-point move the whole list. Moreover, if + ;; *-list is going to column 0, change bullet to "-". ((= (point-at-bol) (org-list-top-point)) (when (and (= (+ delta ind) 0) (equal bullet "*")) (org-fix-bullet-type "-")) (setq end (set-marker org-last-indent-end-marker (org-list-bottom-point)))) - ;; Do not indent before top-item. + ;; 2. Do not indent before top-item. ((< (+ delta ind) origin-ind) (error "Cannot outdent beyond top level item")) - ;; Do not indent the first item of a list. + ;; 3. Do not indent the first item of a list. ((and firstp (> delta 0)) (error "Cannot indent the beginning of a sublist")) - ;; Do not outdent item that has children without moving subtree. - ((and (/= (save-excursion (org-end-of-item-text-before-children)) - (save-excursion (org-end-of-item))) - (< delta 0) - no-subtree) - (error "Cannot outdent an item having children without moving subtree"))))) + ;; 4. Do not outdent item that has children without moving. + ;; In the case of a subtree, make sure the check applies to + ;; its last item. + ((and (save-excursion + (goto-char (1- end)) + (/= (save-excursion (org-end-of-item-text-before-children)) + (save-excursion (org-end-of-item)))) + (< delta 0)) + (error "Cannot outdent an item having children"))))) ;; Proceed to reindentation. (while (< (point) end) (beginning-of-line) |