Merge branch 'master' of orgmode.org:org-mode

doc/org.texi

@@ -4274,7 +4274,7 @@ be placed into a headline or into (the first line of) a plain list item.
 Each cookie covers checkboxes of direct children structurally below the
 headline/item on which the cookie appears@footnote{Set the variable
 @code{org-hierarchical-checkbox-statistics} if you want such cookies to
-represent the all checkboxes below the cookie, not just the direct
+count all checkboxes below the cookie, not just those belonging to direct
 children.}.  You have to insert the cookie yourself by typing either
 @samp{[/]} or @samp{[%]}.  With @samp{[/]} you get an @samp{n out of m}
 result, as in the examples above.  With @samp{[%]} you get information about
@@ -4331,8 +4331,7 @@ a @kbd{C-u} prefix, update the entire file.  Checkbox statistic cookies are
 updated automatically if you toggle checkboxes with @kbd{C-c C-c} and make
 new ones with @kbd{M-S-@key{RET}}.  TODO statistics cookies update when
 changing TODO states.  If you delete boxes/entries or add/change them by
-hand, use this command to get things back into sync.  Or simply toggle any
-entry twice (checkboxes with @kbd{C-c C-c}).
+hand, use this command to get things back into sync.
 @end table
 
 @node Tags, Properties and Columns, TODO Items, Top

lisp/org.el

@@ -1104,12 +1104,6 @@ breaking the list structure."
 			(const :tag "Always" t)
 			(const :tag "Auto" auto)))))
 
-(defcustom org-numbered-action-format "TODO Action #%d "
-  "Default structure of the headling of a new action.
-%d will become the number of the action."
-  :group 'org-edit-structure
-  :type 'string)  
-
 (defcustom org-insert-heading-hook nil
   "Hook being run after inserting a new heading."
   :group 'org-edit-structure
@@ -6930,29 +6924,6 @@ This is important for non-interactive uses of the command."
 	    (hide-subtree)))
 	(run-hooks 'org-insert-heading-hook)))))
 
-(defun org-new-numbered-action (&optional inline)
-  "Insert a new numbered action, using `org-numbered-action-format'.
-With prefix argument, insert an inline task."
-  (interactive "P")
-  (let* ((num (let ((re "\\`#\\([0-9]+\\)\\'"))
-		(1+ (apply 'max 0
-			   (mapcar
-			    (lambda (e)
-			      (if (string-match re (car e))
-				  (string-to-number (match-string 1 (car e)))
-				0))
-			    (org-get-buffer-tags))))))
-	 (tag (concat "#" (number-to-string num))))
-    (if inline
-          (org-inlinetask-insert-task)
-      (org-insert-heading nil 'force))
-    (unless (eql (char-before) ?\ ) (insert " "))
-    (insert (format org-numbered-action-format num))
-    (org-toggle-tag tag 'on)
-    (if (= (point-max) (point-at-bol))
-	(save-excursion (goto-char (point-at-eol)) (insert "\n")))
-    (unless (eql (char-before) ?\ ) (insert " "))))
-
 (defun org-get-heading (&optional no-tags)
   "Return the heading of the current entry, without the stars."
   (save-excursion
@@ -7600,33 +7571,6 @@ If optional TXT is given, check this string instead of the current kill."
 	    (throw 'exit nil)))
 	t))))
 
-(defun org-collect-todos-in-subtree ()
-  "Collect all TODO items in the current subtree into a flat list."
-  (interactive)
-  (let ((buf (get-buffer-create "Org TODO Collect"))
-	(cnt 0))
-    (with-current-buffer buf (erase-buffer) (org-mode))
-    (save-excursion
-      (save-restriction
-	(org-narrow-to-subtree)
-	(goto-char (point-min))
-	(while (re-search-forward org-complex-heading-regexp nil t)
-	  (when (and (match-end 2)
-		     (member (match-string 2) org-not-done-keywords))
-	    (setq beg (match-beginning 0)
-		  cnt (1+ cnt))
-	    (org-end-of-subtree t t)
-	    (setq end (point))
-	    (copy-region-as-kill beg end)
-	    (with-current-buffer buf
-	      (org-paste-subtree 1)
-	      (or (bolp) (insert "\n"))
-	      (set-buffer-modified-p nil))))))
-    (with-current-buffer buf
-      (kill-region (point-min) (point-max)))
-    (kill-buffer buf)
-    (message "Collected %d TODO items as flat list into the kill buffer" cnt)))
-
 (defvar org-markers-to-move nil
   "Markers that should be moved with a cut-and-paste operation.
 Those markers are stored together with their positions relative to