浏览代码

More small fixes on `C-u C-c C-c' and checkboxes.

* org.el (org-ctrl-c-ctrl-c): Preserve symmetry when adding
and removing checkboxes with `C-u C-c C-c' on the first item
of a list.  Also, don't reinitialize checkboxes that are
already ticked.

Thanks to Nicolas Goaziou for these fixes.
Bastien Guerry 13 年之前
父节点
当前提交
c535c276fe
共有 1 个文件被更改,包括 4 次插入2 次删除
  1. 4 2
      lisp/org.el

+ 4 - 2
lisp/org.el

@@ -18330,7 +18330,7 @@ This command does many different things, depending on context:
 			((equal arg '(4)) nil)
 			((equal "[X]" cbox) "[ ]")
 			(t "[X]"))))
-	  (if firstp
+	  (if (and firstp arg)
 	      ;; If at first item of sub-list, remove check-box from
 	      ;; every item at the same level.
 	      (mapc
@@ -18367,7 +18367,9 @@ This command does many different things, depending on context:
 	      ;; If at first item of sub-list, add check-box to every
 	      ;; item at the same level.
 	      (mapc
-	       (lambda (pos) (org-list-set-checkbox pos new-struct "[ ]"))
+	       (lambda (pos)
+		 (unless (org-list-get-checkbox pos new-struct)
+		   (org-list-set-checkbox pos new-struct "[ ]")))
 	       (org-list-get-all-items
 		(point-at-bol) new-struct (org-list-prevs-alist new-struct)))
 	    (org-list-set-checkbox (point-at-bol) new-struct "[ ]")))