diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2019-02-18 23:38:55 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2019-02-18 23:38:55 +0100 |
commit | 3a106a213c3d654cc98f01b99b135bc12411b197 (patch) | |
tree | 7fef7b0740ec793a7beb1056235a396341872178 | |
parent | e9d4eb01479a875790ca258488c5e7940facf17d (diff) | |
parent | 6b8fb446b6e04b6b488c90113c28acba7d4e1917 (diff) | |
download | org-mode-3a106a213c3d654cc98f01b99b135bc12411b197.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-list.el | 31 | ||||
-rw-r--r-- | testing/lisp/test-org-list.el | 12 |
2 files changed, 27 insertions, 16 deletions
diff --git a/lisp/org-list.el b/lisp/org-list.el index b459ae7..04b3257 100644 --- a/lisp/org-list.el +++ b/lisp/org-list.el @@ -1553,22 +1553,21 @@ bullets between START and END." (let* (acc (set-assoc (lambda (cell) (push cell acc) cell)) (change-bullet-maybe - (function - (lambda (item) - (let ((new-bul-p - (cdr (assoc - ;; Normalize ordered bullets. - (let ((bul (org-trim - (org-list-get-bullet item struct)))) - (cond ((string-match "[A-Z]\\." bul) "A.") - ((string-match "[A-Z])" bul) "A)") - ((string-match "[a-z]\\." bul) "a.") - ((string-match "[a-z])" bul) "a)") - ((string-match "[0-9]\\." bul) "1.") - ((string-match "[0-9])" bul) "1)") - (t bul))) - org-list-demote-modify-bullet)))) - (when new-bul-p (org-list-set-bullet item struct new-bul-p)))))) + (lambda (item) + (let ((new-bul + (cdr (assoc + ;; Normalize ordered bullets. + (let ((bul (org-list-get-bullet item struct)) + (case-fold-search nil)) + (cond ((string-match "[A-Z]\\." bul) "A.") + ((string-match "[A-Z])" bul) "A)") + ((string-match "[a-z]\\." bul) "a.") + ((string-match "[a-z])" bul) "a)") + ((string-match "[0-9]\\." bul) "1.") + ((string-match "[0-9])" bul) "1)") + (t (org-trim bul)))) + org-list-demote-modify-bullet)))) + (when new-bul (org-list-set-bullet item struct new-bul))))) (ind (lambda (cell) (let* ((item (car cell)) diff --git a/testing/lisp/test-org-list.el b/testing/lisp/test-org-list.el index bbd6ee7..c3864ca 100644 --- a/testing/lisp/test-org-list.el +++ b/testing/lisp/test-org-list.el @@ -270,6 +270,18 @@ (org-list-demote-modify-bullet '(("1." . "+")))) (org-indent-item)) (buffer-string)))) + (should + (equal " +a. Item 1 + - Item 2" + (org-test-with-temp-text " +a. Item 1 +b. Item 2<point>" + (let ((org-plain-list-ordered-item-terminator t) + (org-list-allow-alphabetical t) + (org-list-demote-modify-bullet '(("A." . "a.") ("a." . "-")))) + (org-indent-item)) + (buffer-string)))) ;; When a region is selected, indent every item within. (should (equal " |