diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-01-15 23:15:26 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-01-15 23:15:26 +0100 |
commit | 21cf8d8e61e541819d2d26e872ba24a31da60334 (patch) | |
tree | 02670469fbe1510afa4a8de5028e3df7465acbec | |
parent | b6787009b014066d34a70b8f1b6ccaa571cb2634 (diff) | |
parent | b74655a4e5c1a8115fc7d11d48ee5e96700e1c2a (diff) | |
download | org-mode-21cf8d8e61e541819d2d26e872ba24a31da60334.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-list.el | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/lisp/org-list.el b/lisp/org-list.el index 2043f11..1baa458 100644 --- a/lisp/org-list.el +++ b/lisp/org-list.el @@ -116,6 +116,7 @@ (declare-function org-element-set-element "org-element" (old new)) (declare-function org-element-type "org-element" (element)) (declare-function org-element-update-syntax "org-element" ()) +(declare-function org-end-of-meta-data "org" (&optional full)) (declare-function org-entry-get "org" (pom property &optional inherit literal-nil)) (declare-function org-export-create-backend "ox" (&rest rest) t) (declare-function org-export-data-with-backend "ox" (data backend info)) @@ -2320,16 +2321,17 @@ is an integer, 0 means `-', 1 means `+' etc. If WHICH is (defun org-toggle-checkbox (&optional toggle-presence) "Toggle the checkbox in the current line. -With prefix arg TOGGLE-PRESENCE, add or remove checkboxes. With -double prefix, set checkbox to [-]. + +With prefix argument TOGGLE-PRESENCE, add or remove checkboxes. +With a double prefix argument, set the checkbox to \"[-]\". When there is an active region, toggle status or presence of the first checkbox there, and make every item inside have the same status or presence, respectively. -If the cursor is in a headline, apply this to all checkbox items -in the text below the heading, taking as reference the first item -in subtree, ignoring drawers." +If point is on a headline, apply this to all checkbox items in +the text below the heading, taking as reference the first item in +subtree, ignoring planning line and any drawer following it." (interactive "P") (save-excursion (let* (singlep @@ -2353,15 +2355,10 @@ in subtree, ignoring drawers." (error "No item in region")) (setq lim-down (copy-marker limit)))) ((org-at-heading-p) - ;; On an heading, start at first item after drawers and + ;; On a heading, start at first item after drawers and ;; time-stamps (scheduled, etc.). (let ((limit (save-excursion (outline-next-heading) (point)))) - (forward-line 1) - (while (or (looking-at org-drawer-regexp) - (looking-at keyword-re)) - (if (looking-at keyword-re) - (forward-line 1) - (re-search-forward "^[ \t]*:END:" limit nil))) + (org-end-of-meta-data t) (if (org-list-search-forward (org-item-beginning-re) limit t) (setq lim-up (point-at-bol)) (error "No item in subtree")) |