ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-12-29 10:26:03 +01:00
parent 197881bc1a aa3786bc20
commit 7773e0d94c
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/org.el
View File

@ -2257,8 +2257,9 @@ Lisp variable `org-state'."
(defvar org-blocker-hook nil (defvar org-blocker-hook nil
"Hook for functions that are allowed to block a state change. "Hook for functions that are allowed to block a state change.
Each function gets as its single argument a property list, see Functions in this hook should not modify the buffer.
`org-trigger-hook' for more information about this list. Each function gets as its single argument a property list,
see `org-trigger-hook' for more information about this list.
If any of the functions in this hook returns nil, the state change If any of the functions in this hook returns nil, the state change
is blocked.") is blocked.")
@ -2266,8 +2267,8 @@ is blocked.")
(defvar org-trigger-hook nil (defvar org-trigger-hook nil
"Hook for functions that are triggered by a state change. "Hook for functions that are triggered by a state change.
Each function gets as its single argument a property list with at least Each function gets as its single argument a property list with at
the following elements: least the following elements:
(:type type-of-change :position pos-at-entry-start (:type type-of-change :position pos-at-entry-start
:from old-state :to new-state) :from old-state :to new-state)
@ -12004,6 +12005,7 @@ changes because there are unchecked boxes in this entry."
(defun org-entry-blocked-p () (defun org-entry-blocked-p ()
"Is the current entry blocked?" "Is the current entry blocked?"
(with-buffer-modified-unmodified
(if (org-entry-get nil "NOBLOCKING") (if (org-entry-get nil "NOBLOCKING")
nil ;; Never block this entry nil ;; Never block this entry
(not (not
@ -12012,7 +12014,7 @@ changes because there are unchecked boxes in this entry."
(list :type 'todo-state-change (list :type 'todo-state-change
:position (point) :position (point)
:from 'todo :from 'todo
:to 'done))))) :to 'done))))))
(defun org-update-statistics-cookies (all) (defun org-update-statistics-cookies (all)
"Update the statistics cookie, either from TODO or from checkboxes. "Update the statistics cookie, either from TODO or from checkboxes.